ChangeLogTag: Sat Jun 2 12:02:55 2001 Balachandran Natarajan <bala@cs.wustl.edu>

83 files changed, 55110 insertions, 52674 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index f68a37ff99a..a52611881f0 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,7 @@
+Sat Jun  2 12:02:55 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+	* tao/* : Merged with the main trunk.
+
 Fri Jun  1 17:22:29 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* tao/GIOP_Message_State.cpp (parse_message_header_i): 
diff --git a/TAO/tao/Abstract_Servant_Base.h b/TAO/tao/Abstract_Servant_Base.h
index 4ad7476dc06..126290e6801 100644
--- a/TAO/tao/Abstract_Servant_Base.h
+++ b/TAO/tao/Abstract_Servant_Base.h
@@ -37,11 +37,11 @@ public:
 
   /// Local implementation of the CORBA::Object::_is_a method.
   virtual CORBA::Boolean _is_a (const char* logical_type_id,
-                                CORBA_Environment &ACE_TRY_ENV = 
+                                CORBA_Environment &ACE_TRY_ENV =
                                   TAO_default_environment ()) = 0;
 
   /// Default <_non_existent>: always returns false.
-  virtual CORBA::Boolean _non_existent (CORBA_Environment &ACE_TRY_ENV = 
+  virtual CORBA::Boolean _non_existent (CORBA_Environment &ACE_TRY_ENV =
                                           TAO_default_environment ()) = 0;
 
   /// Query the Interface Repository.
@@ -60,9 +60,8 @@ public:
   /// Get the correct vtable.
   virtual void *_downcast (const char *repository_id) = 0;
 
-  /// This is an auxiliar method for _this() and _narrow().
-  virtual TAO_Stub *_create_stub (CORBA_Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ()) = 0;
+  /// This is an auxiliary method for _this() and _narrow().
+  virtual TAO_Stub *_create_stub (CORBA_Environment &ACE_TRY_ENV) = 0;
 
 protected:
   /// Default constructor, only derived classes can be created.
@@ -79,14 +78,14 @@ protected:
    * Find the operation, cast the type to the most derived type,
    * demarshall all the parameters from the request and finally
    * invokes the operation, storing the results and out parameters (if
-   * any) or the exceptions thrown into <request>.
+   * any) or the exceptions thrown into @param request.
    */
   virtual void _dispatch (TAO_ServerRequest &request,
-                          void *context,
-                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
+                          void *servant_upcall,
+                          CORBA_Environment &ACE_TRY_ENV) = 0;
 
   virtual void synchronous_upcall_dispatch (TAO_ServerRequest &req,
-                                            void *context,
+                                            void *servant_upcall,
                                             void *derived_this,
                                             CORBA::Environment &ACE_TRY_ENV) = 0;
 
diff --git a/TAO/tao/Adapter.cpp b/TAO/tao/Adapter.cpp
index 487ae4cee4f..41c9e3a8bd9 100644
--- a/TAO/tao/Adapter.cpp
+++ b/TAO/tao/Adapter.cpp
@@ -11,7 +11,9 @@
 # include "Adapter.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(tao, Adapter, "$Id$")
+ACE_RCSID (tao,
+           Adapter,
+           "$Id$")
 
 TAO_Adapter::~TAO_Adapter (void)
 {
@@ -102,7 +104,6 @@ TAO_Adapter_Registry::insert (TAO_Adapter *adapter,
 void
 TAO_Adapter_Registry::dispatch (TAO_ObjectKey &key,
                                 TAO_ServerRequest &request,
-                                void *context, /* unused? */
                                 CORBA::Object_out forward_to,
                                 CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -111,7 +112,6 @@ TAO_Adapter_Registry::dispatch (TAO_ObjectKey &key,
     {
       int r = this->adapters_[i]->dispatch (key,
                                             request,
-                                            context,
                                             forward_to,
                                             ACE_TRY_ENV);
       ACE_CHECK;
diff --git a/TAO/tao/Adapter.h b/TAO/tao/Adapter.h
index ef59fa0720a..5986595da5f 100644
--- a/TAO/tao/Adapter.h
+++ b/TAO/tao/Adapter.h
@@ -63,10 +63,10 @@ public:
   /// Return the status....
   virtual int dispatch (TAO_ObjectKey &key,
                         TAO_ServerRequest &request,
-                        void *context, /* unused? */
                         CORBA::Object_out forward_to,
                         CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+
   enum {
     DS_OK,
     // The operation was successfully dispatched, an exception may
@@ -140,7 +140,6 @@ public:
    */
   void dispatch (TAO_ObjectKey &key,
                  TAO_ServerRequest &request,
-                 void *context, /* unused? */
                  CORBA::Object_out forward_to,
                  CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h
index f9d683cf09b..7e10ba3d262 100644
--- a/TAO/tao/CDR.h
+++ b/TAO/tao/CDR.h
@@ -287,7 +287,10 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
                                       CORBA::Char* &x);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
                                       CORBA::WChar* &x);
-
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &,
+                                      const CORBA::ParameterMode &);
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &,
+                                      CORBA::ParameterMode &);
 #endif /* __ACE_INLINE */
 
 #include "ace/post.h"
diff --git a/TAO/tao/CDR.i b/TAO/tao/CDR.i
index b7138628c11..3c39bd41b13 100644
--- a/TAO/tao/CDR.i
+++ b/TAO/tao/CDR.i
@@ -254,3 +254,25 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
 {
   return ACE_static_cast (ACE_InputCDR &, is) >> x;
 }
+
+ACE_INLINE CORBA::Boolean
+operator<< (TAO_OutputCDR &strm, const CORBA::ParameterMode &_tao_enumval)
+{
+  CORBA::ULong _tao_temp = _tao_enumval;
+  return strm << _tao_temp;
+}
+
+ACE_INLINE CORBA::Boolean
+operator>> (TAO_InputCDR &strm, CORBA::ParameterMode &_tao_enumval)
+{
+  CORBA::ULong _tao_temp = 0;
+  CORBA::Boolean _tao_result = strm >> _tao_temp;
+
+  if (_tao_result == 1)
+    {
+      _tao_enumval = ACE_static_cast (CORBA::ParameterMode, _tao_temp);
+    }
+
+  return _tao_result;
+}
+
diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp
index 0848dd8b08d..13f09350804 100644
--- a/TAO/tao/CORBALOC_Parser.cpp
+++ b/TAO/tao/CORBALOC_Parser.cpp
@@ -54,7 +54,7 @@ TAO_CORBALOC_Parser::parse_string_count_helper (const char * &corbaloc_name,
 
       if (*i == ':')
         {
-          if (*(i+1) == '/')
+          if (*(i+1) == '/' && *(i+2) == '/')
             {
               ACE_ERROR((LM_ERROR,
                          ACE_TEXT ("TAO (%P|%t) Invalid Syntax\n")));
@@ -99,6 +99,7 @@ TAO_CORBALOC_Parser::assign_key_string (char * &cloc_name_ptr,
   const char protocol_suffix_append[] = "://";
   const char iiop_prefix[] = "iiop";
   const char uiop_prefix[] = "uiop";
+  const char def_port [] = ":2809";
 
   // Copy the cloc_name_ptr to cloc_name_cstring.
   ACE_CString cloc_name_cstring (cloc_name_ptr,
@@ -123,6 +124,7 @@ TAO_CORBALOC_Parser::assign_key_string (char * &cloc_name_ptr,
                                        sizeof (iiop_prefix) +
                                        1 + // For the seperator
                                        2 +
+                                       sizeof (def_port) +
                                        key_string.length ());
 
       // Copy the default <iiop:> prefix.
@@ -133,13 +135,6 @@ TAO_CORBALOC_Parser::assign_key_string (char * &cloc_name_ptr,
       ACE_OS::strcat (end_point,
                       protocol_suffix_append);
 
-      ACE_CString host_name_port =
-        cloc_name_cstring.substring (pos_colon + 1,
-                                     -1);
-
-      ACE_OS::strcat (end_point,
-                      host_name_port.c_str ());
-
     }
   else
     {
@@ -149,7 +144,9 @@ TAO_CORBALOC_Parser::assign_key_string (char * &cloc_name_ptr,
       // Allocate memory for the end_point.
       end_point = CORBA::string_alloc (addr_list_length +
                                        1 + // For the seperator
-                                       2 + // For the protocol_prefix_append
+                                       2 + // For the
+                                       // protocol_prefix_append
+                                       sizeof (def_port) +
                                        key_string.length ());
 
       ACE_CString prot_name = cloc_name_cstring.substring (0,
@@ -165,23 +162,31 @@ TAO_CORBALOC_Parser::assign_key_string (char * &cloc_name_ptr,
 
       // Example:
       // The End_point will now be 'iiop'
-
       ACE_OS::strcat (end_point,
                       protocol_suffix_append);
 
-      // The End_point will now be 'iiop://'
+    }
+
+  // The End_point will now be 'iiop://'
+  ACE_CString host_name_port =
+    cloc_name_cstring.substring (pos_colon + 1, -1);
 
-      ACE_CString host_name_port =
-        cloc_name_cstring.substring (pos_colon + 1, -1);
+  /// Search for a port number.
+  ACE_CString host_port =
+    ACE_OS::strchr (host_name_port.c_str (),
+                    ':');
 
-      ACE_OS::strcat (end_point,
-                      host_name_port.c_str ());
+  ACE_OS::strcat (end_point,
+                  host_name_port.c_str ());
 
-      // Example:
-      // The End_point will now be of the form
-      // 'iiop://1.0@doc.ece.uci.edu:12345'
+  /// If port number is not specified, add the defaultport no.
+  if (ACE_OS::strcmp (host_port.c_str (), "") == 0)
+    ACE_OS::strcat (end_point,
+                    def_port);
 
-    }
+  // Example:
+  // The End_point will now be of the form
+  // 'iiop://1.0@doc.ece.uci.edu:12345'
 
   if (ACE_OS::strncmp (cloc_name_ptr,
                        uiop_prefix,
diff --git a/TAO/tao/Domain/DomainS.cpp b/TAO/tao/Domain/DomainS.cpp
index 20e92875721..6e8d3a5d5e4 100644
--- a/TAO/tao/Domain/DomainS.cpp
+++ b/TAO/tao/Domain/DomainS.cpp
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_ORIG_DOMAINS_CPP_
-#define _TAO_IDL_ORIG_DOMAINS_CPP_
+#ifndef _TAO_IDL_DOMAINS_CPP_
+#define _TAO_IDL_DOMAINS_CPP_
 
 #include "DomainS.h"
 
@@ -30,10 +30,14 @@
 #include "tao/ORB_Core.h"
 #include "tao/Stub.h"
 #include "tao/IFR_Client_Adapter.h"
-#include "tao/PortableServer/ServerRequestInfo.h"
+#include "tao/PortableInterceptor.h"
+
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
+#include "tao/PortableServer/ServerRequestInfo.h"
+#include "tao/PortableServer/ServerInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
+
 #include "tao/IFR_Client/IFR_ExtendedC.h"
 
 #include "ace/Dynamic_Service.h"
@@ -52,9 +56,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 17:47:31 */
+/* starting time is 18:44:56 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/sirion/coryan/head/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_DomainManager_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_DomainManager_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_DomainManager_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -146,7 +150,7 @@ TAO_CORBA_DomainManager_Perfect_Hash_OpTable::lookup (const char *str, unsigned
     }
   return 0;
 }
-/* ending time is 17:47:31 */
+/* ending time is 18:44:56 */
 static TAO_CORBA_DomainManager_Perfect_Hash_OpTable tao_CORBA_DomainManager_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -155,7 +159,8 @@ class TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy : public TAO_S
 public:
   TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA_DomainManager *tao_impl,
+    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_DomainManager *tao_impl
+    ,
     const CORBA::PolicyType & policy_type,
     CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
@@ -202,11 +207,12 @@ private:
 
 TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy (
     TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_DomainManager *tao_impl,
     const CORBA::PolicyType & policy_type,
     CORBA::Environment &
   )
-  : TAO_ServerRequestInfo (_tao_server_request),
+  : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
     policy_type_ (policy_type)
 {}
@@ -222,10 +228,12 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::arguments (CORBA::E
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
 
-  CORBA::ULong length_policy_type = parameter_list->length ();
-  parameter_list->length (length_policy_type + 1);
-  (*parameter_list)[length_policy_type].argument <<= policy_type_;
-  (*parameter_list)[length_policy_type].mode = Dynamic::PARAM_IN;
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+  (*parameter_list)[len].argument <<= policy_type_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
 
   return safe_parameter_list._retn ();
 }
@@ -291,20 +299,20 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::result (CORBA::Poli
 //
 
 // Factory function Implementation.
-_TAO_CORBA_DomainManager_Strategized_Proxy_Broker *_TAO_CORBA_DomainManager_Strategized_Proxy_Broker::the_TAO_CORBA_DomainManager_Strategized_Proxy_Broker (void)
+_TAO_DomainManager_Strategized_Proxy_Broker *_TAO_DomainManager_Strategized_Proxy_Broker::the_TAO_DomainManager_Strategized_Proxy_Broker (void)
 {
-  static _TAO_CORBA_DomainManager_Strategized_Proxy_Broker strategized_proxy_broker;
+  static _TAO_DomainManager_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
 }
 
-_TAO_CORBA_DomainManager_Strategized_Proxy_Broker::_TAO_CORBA_DomainManager_Strategized_Proxy_Broker (void)
+_TAO_DomainManager_Strategized_Proxy_Broker::_TAO_DomainManager_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
 
 }
 
-_TAO_CORBA_DomainManager_Strategized_Proxy_Broker::~_TAO_CORBA_DomainManager_Strategized_Proxy_Broker (void)
+_TAO_DomainManager_Strategized_Proxy_Broker::~_TAO_DomainManager_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     delete this->proxy_cache_[i];
@@ -312,8 +320,8 @@ _TAO_CORBA_DomainManager_Strategized_Proxy_Broker::~_TAO_CORBA_DomainManager_Str
 }
 
 _TAO_CORBA_DomainManager_Proxy_Impl&
-_TAO_CORBA_DomainManager_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_DomainManager *object,
+_TAO_DomainManager_Strategized_Proxy_Broker::select_proxy (
+    ::CORBA::DomainManager *object,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -331,7 +339,7 @@ _TAO_CORBA_DomainManager_Strategized_Proxy_Broker::select_proxy (
 }
 
 void
-_TAO_CORBA_DomainManager_Strategized_Proxy_Broker::create_proxy (
+_TAO_DomainManager_Strategized_Proxy_Broker::create_proxy (
     int strategy,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -345,16 +353,7 @@ _TAO_CORBA_DomainManager_Strategized_Proxy_Broker::create_proxy (
         case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              _TAO_CORBA_DomainManager_ThruPOA_Proxy_Impl,
-              CORBA::NO_MEMORY ()
-          );
-          ACE_CHECK;
-          break;
-
-        case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY:
-          ACE_NEW_THROW_EX (
-              this->proxy_cache_[strategy],
-              _TAO_CORBA_DomainManager_Direct_Proxy_Impl,
+              _TAO_DomainManager_ThruPOA_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -382,38 +381,36 @@ _TAO_CORBA_DomainManager_Strategized_Proxy_Broker::create_proxy (
 
 
 _TAO_CORBA_DomainManager_Proxy_Broker *
-_TAO_CORBA_DomainManager_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+CORBA__TAO_DomainManager_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 {
   ACE_UNUSED_ARG (obj);
-  return ::_TAO_CORBA_DomainManager_Strategized_Proxy_Broker::the_TAO_CORBA_DomainManager_Strategized_Proxy_Broker();
+  return ::_TAO_DomainManager_Strategized_Proxy_Broker::the_TAO_DomainManager_Strategized_Proxy_Broker();
 }
 
 int
-_TAO_CORBA_DomainManager_Proxy_Broker_Factory_Initializer (long _dummy_)
+CORBA__TAO_DomainManager_Proxy_Broker_Factory_Initializer (long)
 {
-  ACE_UNUSED_ARG (_dummy_);
-
-  _TAO_CORBA_DomainManager_Proxy_Broker_Factory_function_pointer =
-    _TAO_CORBA_DomainManager_Proxy_Broker_Factory_function;
+  CORBA__TAO_CORBA_DomainManager_Proxy_Broker_Factory_function_pointer =
+    CORBA__TAO_DomainManager_Proxy_Broker_Factory_function;
 
   return 0;
 }
 
-static int _TAO_CORBA_DomainManager_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-  _TAO_CORBA_DomainManager_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_DomainManager_Proxy_Broker_Factory_Initializer));
+static int CORBA__TAO_DomainManager_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+  CORBA__TAO_DomainManager_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_DomainManager_Proxy_Broker_Factory_Initializer));
 
 
 ///////////////////////////////////////////////////////////////////////
 //                 ThruPOA Proxy  Implementation
 //
 
-_TAO_CORBA_DomainManager_ThruPOA_Proxy_Impl::_TAO_CORBA_DomainManager_ThruPOA_Proxy_Impl (void)
+_TAO_DomainManager_ThruPOA_Proxy_Impl::_TAO_DomainManager_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
-CORBA::Policy_ptr _TAO_CORBA_DomainManager_ThruPOA_Proxy_Impl::get_domain_policy (
-    CORBA_Object *_collocated_tao_target_,
+CORBA::Policy_ptr _TAO_DomainManager_ThruPOA_Proxy_Impl::get_domain_policy (
+    CORBA::Object_ptr _collocated_tao_target_,
     CORBA::PolicyType policy_type,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -437,7 +434,7 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_ThruPOA_Proxy_Impl::get_domain_policy
     return ACE_reinterpret_cast (
       POA_CORBA_DomainManager_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:CORBA_DomainManager:1.0"
+          "IDL:omg.org/CORBA/DomainManager:1.0"
         )
     )->get_domain_policy (
         policy_type,
@@ -449,37 +446,6 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_ThruPOA_Proxy_Impl::get_domain_policy
 //           End ThruPOA Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-
-///////////////////////////////////////////////////////////////////////
-//                 Direct Proxy  Implementation
-//
-
-_TAO_CORBA_DomainManager_Direct_Proxy_Impl::_TAO_CORBA_DomainManager_Direct_Proxy_Impl (void)
-{}
-
-CORBA::Policy_ptr _TAO_CORBA_DomainManager_Direct_Proxy_Impl::get_domain_policy  (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::PolicyType policy_type,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return ACE_reinterpret_cast (
-      POA_CORBA_DomainManager_ptr,
-      _collocated_tao_target_->_servant ()->_downcast ("IDL:CORBA_DomainManager:1.0")
-    )->get_domain_policy (
-          policy_type,
-          ACE_TRY_ENV
-        );
-
-}
-
-
-//
-//           End Direct Proxy Implementation
-///////////////////////////////////////////////////////////////////////
 // skeleton constructor
 POA_CORBA_DomainManager::POA_CORBA_DomainManager (void)
 {
@@ -499,12 +465,13 @@ POA_CORBA_DomainManager::~POA_CORBA_DomainManager (void)
 void POA_CORBA_DomainManager::get_domain_policy_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void * /* context */,
+    void *_tao_servant_upcall,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA_DomainManager *_tao_impl = (POA_CORBA_DomainManager *)_tao_object_reference;
+  POA_CORBA_DomainManager *_tao_impl =
+    ACE_static_cast (POA_CORBA_DomainManager *, _tao_object_reference);
 
     CORBA::Policy_var _tao_retval;
   CORBA::PolicyType policy_type;
@@ -515,6 +482,10 @@ void POA_CORBA_DomainManager::get_domain_policy_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -522,6 +493,7 @@ void POA_CORBA_DomainManager::get_domain_policy_skel (
 
   TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy ri (
       _tao_server_request,
+      _tao_upcall,
       _tao_impl,
       policy_type,
       ACE_TRY_ENV
@@ -548,16 +520,6 @@ void POA_CORBA_DomainManager::get_domain_policy_skel (
       _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc);
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
@@ -566,7 +528,14 @@ void POA_CORBA_DomainManager::get_domain_policy_skel (
           ACE_TRY_ENV
         );
       ACE_TRY_CHECK;
-      ACE_RE_THROW;
+
+      PortableInterceptor::ReplyStatus _tao_status =
+        ri.reply_status (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+          || _tao_status == PortableInterceptor::USER_EXCEPTION)
+        ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
@@ -581,6 +550,8 @@ void POA_CORBA_DomainManager::get_domain_policy_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -588,7 +559,7 @@ void POA_CORBA_DomainManager::get_domain_policy_skel (
 void POA_CORBA_DomainManager::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* context */,
+    void * /* Servant_Upcall */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -611,7 +582,7 @@ void POA_CORBA_DomainManager::_is_a_skel (
 void POA_CORBA_DomainManager::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* context */,
+    void * /* Servant_Upcall */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -628,7 +599,7 @@ void POA_CORBA_DomainManager::_non_existent_skel (
 void POA_CORBA_DomainManager::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* context */,
+    void * /* Servant_Upcall */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -682,7 +653,7 @@ CORBA::Boolean POA_CORBA_DomainManager::_is_a (
   ACE_CHECK_RETURN (0);
 
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:CORBA_DomainManager:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/DomainManager:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -693,29 +664,34 @@ void* POA_CORBA_DomainManager::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:CORBA_DomainManager:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/DomainManager:1.0") == 0)
     return ACE_static_cast (POA_CORBA_DomainManager_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_CORBA_DomainManager::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_DomainManager::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
 {
-  this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
+  this->synchronous_upcall_dispatch (req,
+                                     servant_upcall,
+                                     this,
+                                     ACE_TRY_ENV);
 }
 
 const char* POA_CORBA_DomainManager::_interface_repository_id (void) const
 {
-  return "IDL:CORBA_DomainManager:1.0";
+  return "IDL:omg.org/CORBA/DomainManager:1.0";
 }
 
-CORBA_DomainManager*
+CORBA::DomainManager*
 POA_CORBA_DomainManager::_this (CORBA_Environment &ACE_TRY_ENV)
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
 
+  TAO_Stub_Auto_Ptr safe_stub (stub);
+
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
 
   if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
@@ -724,7 +700,10 @@ POA_CORBA_DomainManager::_this (CORBA_Environment &ACE_TRY_ENV)
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
 
   CORBA::Object_var obj = tmp;
-  return ::CORBA_DomainManager::_unchecked_narrow (obj.in ());
+
+  (void) safe_stub.release ();
+
+  return ::CORBA::DomainManager::_unchecked_narrow (obj.in ());
 }
 
 
@@ -735,9 +714,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 17:47:31 */
+/* starting time is 18:44:57 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/sirion/coryan/head/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -834,7 +813,7 @@ TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsi
     }
   return 0;
 }
-/* ending time is 17:47:31 */
+/* ending time is 18:44:57 */
 static TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable tao_CORBA_ConstructionPolicy_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -843,7 +822,8 @@ class TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager : publi
 public:
   TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA_ConstructionPolicy *tao_impl,
+    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ConstructionPolicy *tao_impl
+    ,
     CORBA::InterfaceDef_ptr object_type,
     const CORBA::Boolean & constr_policy,
     CORBA::Environment &ACE_TRY_ENV =
@@ -891,12 +871,13 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager (
     TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ConstructionPolicy *tao_impl,
     CORBA::InterfaceDef_ptr object_type,
     const CORBA::Boolean & constr_policy,
     CORBA::Environment &
   )
-  : TAO_ServerRequestInfo (_tao_server_request),
+  : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
     object_type_ (object_type),
     constr_policy_ (constr_policy)
@@ -913,24 +894,15 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (C
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
 
-  TAO_IFR_Client_Adapter *adapter =
-    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
-        TAO_ORB_Core::ifr_client_adapter_name ()
-      );
+  parameter_list->length (2);
+  CORBA::ULong len = 0;
 
-  CORBA::ULong length_object_type = parameter_list->length ();
-  parameter_list->length (length_object_type + 1);
-  adapter->interfacedef_any_insert (
-      (*parameter_list)[length_object_type].argument,
-      this->object_type_
-    );
-
-  (*parameter_list)[length_object_type].mode = Dynamic::PARAM_IN;
-
-  CORBA::ULong length_constr_policy = parameter_list->length ();
-  parameter_list->length (length_constr_policy + 1);
-  (*parameter_list)[length_constr_policy].argument <<= CORBA::Any::from_boolean (this->constr_policy_);
-  (*parameter_list)[length_constr_policy].mode = Dynamic::PARAM_IN;
+  (*parameter_list)[len].argument <<= this->object_type_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->constr_policy_);
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
 
   return safe_parameter_list._retn ();
 }
@@ -985,20 +957,20 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::target_is_a
 //
 
 // Factory function Implementation.
-_TAO_CORBA_ConstructionPolicy_Strategized_Proxy_Broker *_TAO_CORBA_ConstructionPolicy_Strategized_Proxy_Broker::the_TAO_CORBA_ConstructionPolicy_Strategized_Proxy_Broker (void)
+_TAO_ConstructionPolicy_Strategized_Proxy_Broker *_TAO_ConstructionPolicy_Strategized_Proxy_Broker::the_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void)
 {
-  static _TAO_CORBA_ConstructionPolicy_Strategized_Proxy_Broker strategized_proxy_broker;
+  static _TAO_ConstructionPolicy_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
 }
 
-_TAO_CORBA_ConstructionPolicy_Strategized_Proxy_Broker::_TAO_CORBA_ConstructionPolicy_Strategized_Proxy_Broker (void)
+_TAO_ConstructionPolicy_Strategized_Proxy_Broker::_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
 
 }
 
-_TAO_CORBA_ConstructionPolicy_Strategized_Proxy_Broker::~_TAO_CORBA_ConstructionPolicy_Strategized_Proxy_Broker (void)
+_TAO_ConstructionPolicy_Strategized_Proxy_Broker::~_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     delete this->proxy_cache_[i];
@@ -1006,7 +978,7 @@ _TAO_CORBA_ConstructionPolicy_Strategized_Proxy_Broker::~_TAO_CORBA_Construction
 }
 
 _TAO_CORBA_ConstructionPolicy_Proxy_Impl&
-_TAO_CORBA_ConstructionPolicy_Strategized_Proxy_Broker::select_proxy (
+_TAO_ConstructionPolicy_Strategized_Proxy_Broker::select_proxy (
     ::CORBA_ConstructionPolicy *object,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -1025,7 +997,7 @@ _TAO_CORBA_ConstructionPolicy_Strategized_Proxy_Broker::select_proxy (
 }
 
 void
-_TAO_CORBA_ConstructionPolicy_Strategized_Proxy_Broker::create_proxy (
+_TAO_ConstructionPolicy_Strategized_Proxy_Broker::create_proxy (
     int strategy,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -1039,16 +1011,7 @@ _TAO_CORBA_ConstructionPolicy_Strategized_Proxy_Broker::create_proxy (
         case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              _TAO_CORBA_ConstructionPolicy_ThruPOA_Proxy_Impl,
-              CORBA::NO_MEMORY ()
-          );
-          ACE_CHECK;
-          break;
-
-        case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY:
-          ACE_NEW_THROW_EX (
-              this->proxy_cache_[strategy],
-              _TAO_CORBA_ConstructionPolicy_Direct_Proxy_Impl,
+              _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -1076,38 +1039,36 @@ _TAO_CORBA_ConstructionPolicy_Strategized_Proxy_Broker::create_proxy (
 
 
 _TAO_CORBA_ConstructionPolicy_Proxy_Broker *
-_TAO_CORBA_ConstructionPolicy_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 {
   ACE_UNUSED_ARG (obj);
-  return ::_TAO_CORBA_ConstructionPolicy_Strategized_Proxy_Broker::the_TAO_CORBA_ConstructionPolicy_Strategized_Proxy_Broker();
+  return ::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::the_TAO_ConstructionPolicy_Strategized_Proxy_Broker();
 }
 
 int
-_TAO_CORBA_ConstructionPolicy_Proxy_Broker_Factory_Initializer (long _dummy_)
+CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_Initializer (long)
 {
-  ACE_UNUSED_ARG (_dummy_);
-
-  _TAO_CORBA_ConstructionPolicy_Proxy_Broker_Factory_function_pointer =
-    _TAO_CORBA_ConstructionPolicy_Proxy_Broker_Factory_function;
+  CORBA__TAO_CORBA_ConstructionPolicy_Proxy_Broker_Factory_function_pointer =
+    CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function;
 
   return 0;
 }
 
-static int _TAO_CORBA_ConstructionPolicy_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-  _TAO_CORBA_ConstructionPolicy_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_ConstructionPolicy_Proxy_Broker_Factory_Initializer));
+static int CORBA__TAO_ConstructionPolicy_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+  CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_Initializer));
 
 
 ///////////////////////////////////////////////////////////////////////
 //                 ThruPOA Proxy  Implementation
 //
 
-_TAO_CORBA_ConstructionPolicy_ThruPOA_Proxy_Impl::_TAO_CORBA_ConstructionPolicy_ThruPOA_Proxy_Impl (void)
+_TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::_TAO_ConstructionPolicy_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
-void _TAO_CORBA_ConstructionPolicy_ThruPOA_Proxy_Impl::make_domain_manager (
-    CORBA_Object *_collocated_tao_target_,
+void _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::make_domain_manager (
+    CORBA::Object_ptr _collocated_tao_target_,
     CORBA::InterfaceDef_ptr object_type,
     CORBA::Boolean constr_policy,
     CORBA::Environment &ACE_TRY_ENV
@@ -1130,7 +1091,7 @@ void _TAO_CORBA_ConstructionPolicy_ThruPOA_Proxy_Impl::make_domain_manager (
     ACE_reinterpret_cast (
       POA_CORBA_ConstructionPolicy_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:CORBA_ConstructionPolicy:1.0"
+          "IDL:omg.org/CORBA/ConstructionPolicy:1.0"
         )
     )->make_domain_manager (
         object_type,
@@ -1144,39 +1105,6 @@ void _TAO_CORBA_ConstructionPolicy_ThruPOA_Proxy_Impl::make_domain_manager (
 //           End ThruPOA Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-
-///////////////////////////////////////////////////////////////////////
-//                 Direct Proxy  Implementation
-//
-
-_TAO_CORBA_ConstructionPolicy_Direct_Proxy_Impl::_TAO_CORBA_ConstructionPolicy_Direct_Proxy_Impl (void)
-{}
-
-void _TAO_CORBA_ConstructionPolicy_Direct_Proxy_Impl::make_domain_manager  (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::InterfaceDef_ptr object_type,
-    CORBA::Boolean constr_policy,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  ACE_reinterpret_cast (
-      POA_CORBA_ConstructionPolicy_ptr,
-      _collocated_tao_target_->_servant ()->_downcast ("IDL:CORBA_ConstructionPolicy:1.0")
-    )->make_domain_manager (
-          object_type,
-          constr_policy,
-          ACE_TRY_ENV
-        );
-
-}
-
-
-//
-//           End Direct Proxy Implementation
-///////////////////////////////////////////////////////////////////////
 // skeleton constructor
 POA_CORBA_ConstructionPolicy::POA_CORBA_ConstructionPolicy (void)
 {
@@ -1185,7 +1113,7 @@ POA_CORBA_ConstructionPolicy::POA_CORBA_ConstructionPolicy (void)
 
 // copy ctor
 POA_CORBA_ConstructionPolicy::POA_CORBA_ConstructionPolicy (const POA_CORBA_ConstructionPolicy& rhs)
-  :   POA_CORBA_Policy (rhs),
+  : POA_CORBA_Policy (rhs),
     TAO_ServantBase (rhs)
 {}
 
@@ -1197,12 +1125,13 @@ POA_CORBA_ConstructionPolicy::~POA_CORBA_ConstructionPolicy (void)
 void POA_CORBA_ConstructionPolicy::make_domain_manager_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void * /* context */,
+    void *_tao_servant_upcall,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA_ConstructionPolicy *_tao_impl = (POA_CORBA_ConstructionPolicy *)_tao_object_reference;
+  POA_CORBA_ConstructionPolicy *_tao_impl =
+    ACE_static_cast (POA_CORBA_ConstructionPolicy *, _tao_object_reference);
 
   _tao_server_request.argument_flag (0);
     CORBA::InterfaceDef_var object_type;
@@ -1215,6 +1144,10 @@ void POA_CORBA_ConstructionPolicy::make_domain_manager_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -1222,6 +1155,7 @@ void POA_CORBA_ConstructionPolicy::make_domain_manager_skel (
 
   TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager ri (
       _tao_server_request,
+      _tao_upcall,
       _tao_impl,
       object_type.in (),
       constr_policy,
@@ -1247,16 +1181,6 @@ void POA_CORBA_ConstructionPolicy::make_domain_manager_skel (
       _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc);
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
@@ -1265,7 +1189,14 @@ void POA_CORBA_ConstructionPolicy::make_domain_manager_skel (
           ACE_TRY_ENV
         );
       ACE_TRY_CHECK;
-      ACE_RE_THROW;
+
+      PortableInterceptor::ReplyStatus _tao_status =
+        ri.reply_status (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+          || _tao_status == PortableInterceptor::USER_EXCEPTION)
+        ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
@@ -1273,6 +1204,8 @@ void POA_CORBA_ConstructionPolicy::make_domain_manager_skel (
 
   _tao_server_request.init_reply ();
 
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -1280,7 +1213,7 @@ void POA_CORBA_ConstructionPolicy::make_domain_manager_skel (
 void POA_CORBA_ConstructionPolicy::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* context */,
+    void * /* Servant_Upcall */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -1303,7 +1236,7 @@ void POA_CORBA_ConstructionPolicy::_is_a_skel (
 void POA_CORBA_ConstructionPolicy::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* context */,
+    void * /* Servant_Upcall */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -1320,7 +1253,7 @@ void POA_CORBA_ConstructionPolicy::_non_existent_skel (
 void POA_CORBA_ConstructionPolicy::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* context */,
+    void * /* Servant_Upcall */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -1374,7 +1307,7 @@ CORBA::Boolean POA_CORBA_ConstructionPolicy::_is_a (
   ACE_CHECK_RETURN (0);
 
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:CORBA_ConstructionPolicy:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ConstructionPolicy:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
@@ -1386,7 +1319,7 @@ void* POA_CORBA_ConstructionPolicy::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:CORBA_ConstructionPolicy:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ConstructionPolicy:1.0") == 0)
     return ACE_static_cast (POA_CORBA_ConstructionPolicy_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Policy_ptr, this);
@@ -1395,14 +1328,17 @@ void* POA_CORBA_ConstructionPolicy::_downcast (
   return 0;
 }
 
-void POA_CORBA_ConstructionPolicy::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_ConstructionPolicy::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
 {
-  this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
+  this->synchronous_upcall_dispatch (req,
+                                     servant_upcall,
+                                     this,
+                                     ACE_TRY_ENV);
 }
 
 const char* POA_CORBA_ConstructionPolicy::_interface_repository_id (void) const
 {
-  return "IDL:CORBA_ConstructionPolicy:1.0";
+  return "IDL:omg.org/CORBA/ConstructionPolicy:1.0";
 }
 
 CORBA_ConstructionPolicy*
@@ -1411,6 +1347,8 @@ POA_CORBA_ConstructionPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
 
+  TAO_Stub_Auto_Ptr safe_stub (stub);
+
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
 
   if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
@@ -1419,7 +1357,10 @@ POA_CORBA_ConstructionPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
 
   CORBA::Object_var obj = tmp;
-  return ::CORBA_ConstructionPolicy::_unchecked_narrow (obj.in ());
+
+  (void) safe_stub.release ();
+
+  return CORBA_ConstructionPolicy::_unchecked_narrow (obj.in ());
 }
 
 
diff --git a/TAO/tao/Domain/DomainS.h b/TAO/tao/Domain/DomainS.h
index b3221912dae..74f8504bc6f 100644
--- a/TAO/tao/Domain/DomainS.h
+++ b/TAO/tao/Domain/DomainS.h
@@ -19,18 +19,20 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_ORIG_DOMAINS_H_
-#define _TAO_IDL_ORIG_DOMAINS_H_
+#ifndef _TAO_IDL_DOMAINS_H_
+#define _TAO_IDL_DOMAINS_H_
 
 #include "ace/pre.h"
+
 #include "domain_export.h"
-#include "tao/DomainC.h"
-#include "tao/PortableServer/PolicyS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/DomainC.h"
+#include "tao/PortableServer/PolicyS.h"
+
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/PortableServer/Servant_Base.h"
 #include "tao/PortableServer/Collocated_Object.h"
@@ -47,422 +49,343 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-class POA_CORBA_DomainManager;
-typedef POA_CORBA_DomainManager *POA_CORBA_DomainManager_ptr;
-// Forward Classes Declaration
-class _TAO_CORBA_DomainManager_ThruPOA_Proxy_Impl;
-class _TAO_CORBA_DomainManager_Direct_Proxy_Impl;
-class _TAO_CORBA_DomainManager_Strategized_Proxy_Broker;
+  class POA_CORBA_DomainManager;
+  typedef POA_CORBA_DomainManager *POA_CORBA_DomainManager_ptr;
+  // Forward Classes Declaration
+  class _TAO_DomainManager_ThruPOA_Proxy_Impl;
+  class _TAO_DomainManager_Strategized_Proxy_Broker;
+
+  class TAO_Domain_Export POA_CORBA_DomainManager :  public virtual PortableServer::ServantBase
+  {
+  protected:
+    POA_CORBA_DomainManager (void);
+
+  public:
+    POA_CORBA_DomainManager (const POA_CORBA_DomainManager& rhs);
+    virtual ~POA_CORBA_DomainManager (void);
+
+
+    virtual CORBA::Boolean _is_a (
+        const char* logical_type_id,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
+
+    virtual void* _downcast (
+        const char* logical_type_id
+      );
+
+    static void _is_a_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *servant_upcall,
+        CORBA::Environment &ACE_TRY_ENV
+      );
+
+    static void _non_existent_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *servant_upcall,
+        CORBA::Environment &ACE_TRY_ENV
+      );
+
+    static void _interface_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *servant_upcall,
+        CORBA::Environment &ACE_TRY_ENV
+      );
+
+    virtual void _dispatch (
+        TAO_ServerRequest &req,
+        void *_servant_upcall,
+        CORBA::Environment &ACE_TRY_ENV
+      );
+
+    ::CORBA::DomainManager *_this (
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
+
+    virtual const char* _interface_repository_id (void) const;
 
-class TAO_Domain_Export POA_CORBA_DomainManager :  public virtual PortableServer::ServantBase
-{
-protected:
-  POA_CORBA_DomainManager (void);
+    virtual CORBA::Policy_ptr get_domain_policy (
+        CORBA::PolicyType policy_type,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
 
-public:
-  POA_CORBA_DomainManager (const POA_CORBA_DomainManager& rhs);
-  virtual ~POA_CORBA_DomainManager (void);
+    static void get_domain_policy_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_obj,
+        void *_tao_servant_upcall,
+        CORBA::Environment &ACE_TRY_ENV
+      );
 
 
-  virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+  };
 
-  virtual void* _downcast (
-      const char* logical_type_id
-    );
 
-  static void _is_a_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+  ///////////////////////////////////////////////////////////////////////
+  //               Strategized Proxy Broker Declaration
+  //
 
-  static void _non_existent_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+  class TAO_Domain_Export _TAO_DomainManager_Strategized_Proxy_Broker : public virtual _TAO_CORBA_DomainManager_Proxy_Broker
+  {
+  public:
+    _TAO_DomainManager_Strategized_Proxy_Broker (void);
 
-  static void _interface_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+    virtual ~_TAO_DomainManager_Strategized_Proxy_Broker (void);
 
-  virtual void _dispatch (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
+    virtual _TAO_CORBA_DomainManager_Proxy_Impl &select_proxy (
+      ::CORBA::DomainManager *object,
+      CORBA_Environment &ACE_TRY_ENV
     );
 
-  ::CORBA_DomainManager *_this (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-
-  virtual const char* _interface_repository_id (void) const;
-
-  virtual CORBA::Policy_ptr get_domain_policy (
-      CORBA::PolicyType policy_type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  static void get_domain_policy_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_obj,
-      void *_tao_context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
+  private:
+    // Helper methods that takes care to create the proxy
+    // as soon as their use is necessary.
+    void create_proxy (
+      int collocation_strategy,
+      CORBA::Environment &ACE_TRY_ENV
     );
 
+    // Caches the proxy implementations. The proxy implementation
+    // are totally stateless, and those can be shared by all the
+    // instances of a given IDL interface type.
+    _TAO_CORBA_DomainManager_Proxy_Impl
+    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
 
-};
-
-
-///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration
-//
-
-class TAO_Domain_Export _TAO_CORBA_DomainManager_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_DomainManager_Proxy_Broker
-{
-public:
-  _TAO_CORBA_DomainManager_Strategized_Proxy_Broker (void);
-
-  virtual ~_TAO_CORBA_DomainManager_Strategized_Proxy_Broker (void);
-
-  virtual ::_TAO_CORBA_DomainManager_Proxy_Impl &select_proxy (
-    ::CORBA_DomainManager *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
-
-private:
-
-// Helper methods that takes care to create the proxy
-// as soon as their use is necessary.
-  void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
-  );
+    TAO_SYNCH_MUTEX mutex_;
+    // This funxtion is used to get an handle to the unique instance
+    // of the Strategized Proxy Broker that is available for a given
+    // interface.
 
-private:
+  public:
+    static _TAO_DomainManager_Strategized_Proxy_Broker *the_TAO_DomainManager_Strategized_Proxy_Broker (void);
+  };
 
-  // Caches the proxy implementations. The proxy implementation
-  // are totally stateless, and those can be shared by all the
-  // instances of a given IDL interface type.
-  ::_TAO_CORBA_DomainManager_Proxy_Impl
-   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
 
-  TAO_SYNCH_MUTEX mutex_;
-// This funxtion is used to get an handle to the unique instance
-// of the Strategized Proxy Broker that is available for a given
-// interface.
+  //
+  //            End Strategized Proxy Broker Declaration
+  ///////////////////////////////////////////////////////////////////////
 
-public:
-  static _TAO_CORBA_DomainManager_Strategized_Proxy_Broker *the_TAO_CORBA_DomainManager_Strategized_Proxy_Broker (void);
-};
 
+  ///////////////////////////////////////////////////////////////////////
+  //                    ThruPOA  Impl. Declaration
+  //
 
-//
-//            End Strategized Proxy Broker Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    ThruPOA  Impl. Declaration
-//
-
-class TAO_Domain_Export _TAO_CORBA_DomainManager_ThruPOA_Proxy_Impl :
-  public virtual ::_TAO_CORBA_DomainManager_Proxy_Impl,
-  public virtual TAO_ThruPOA_Object_Proxy_Impl
-{
-public:
-  _TAO_CORBA_DomainManager_ThruPOA_Proxy_Impl (void);
+  class TAO_Domain_Export _TAO_DomainManager_ThruPOA_Proxy_Impl :
+    public virtual _TAO_CORBA_DomainManager_Proxy_Impl,
+    public virtual TAO_ThruPOA_Object_Proxy_Impl
+  {
+  public:
+    _TAO_DomainManager_ThruPOA_Proxy_Impl (void);
 
-  virtual ~_TAO_CORBA_DomainManager_ThruPOA_Proxy_Impl (void) { }
+    virtual ~_TAO_DomainManager_ThruPOA_Proxy_Impl (void) { }
 
     virtual CORBA::Policy_ptr get_domain_policy (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::PolicyType policy_type,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-};
-
-
-//
-//                ThruPOA  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Direct  Impl. Declaration
-//
-
-class TAO_Domain_Export _TAO_CORBA_DomainManager_Direct_Proxy_Impl :
-  public virtual _TAO_CORBA_DomainManager_Proxy_Impl,
-  public virtual TAO_Direct_Object_Proxy_Impl
-{
-public:
-  _TAO_CORBA_DomainManager_Direct_Proxy_Impl (void);
-
-  virtual ~_TAO_CORBA_DomainManager_Direct_Proxy_Impl (void) { }
-
-    virtual CORBA::Policy_ptr get_domain_policy (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::PolicyType policy_type,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-};
-
-
-//
-//                Direct  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-class POA_CORBA_ConstructionPolicy;
-typedef POA_CORBA_ConstructionPolicy *POA_CORBA_ConstructionPolicy_ptr;
-// Forward Classes Declaration
-class _TAO_CORBA_ConstructionPolicy_ThruPOA_Proxy_Impl;
-class _TAO_CORBA_ConstructionPolicy_Direct_Proxy_Impl;
-class _TAO_CORBA_ConstructionPolicy_Strategized_Proxy_Broker;
-
-class TAO_Domain_Export POA_CORBA_ConstructionPolicy : public virtual POA_CORBA_Policy
-{
-protected:
-  POA_CORBA_ConstructionPolicy (void);
-
-public:
-  POA_CORBA_ConstructionPolicy (const POA_CORBA_ConstructionPolicy& rhs);
-  virtual ~POA_CORBA_ConstructionPolicy (void);
-
-
-  virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+        CORBA::Object_ptr _collocated_tao_target_,
+        CORBA::PolicyType policy_type,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+
+  };
+
+  //
+  //                ThruPOA  Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
+
+
+  class POA_CORBA_ConstructionPolicy;
+  typedef POA_CORBA_ConstructionPolicy *POA_CORBA_ConstructionPolicy_ptr;
+  // Forward Classes Declaration
+  class _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl;
+  class _TAO_ConstructionPolicy_Strategized_Proxy_Broker;
+
+  class TAO_Domain_Export POA_CORBA_ConstructionPolicy : public virtual POA_CORBA_Policy
+  {
+  protected:
+    POA_CORBA_ConstructionPolicy (void);
+
+  public:
+    POA_CORBA_ConstructionPolicy (const POA_CORBA_ConstructionPolicy& rhs);
+    virtual ~POA_CORBA_ConstructionPolicy (void);
+
+
+    virtual CORBA::Boolean _is_a (
+        const char* logical_type_id,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
+
+    virtual void* _downcast (
+        const char* logical_type_id
+      );
+
+    static void _is_a_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *servant_upcall,
+        CORBA::Environment &ACE_TRY_ENV
+      );
+
+    static void _non_existent_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *servant_upcall,
+        CORBA::Environment &ACE_TRY_ENV
+      );
+
+    static void _interface_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *servant_upcall,
+        CORBA::Environment &ACE_TRY_ENV
+      );
+
+    virtual void _dispatch (
+        TAO_ServerRequest &req,
+        void *_servant_upcall,
+        CORBA::Environment &ACE_TRY_ENV
+      );
+
+    CORBA_ConstructionPolicy *_this (
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
+
+    virtual const char* _interface_repository_id (void) const;
 
-  virtual void* _downcast (
-      const char* logical_type_id
-    );
-
-  static void _is_a_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-
-  static void _non_existent_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-
-  static void _interface_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-
-  virtual void _dispatch (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-
-  ::CORBA_ConstructionPolicy *_this (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-
-  virtual const char* _interface_repository_id (void) const;
-
-  virtual void make_domain_manager (
-      CORBA::InterfaceDef_ptr object_type,
-      CORBA::Boolean constr_policy,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  static void make_domain_manager_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_obj,
-      void *_tao_context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-
-  static void _get_policy_type_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-
-  static void copy_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
+    virtual void make_domain_manager (
+        CORBA::InterfaceDef_ptr object_type,
+        CORBA::Boolean constr_policy,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    static void make_domain_manager_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_obj,
+        void *_tao_servant_upcall,
+        CORBA::Environment &ACE_TRY_ENV
+      );
+
+    static void _get_policy_type_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
+
+    static void copy_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
+
+    static void destroy_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
+
+
+  };
+
+
+  ///////////////////////////////////////////////////////////////////////
+  //               Strategized Proxy Broker Declaration
+  //
+
+  class TAO_Domain_Export _TAO_ConstructionPolicy_Strategized_Proxy_Broker : public virtual _TAO_CORBA_ConstructionPolicy_Proxy_Broker
+  {
+  public:
+    _TAO_ConstructionPolicy_Strategized_Proxy_Broker (void);
+
+    virtual ~_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void);
+
+    virtual _TAO_CORBA_ConstructionPolicy_Proxy_Impl &select_proxy (
+      CORBA_ConstructionPolicy *object,
+      CORBA_Environment &ACE_TRY_ENV
     );
 
-  static void destroy_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
+  private:
+    // Helper methods that takes care to create the proxy
+    // as soon as their use is necessary.
+    void create_proxy (
+      int collocation_strategy,
+      CORBA::Environment &ACE_TRY_ENV
     );
 
+    // Caches the proxy implementations. The proxy implementation
+    // are totally stateless, and those can be shared by all the
+    // instances of a given IDL interface type.
+    _TAO_CORBA_ConstructionPolicy_Proxy_Impl
+    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
 
-};
-
-
-///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration
-//
-
-class TAO_Domain_Export _TAO_CORBA_ConstructionPolicy_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ConstructionPolicy_Proxy_Broker
-{
-public:
-  _TAO_CORBA_ConstructionPolicy_Strategized_Proxy_Broker (void);
-
-  virtual ~_TAO_CORBA_ConstructionPolicy_Strategized_Proxy_Broker (void);
+    TAO_SYNCH_MUTEX mutex_;
+    // This funxtion is used to get an handle to the unique instance
+    // of the Strategized Proxy Broker that is available for a given
+    // interface.
 
-  virtual ::_TAO_CORBA_ConstructionPolicy_Proxy_Impl &select_proxy (
-    ::CORBA_ConstructionPolicy *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
+  public:
+    static _TAO_ConstructionPolicy_Strategized_Proxy_Broker *the_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void);
+  };
 
-private:
 
-// Helper methods that takes care to create the proxy
-// as soon as their use is necessary.
-  void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
-  );
+  //
+  //            End Strategized Proxy Broker Declaration
+  ///////////////////////////////////////////////////////////////////////
 
-private:
 
-  // Caches the proxy implementations. The proxy implementation
-  // are totally stateless, and those can be shared by all the
-  // instances of a given IDL interface type.
-  ::_TAO_CORBA_ConstructionPolicy_Proxy_Impl
-   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
+  ///////////////////////////////////////////////////////////////////////
+  //                    ThruPOA  Impl. Declaration
+  //
 
-  TAO_SYNCH_MUTEX mutex_;
-// This funxtion is used to get an handle to the unique instance
-// of the Strategized Proxy Broker that is available for a given
-// interface.
+  class TAO_Domain_Export _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl :
+    public virtual _TAO_CORBA_ConstructionPolicy_Proxy_Impl,
+    public virtual TAO_ThruPOA_Object_Proxy_Impl,
+    public virtual POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl
 
-public:
-  static _TAO_CORBA_ConstructionPolicy_Strategized_Proxy_Broker *the_TAO_CORBA_ConstructionPolicy_Strategized_Proxy_Broker (void);
-};
+  {
+  public:
+    _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl (void);
 
-
-//
-//            End Strategized Proxy Broker Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    ThruPOA  Impl. Declaration
-//
-
-class TAO_Domain_Export _TAO_CORBA_ConstructionPolicy_ThruPOA_Proxy_Impl :
-  public virtual ::_TAO_CORBA_ConstructionPolicy_Proxy_Impl,
-  public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_Policy_ThruPOA_Proxy_Impl
-
-{
-public:
-  _TAO_CORBA_ConstructionPolicy_ThruPOA_Proxy_Impl (void);
-
-  virtual ~_TAO_CORBA_ConstructionPolicy_ThruPOA_Proxy_Impl (void) { }
+    virtual ~_TAO_ConstructionPolicy_ThruPOA_Proxy_Impl (void) { }
 
     virtual void make_domain_manager (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::InterfaceDef_ptr object_type,
-      CORBA::Boolean constr_policy,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-};
-
+        CORBA::Object_ptr _collocated_tao_target_,
+        CORBA::InterfaceDef_ptr object_type,
+        CORBA::Boolean constr_policy,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
 
-//
-//                ThruPOA  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Direct  Impl. Declaration
-//
-
-class TAO_Domain_Export _TAO_CORBA_ConstructionPolicy_Direct_Proxy_Impl :
-  public virtual _TAO_CORBA_ConstructionPolicy_Proxy_Impl,
-  public virtual TAO_Direct_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_Policy_Direct_Proxy_Impl
 
-{
-public:
-  _TAO_CORBA_ConstructionPolicy_Direct_Proxy_Impl (void);
+  };
 
-  virtual ~_TAO_CORBA_ConstructionPolicy_Direct_Proxy_Impl (void) { }
+  //
+  //                ThruPOA  Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
 
-    virtual void make_domain_manager (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::InterfaceDef_ptr object_type,
-      CORBA::Boolean constr_policy,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-};
-
-
-//
-//                Direct  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
 
 #include "DomainS_T.h"
 
diff --git a/TAO/tao/Domain/DomainS_T.cpp b/TAO/tao/Domain/DomainS_T.cpp
index c1f98b3d8b2..9fcddd72ad1 100644
--- a/TAO/tao/Domain/DomainS_T.cpp
+++ b/TAO/tao/Domain/DomainS_T.cpp
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_ORIG_DOMAINS_T_CPP_
-#define _TAO_IDL_ORIG_DOMAINS_T_CPP_
+#ifndef _TAO_IDL_DOMAINS_T_CPP_
+#define _TAO_IDL_DOMAINS_T_CPP_
 
 #include "DomainS_T.h"
 
diff --git a/TAO/tao/Domain/DomainS_T.h b/TAO/tao/Domain/DomainS_T.h
index ce809a2dc64..512ecdf2eb9 100644
--- a/TAO/tao/Domain/DomainS_T.h
+++ b/TAO/tao/Domain/DomainS_T.h
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_ORIG_DOMAINS_T_H_
-#define _TAO_IDL_ORIG_DOMAINS_T_H_
+#ifndef _TAO_IDL_DOMAINS_T_H_
+#define _TAO_IDL_DOMAINS_T_H_
 
 #include "ace/pre.h"
 #if defined(_MSC_VER)
@@ -32,135 +32,135 @@
 
 #if defined (ACE_HAS_USING_KEYWORD)
 
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class TAO_Domain_Export POA_CORBA_DomainManager_tie : public POA_CORBA_DomainManager
-{
-public:
-  POA_CORBA_DomainManager_tie (T &t);
-  // the T& ctor
-  POA_CORBA_DomainManager_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  POA_CORBA_DomainManager_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  POA_CORBA_DomainManager_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~POA_CORBA_DomainManager_tie (void);
-  // dtor
-
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  CORBA::Policy_ptr get_domain_policy (
-      CORBA::PolicyType policy_type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-
-  // copy and assignment are not allowed
-  POA_CORBA_DomainManager_tie (const POA_CORBA_DomainManager_tie &);
-  void operator= (const POA_CORBA_DomainManager_tie &);
-};
-
-
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class TAO_Domain_Export POA_CORBA_ConstructionPolicy_tie : public POA_CORBA_ConstructionPolicy
-{
-public:
-  POA_CORBA_ConstructionPolicy_tie (T &t);
-  // the T& ctor
-  POA_CORBA_ConstructionPolicy_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  POA_CORBA_ConstructionPolicy_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  POA_CORBA_ConstructionPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~POA_CORBA_ConstructionPolicy_tie (void);
-  // dtor
-
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  void make_domain_manager (
-      CORBA::InterfaceDef_ptr object_type,
-      CORBA::Boolean constr_policy,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::PolicyType policy_type (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::Policy_ptr copy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-
-  // copy and assignment are not allowed
-  POA_CORBA_ConstructionPolicy_tie (const POA_CORBA_ConstructionPolicy_tie &);
-  void operator= (const POA_CORBA_ConstructionPolicy_tie &);
-};
+  // TIE class: Refer to CORBA v2.2, Section 20.34.4
+  template <class T>
+  class TAO_Domain_Export POA_CORBA_DomainManager_tie : public POA_CORBA_DomainManager
+  {
+  public:
+    POA_CORBA_DomainManager_tie (T &t);
+    // the T& ctor
+    POA_CORBA_DomainManager_tie (T &t, PortableServer::POA_ptr poa);
+    // ctor taking a POA
+    POA_CORBA_DomainManager_tie (T *tp, CORBA::Boolean release=1);
+    // ctor taking pointer and an ownership flag
+    POA_CORBA_DomainManager_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+    // ctor with T*, ownership flag and a POA
+    ~POA_CORBA_DomainManager_tie (void);
+    // dtor
+
+    // TIE specific functions
+    T *_tied_object (void);
+    // return the underlying object
+    void _tied_object (T &obj);
+    // set the underlying object
+    void _tied_object (T *obj, CORBA::Boolean release=1);
+    // set the underlying object and the ownership flag
+    CORBA::Boolean _is_owner (void);
+    // do we own it
+    void _is_owner (CORBA::Boolean b);
+    // set the ownership
+
+    // overridden ServantBase operations
+    PortableServer::POA_ptr _default_POA (
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
+    CORBA::Policy_ptr get_domain_policy (
+        CORBA::PolicyType policy_type,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+  private:
+    T *ptr_;
+    PortableServer::POA_var poa_;
+    CORBA::Boolean rel_;
+
+    // copy and assignment are not allowed
+    POA_CORBA_DomainManager_tie (const POA_CORBA_DomainManager_tie &);
+    void operator= (const POA_CORBA_DomainManager_tie &);
+  };
+
+  // TIE class: Refer to CORBA v2.2, Section 20.34.4
+  template <class T>
+  class TAO_Export POA_CORBA_ConstructionPolicy_tie : public POA_CORBA_ConstructionPolicy
+  {
+  public:
+    POA_CORBA_ConstructionPolicy_tie (T &t);
+    // the T& ctor
+    POA_CORBA_ConstructionPolicy_tie (T &t, PortableServer::POA_ptr poa);
+    // ctor taking a POA
+    POA_CORBA_ConstructionPolicy_tie (T *tp, CORBA::Boolean release=1);
+    // ctor taking pointer and an ownership flag
+    POA_CORBA_ConstructionPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+    // ctor with T*, ownership flag and a POA
+    ~POA_CORBA_ConstructionPolicy_tie (void);
+    // dtor
+
+    // TIE specific functions
+    T *_tied_object (void);
+    // return the underlying object
+    void _tied_object (T &obj);
+    // set the underlying object
+    void _tied_object (T *obj, CORBA::Boolean release=1);
+    // set the underlying object and the ownership flag
+    CORBA::Boolean _is_owner (void);
+    // do we own it
+    void _is_owner (CORBA::Boolean b);
+    // set the ownership
+
+    // overridden ServantBase operations
+    PortableServer::POA_ptr _default_POA (
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
+    void make_domain_manager (
+        CORBA::InterfaceDef_ptr object_type,
+        CORBA::Boolean constr_policy,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA::PolicyType policy_type (
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA::Policy_ptr copy (
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void destroy (
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+  private:
+    T *ptr_;
+    PortableServer::POA_var poa_;
+    CORBA::Boolean rel_;
+
+    // copy and assignment are not allowed
+    POA_CORBA_ConstructionPolicy_tie (const POA_CORBA_ConstructionPolicy_tie &);
+    void operator= (const POA_CORBA_ConstructionPolicy_tie &);
+  };
+
 
 #endif /* ACE_HAS_USING_KEYWORD */
 
diff --git a/TAO/tao/Domain/DomainS_T.i b/TAO/tao/Domain/DomainS_T.i
index f0f9bb83583..ccb44497ec0 100644
--- a/TAO/tao/Domain/DomainS_T.i
+++ b/TAO/tao/Domain/DomainS_T.i
@@ -247,5 +247,3 @@ ACE_TRY_ENV
 }
 
 #endif /* ACE_HAS_USING_KEYWORD */
-
-
diff --git a/TAO/tao/Domain/Makefile b/TAO/tao/Domain/Makefile
index b5a35bf352a..ac2e8a51298 100644
--- a/TAO/tao/Domain/Makefile
+++ b/TAO/tao/Domain/Makefile
@@ -50,8 +50,7 @@ CPPFLAGS += -I$(TAO_ROOT)
 
 
 .obj/DomainS.o .obj/DomainS.so .shobj/DomainS.o .shobj/DomainS.so: DomainS.cpp DomainS.h \
- $(ACE_ROOT)/ace/pre.h \
- domain_export.h \
+ $(ACE_ROOT)/ace/pre.h domain_export.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
@@ -61,7 +60,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
  $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -149,33 +147,14 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Encodable.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(ACE_ROOT)/ace/Unbounded_Queue.h \
- $(ACE_ROOT)/ace/Unbounded_Queue.inl \
- $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
@@ -183,36 +162,32 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/PortableServer/PolicyS.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
@@ -228,28 +203,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
  $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(ACE_ROOT)/ace/Array_Base.h \
- $(ACE_ROOT)/ace/Array_Base.inl \
- $(ACE_ROOT)/ace/Array_Base.cpp \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/PortableServer/PolicyS.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
- $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
- $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
- $(TAO_ROOT)/tao/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
  $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
@@ -280,6 +233,9 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Unbounded_Queue.h \
+ $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -319,15 +275,27 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Adapter.i \
  $(TAO_ROOT)/tao/Service_Context.h \
  $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \
  $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \
  $(TAO_ROOT)/tao/TAO_Server_Request.h \
  $(TAO_ROOT)/tao/Tagged_Profile.h \
  $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/GIOPC.i \
  $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
  $(TAO_ROOT)/tao/TAO_Server_Request.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Policy_Manager.h \
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
@@ -337,6 +305,18 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(TAO_ROOT)/tao/Parser_Registry.h \
  $(TAO_ROOT)/tao/Parser_Registry.i \
  $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -344,8 +324,13 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(ACE_ROOT)/ace/Array_Base.h \
+ $(ACE_ROOT)/ace/Array_Base.inl \
+ $(ACE_ROOT)/ace/Array_Base.cpp \
  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
@@ -367,15 +352,20 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/IFR_Client_Adapter.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/RequestInfo_Util.h \
  $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
  $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
- $(TAO_ROOT)/tao/RequestInfo_Util.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.inl \
  $(TAO_ROOT)/tao/IFR_Client/IFR_ExtendedC.h \
  $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.h \
  $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.h \
diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index 39aa85dbfc4..7dfa513c009 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -23,10 +23,14 @@
 
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
-#include "tao/ClientRequestInfo.h"
+#include "tao/PortableInterceptor.h"
+
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
+#include "tao/ClientRequestInfo.h"
+#include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
+
 #include "tao/IFR_Client_Adapter.h"
 #include "ace/Dynamic_Service.h"
 
@@ -38,6 +42,48 @@
 #include "DomainC.i"
 #endif /* !defined INLINE */
 
+CORBA_DomainManager_ptr
+tao_CORBA_DomainManager_duplicate (
+    CORBA_DomainManager_ptr p
+  )
+{
+  return CORBA_DomainManager::_duplicate (p);
+}
+
+void
+tao_CORBA_DomainManager_release (
+    CORBA_DomainManager_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA_DomainManager_ptr
+tao_CORBA_DomainManager_nil (
+    void
+  )
+{
+  return CORBA_DomainManager::_nil ();
+}
+
+CORBA_DomainManager_ptr
+tao_CORBA_DomainManager_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA_DomainManager::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_CORBA_DomainManager_upcast (
+    void *src
+  )
+{
+  CORBA_DomainManager **tmp =
+    ACE_static_cast (CORBA_DomainManager **, src);
+  return *tmp;
+}
 
 // *************************************************************
 // Operations for class CORBA_DomainManager_var
@@ -87,7 +133,7 @@ CORBA_DomainManager_var::operator const ::CORBA_DomainManager_ptr &() const // c
   return this->ptr_;
 }
 
-CORBA_DomainManager_var::operator ::CORBA_DomainManager_ptr &() // cast 
+CORBA_DomainManager_var::operator ::CORBA_DomainManager_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -161,6 +207,7 @@ CORBA_DomainManager_var::upcast (void *src)
     ACE_static_cast (CORBA_DomainManager **, src);
   return *tmp;
 }
+
 // *************************************************************
 // Operations for class CORBA_DomainManager_out
 // *************************************************************
@@ -282,10 +329,12 @@ TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::arguments (CORBA::E
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
 
-  CORBA::ULong length_policy_type = parameter_list->length ();
-  parameter_list->length (length_policy_type + 1);
-  (*parameter_list)[length_policy_type].argument <<= policy_type_;
-  (*parameter_list)[length_policy_type].mode = Dynamic::PARAM_IN;
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= this->policy_type_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
 
   return safe_parameter_list._retn ();
 }
@@ -341,7 +390,7 @@ _TAO_CORBA_DomainManager_Remote_Proxy_Impl::_TAO_CORBA_DomainManager_Remote_Prox
 // Remote Implementation of the IDL interface methods
 
 CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy (
-    CORBA_Object *_collocated_tao_target_,
+    CORBA::Object_ptr _collocated_tao_target_,
     CORBA::PolicyType policy_type,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -367,16 +416,20 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
 
 #endif  /* TAO_HAS_INTERCEPTORS */
 
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
 
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy ri (
@@ -387,22 +440,31 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy
       );
       ACE_CHECK_RETURN (0);
 
-      ACE_TRY
-        {
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
 
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
 
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
+#if TAO_HAS_INTERCEPTORS == 1
+
+      ACE_TRY
+        {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
           );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
@@ -427,11 +489,24 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
 
             }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
 
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
@@ -445,71 +520,52 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy
 
             }
 
-          TAO_INTERCEPTOR (
-              CORBA::Policy_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          CORBA::Policy_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
 
-          ri.forward_reference (exc);
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-#endif /* TAO_HAS_INTERCEPTORS */
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
 
-      break;
-    }
-  return _tao_safe_retval._retn ();
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 
@@ -530,7 +586,7 @@ _TAO_CORBA_DomainManager_Proxy_Broker::~_TAO_CORBA_DomainManager_Proxy_Broker (v
 {
 }
 
-_TAO_CORBA_DomainManager_Proxy_Broker * (*_TAO_CORBA_DomainManager_Proxy_Broker_Factory_function_pointer) (
+_TAO_CORBA_DomainManager_Proxy_Broker * (*CORBA__TAO_CORBA_DomainManager_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
@@ -580,7 +636,7 @@ CORBA_DomainManager::CORBA_DomainManager_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_CORBA_DomainManager_Proxy_Broker_ =
-      ::_TAO_CORBA_DomainManager_Proxy_Broker_Factory_function_pointer (this);
+      ::CORBA__TAO_CORBA_DomainManager_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_CORBA_DomainManager_Proxy_Broker_ =
       ::_TAO_CORBA_DomainManager_Remote_Proxy_Broker::the_TAO_CORBA_DomainManager_Remote_Proxy_Broker ();
@@ -601,7 +657,7 @@ CORBA_DomainManager_ptr CORBA_DomainManager::_narrow (
     return CORBA_DomainManager::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:CORBA_DomainManager:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/DomainManager:1.0", ACE_TRY_ENV);
       ACE_CHECK_RETURN (CORBA_DomainManager::_nil ());
       if (is_a == 0)
         return CORBA_DomainManager::_nil ();
@@ -616,17 +672,19 @@ CORBA_DomainManager_ptr CORBA_DomainManager::_unchecked_narrow (
 {
   if (CORBA::is_nil (obj))
     return CORBA_DomainManager::_nil ();
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
       if (stub)
         stub->_incr_refcnt ();
+
       CORBA_DomainManager_ptr default_proxy = CORBA_DomainManager::_nil ();
 
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&_TAO_CORBA_DomainManager_Proxy_Broker_Factory_function_pointer != 0
+          obj->_is_collocated () &&CORBA__TAO_CORBA_DomainManager_Proxy_Broker_Factory_function_pointer != 0
         )
       {
         ACE_NEW_RETURN (
@@ -669,7 +727,7 @@ CORBA_DomainManager::_duplicate (CORBA_DomainManager_ptr obj)
 CORBA::Boolean CORBA_DomainManager::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
 {
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:CORBA_DomainManager:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/DomainManager:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
@@ -681,7 +739,7 @@ void *CORBA_DomainManager::_tao_QueryInterface (ptr_arith_t type)
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &CORBA_DomainManager::_narrow))
+     &CORBA_DomainManager::_narrow))
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
@@ -694,7 +752,7 @@ void *CORBA_DomainManager::_tao_QueryInterface (ptr_arith_t type)
 
 const char* CORBA_DomainManager::_interface_repository_id (void) const
 {
-  return "IDL:CORBA_DomainManager:1.0";
+  return "IDL:omg.org/CORBA/DomainManager:1.0";
 }
 
 CORBA::Policy_ptr CORBA_DomainManager::get_domain_policy (
@@ -719,20 +777,21 @@ CORBA::Policy_ptr CORBA_DomainManager::get_domain_policy (
 static const CORBA::Long _oc_CORBA_DomainManager[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  28,
+  36,
   ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
   ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x415f446f),
+  ACE_NTOHL (0x412f446f),
   ACE_NTOHL (0x6d61696e),
   ACE_NTOHL (0x4d616e61),
   ACE_NTOHL (0x6765723a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:CORBA_DomainManager:1.0
-  20,
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x415f446f),
-  ACE_NTOHL (0x6d61696e),
-  ACE_NTOHL (0x4d616e61),
-  ACE_NTOHL (0x67657200),  // name = CORBA_DomainManager
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/DomainManager:1.0
+  14,
+  ACE_NTOHL (0x446f6d61),
+  ACE_NTOHL (0x696e4d61),
+  ACE_NTOHL (0x6e616765),
+  ACE_NTOHL (0x72000000),  // name = CORBA_DomainManager
 };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_DomainManager (
@@ -746,6 +805,53 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_DomainManager (
 CORBA::TypeCode_ptr _tc_CORBA_DomainManager =
   &_tc_TAO_tc_CORBA_DomainManager;
 
+TAO_NAMESPACE_TYPE (const CORBA::ULong)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, SecConstruction, 11U)
+TAO_NAMESPACE_END
+CORBA_ConstructionPolicy_ptr
+tao_CORBA_ConstructionPolicy_duplicate (
+    CORBA_ConstructionPolicy_ptr p
+  )
+{
+  return CORBA_ConstructionPolicy::_duplicate (p);
+}
+
+void
+tao_CORBA_ConstructionPolicy_release (
+    CORBA_ConstructionPolicy_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA_ConstructionPolicy_ptr
+tao_CORBA_ConstructionPolicy_nil (
+    void
+  )
+{
+  return CORBA_ConstructionPolicy::_nil ();
+}
+
+CORBA_ConstructionPolicy_ptr
+tao_CORBA_ConstructionPolicy_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA_ConstructionPolicy::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_CORBA_ConstructionPolicy_upcast (
+    void *src
+  )
+{
+  CORBA_ConstructionPolicy **tmp =
+    ACE_static_cast (CORBA_ConstructionPolicy **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class CORBA_ConstructionPolicy_var
 // *************************************************************
@@ -794,7 +900,7 @@ CORBA_ConstructionPolicy_var::operator const ::CORBA_ConstructionPolicy_ptr &()
   return this->ptr_;
 }
 
-CORBA_ConstructionPolicy_var::operator ::CORBA_ConstructionPolicy_ptr &() // cast 
+CORBA_ConstructionPolicy_var::operator ::CORBA_ConstructionPolicy_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -868,6 +974,7 @@ CORBA_ConstructionPolicy_var::upcast (void *src)
     ACE_static_cast (CORBA_ConstructionPolicy **, src);
   return *tmp;
 }
+
 // *************************************************************
 // Operations for class CORBA_ConstructionPolicy_out
 // *************************************************************
@@ -935,7 +1042,7 @@ public:
   TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::InterfaceDef_ptr object_type,
+      CORBA_InterfaceDef_ptr object_type,
       const CORBA::Boolean & constr_policy,
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
@@ -963,7 +1070,7 @@ private:
   TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager (const TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager &);
   void operator= (const TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager &);
 
-  CORBA::InterfaceDef_ptr object_type_;
+  CORBA_InterfaceDef_ptr object_type_;
   const CORBA::Boolean & constr_policy_;
 
 };
@@ -971,7 +1078,7 @@ private:
 TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::InterfaceDef_ptr object_type,
+    CORBA_InterfaceDef_ptr object_type,
     const CORBA::Boolean & constr_policy,
     CORBA::Environment &
   )
@@ -991,24 +1098,23 @@ TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (C
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
 
+  parameter_list->length (2);
+  CORBA::ULong len = 0;
   TAO_IFR_Client_Adapter *adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
 
-  CORBA::ULong length_object_type = parameter_list->length ();
-  parameter_list->length (length_object_type + 1);
   adapter->interfacedef_any_insert (
-      (*parameter_list)[length_object_type].argument,
+      (*parameter_list)[len].argument,
       this->object_type_
     );
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
 
-  (*parameter_list)[length_object_type].mode = Dynamic::PARAM_IN;
-
-  CORBA::ULong length_constr_policy = parameter_list->length ();
-  parameter_list->length (length_constr_policy + 1);
-  (*parameter_list)[length_constr_policy].argument <<= CORBA::Any::from_boolean (this->constr_policy_);
-  (*parameter_list)[length_constr_policy].mode = Dynamic::PARAM_IN;
+    (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->constr_policy_);
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
 
   return safe_parameter_list._retn ();
 }
@@ -1054,8 +1160,8 @@ _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::_TAO_CORBA_ConstructionPolicy_R
 // Remote Implementation of the IDL interface methods
 
 void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::InterfaceDef_ptr object_type,
+    CORBA::Object_ptr _collocated_tao_target_,
+    CORBA_InterfaceDef_ptr object_type,
     CORBA::Boolean constr_policy,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -1080,9 +1186,13 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
 
 #endif  /* TAO_HAS_INTERCEPTORS */
@@ -1094,7 +1204,7 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
 
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
 
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager ri (
@@ -1106,22 +1216,31 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
       );
       ACE_CHECK;
 
-      ACE_TRY
-        {
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
 
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
 
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
+#if TAO_HAS_INTERCEPTORS == 1
+
+      ACE_TRY
+        {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
           );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
@@ -1146,70 +1265,67 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
 
             }
-
-
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
 
-          );
-          TAO_INTERCEPTOR_CHECK;
 
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
 
-          ri.forward_reference (exc);
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
 
-#endif /* TAO_HAS_INTERCEPTORS */
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
 
-      break;
-    }
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
 }
 
@@ -1231,7 +1347,7 @@ _TAO_CORBA_ConstructionPolicy_Proxy_Broker::~_TAO_CORBA_ConstructionPolicy_Proxy
 {
 }
 
-_TAO_CORBA_ConstructionPolicy_Proxy_Broker * (*_TAO_CORBA_ConstructionPolicy_Proxy_Broker_Factory_function_pointer) (
+_TAO_CORBA_ConstructionPolicy_Proxy_Broker * (*CORBA__TAO_CORBA_ConstructionPolicy_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
@@ -1281,7 +1397,7 @@ CORBA_ConstructionPolicy::CORBA_ConstructionPolicy_setup_collocation (int colloc
 {
   if (collocated)
     this->the_TAO_CORBA_ConstructionPolicy_Proxy_Broker_ =
-      ::_TAO_CORBA_ConstructionPolicy_Proxy_Broker_Factory_function_pointer (this);
+      ::CORBA__TAO_CORBA_ConstructionPolicy_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_CORBA_ConstructionPolicy_Proxy_Broker_ =
       ::_TAO_CORBA_ConstructionPolicy_Remote_Proxy_Broker::the_TAO_CORBA_ConstructionPolicy_Remote_Proxy_Broker ();
@@ -1304,7 +1420,7 @@ CORBA_ConstructionPolicy_ptr CORBA_ConstructionPolicy::_narrow (
     return CORBA_ConstructionPolicy::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:CORBA_ConstructionPolicy:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ConstructionPolicy:1.0", ACE_TRY_ENV);
       ACE_CHECK_RETURN (CORBA_ConstructionPolicy::_nil ());
       if (is_a == 0)
         return CORBA_ConstructionPolicy::_nil ();
@@ -1319,17 +1435,19 @@ CORBA_ConstructionPolicy_ptr CORBA_ConstructionPolicy::_unchecked_narrow (
 {
   if (CORBA::is_nil (obj))
     return CORBA_ConstructionPolicy::_nil ();
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
       if (stub)
         stub->_incr_refcnt ();
+
       CORBA_ConstructionPolicy_ptr default_proxy = CORBA_ConstructionPolicy::_nil ();
 
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&_TAO_CORBA_ConstructionPolicy_Proxy_Broker_Factory_function_pointer != 0
+          obj->_is_collocated () &&CORBA__TAO_CORBA_ConstructionPolicy_Proxy_Broker_Factory_function_pointer != 0
         )
       {
         ACE_NEW_RETURN (
@@ -1372,7 +1490,7 @@ CORBA_ConstructionPolicy::_duplicate (CORBA_ConstructionPolicy_ptr obj)
 CORBA::Boolean CORBA_ConstructionPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
 {
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:CORBA_ConstructionPolicy:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ConstructionPolicy:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
@@ -1410,11 +1528,11 @@ void *CORBA_ConstructionPolicy::_tao_QueryInterface (ptr_arith_t type)
 
 const char* CORBA_ConstructionPolicy::_interface_repository_id (void) const
 {
-  return "IDL:CORBA_ConstructionPolicy:1.0";
+  return "IDL:omg.org/CORBA/ConstructionPolicy:1.0";
 }
 
 void CORBA_ConstructionPolicy::make_domain_manager (
-    CORBA::InterfaceDef_ptr object_type,
+    CORBA_InterfaceDef_ptr object_type,
     CORBA::Boolean constr_policy,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -1437,24 +1555,24 @@ void CORBA_ConstructionPolicy::make_domain_manager (
 static const CORBA::Long _oc_CORBA_ConstructionPolicy[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  33,
+  41,
   ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
   ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x415f436f),
+  ACE_NTOHL (0x412f436f),
   ACE_NTOHL (0x6e737472),
   ACE_NTOHL (0x75637469),
   ACE_NTOHL (0x6f6e506f),
   ACE_NTOHL (0x6c696379),
   ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:CORBA_ConstructionPolicy:1.0
-  25,
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x415f436f),
-  ACE_NTOHL (0x6e737472),
-  ACE_NTOHL (0x75637469),
-  ACE_NTOHL (0x6f6e506f),
-  ACE_NTOHL (0x6c696379),
-  ACE_NTOHL (0x0),  // name = CORBA_ConstructionPolicy
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ConstructionPolicy:1.0
+  19,
+  ACE_NTOHL (0x436f6e73),
+  ACE_NTOHL (0x74727563),
+  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63790000),  // name = CORBA_ConstructionPolicy
 };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_ConstructionPolicy (
@@ -1468,7 +1586,6 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ConstructionPolicy (
 CORBA::TypeCode_ptr _tc_CORBA_ConstructionPolicy =
   &_tc_TAO_tc_CORBA_ConstructionPolicy;
 
-
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_DOMAINMANAGERLIST_CS_)
@@ -1495,7 +1612,7 @@ CORBA::TypeCode_ptr _tc_CORBA_ConstructionPolicy =
               tmp[i] = old[i];
             }
         }
-      
+
       if (this->release_)
         {
           delete[] old;
@@ -1512,10 +1629,10 @@ CORBA::TypeCode_ptr _tc_CORBA_ConstructionPolicy =
     CORBA_DomainManager **tmp = ACE_reinterpret_cast (CORBA_DomainManager**, this->buffer_);
 
     for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA_DomainManager::_nil ();
-    }
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = CORBA_DomainManager::_nil ();
+      }
 
     _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::freebuf (tmp);
     this->buffer_ = 0;
@@ -1532,10 +1649,10 @@ CORBA::TypeCode_ptr _tc_CORBA_ConstructionPolicy =
     CORBA_DomainManager **tmp = ACE_reinterpret_cast (CORBA_DomainManager**, this->buffer_);
 
     for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA_DomainManager::_nil ();
-    }
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = CORBA_DomainManager::_nil ();
+      }
   }
 
   void
@@ -1612,42 +1729,44 @@ void CORBA_DomainManagerList::_tao_any_destructor (void *x)
 static const CORBA::Long _oc_CORBA_DomainManagerList[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  32,
+  40,
   ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
   ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x415f446f),
+  ACE_NTOHL (0x412f446f),
   ACE_NTOHL (0x6d61696e),
   ACE_NTOHL (0x4d616e61),
   ACE_NTOHL (0x6765724c),
   ACE_NTOHL (0x6973743a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:CORBA_DomainManagerList:1.0
-  24,
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x415f446f),
-  ACE_NTOHL (0x6d61696e),
-  ACE_NTOHL (0x4d616e61),
-  ACE_NTOHL (0x6765724c),
-  ACE_NTOHL (0x69737400),  // name = CORBA_DomainManagerList
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/DomainManagerList:1.0
+  18,
+  ACE_NTOHL (0x446f6d61),
+  ACE_NTOHL (0x696e4d61),
+  ACE_NTOHL (0x6e616765),
+  ACE_NTOHL (0x724c6973),
+  ACE_NTOHL (0x74000000),  // name = CORBA_DomainManagerList
   CORBA::tk_sequence, // typecode kind
-  76, // encapsulation length
+  80, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_objref, // typecode kind
-    60, // encapsulation length
+    64, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      28,
+      36,
       ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
       ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x415f446f),
+      ACE_NTOHL (0x412f446f),
       ACE_NTOHL (0x6d61696e),
       ACE_NTOHL (0x4d616e61),
       ACE_NTOHL (0x6765723a),
-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:CORBA_DomainManager:1.0
-      20,
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x415f446f),
-      ACE_NTOHL (0x6d61696e),
-      ACE_NTOHL (0x4d616e61),
-      ACE_NTOHL (0x67657200),  // name = CORBA_DomainManager
+      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/DomainManager:1.0
+      14,
+      ACE_NTOHL (0x446f6d61),
+      ACE_NTOHL (0x696e4d61),
+      ACE_NTOHL (0x6e616765),
+      ACE_NTOHL (0x72000000),  // name = CORBA_DomainManager
 
     0U,
 
@@ -1980,6 +2099,11 @@ CORBA::Boolean operator>> (
     // If length is 0 we return true.
     if (0 >= _tao_seq_len)
       return 1;
+    // Add a check to the length of the sequence
+    // to make sure it does not exceed the length
+    // of the stream. (See bug 58.)
+    if (_tao_seq_len > strm.length())
+      return 0;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h
index f466d2774ae..9f4909dc721 100644
--- a/TAO/tao/DomainC.h
+++ b/TAO/tao/DomainC.h
@@ -19,18 +19,19 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_ORIG_DOMAINC_H_
-#define _TAO_IDL_ORIG_DOMAINC_H_
+#ifndef _TAO_IDL_CORBA_DOMAINC_H_
+#define _TAO_IDL_CORBA_DOMAINC_H_
 
 #include "ace/pre.h"
-#include "tao/corba.h"
+
+#include "tao/corbafwd.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/TAO_Export.h"
-#include "tao/PolicyC.h"
+
+#include "PolicyC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -55,11 +56,12 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+
 #if !defined (_CORBA_DOMAINMANAGER___PTR_CH_)
 #define _CORBA_DOMAINMANAGER___PTR_CH_
 
-class CORBA_DomainManager;
-typedef CORBA_DomainManager *CORBA_DomainManager_ptr;
+  class CORBA_DomainManager;
+  typedef CORBA_DomainManager *CORBA_DomainManager_ptr;
 
 #endif /* end #if !defined */
 
@@ -67,41 +69,41 @@ typedef CORBA_DomainManager *CORBA_DomainManager_ptr;
 #if !defined (_CORBA_DOMAINMANAGER___VAR_CH_)
 #define _CORBA_DOMAINMANAGER___VAR_CH_
 
-class TAO_Export CORBA_DomainManager_var : public TAO_Base_var
-{
-public:
-  CORBA_DomainManager_var (void); // default constructor
-  CORBA_DomainManager_var (CORBA_DomainManager_ptr p) : ptr_ (p) {}
-  CORBA_DomainManager_var (const CORBA_DomainManager_var &); // copy constructor
-  ~CORBA_DomainManager_var (void); // destructor
-
-  CORBA_DomainManager_var &operator= (CORBA_DomainManager_ptr);
-  CORBA_DomainManager_var &operator= (const CORBA_DomainManager_var &);
-  CORBA_DomainManager_ptr operator-> (void) const;
-
-  operator const CORBA_DomainManager_ptr &() const;
-  operator CORBA_DomainManager_ptr &();
-  // in, inout, out, _retn
-  CORBA_DomainManager_ptr in (void) const;
-  CORBA_DomainManager_ptr &inout (void);
-  CORBA_DomainManager_ptr &out (void);
-  CORBA_DomainManager_ptr _retn (void);
-  CORBA_DomainManager_ptr ptr (void) const;
-
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_DomainManager_ptr duplicate (CORBA_DomainManager_ptr);
-  static void release (CORBA_DomainManager_ptr);
-  static CORBA_DomainManager_ptr nil (void);
-  static CORBA_DomainManager_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
-
-private:
-  CORBA_DomainManager_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_DomainManager_var (const TAO_Base_var &rhs);
-  CORBA_DomainManager_var &operator= (const TAO_Base_var &rhs);
-};
+  class TAO_Export CORBA_DomainManager_var : public TAO_Base_var
+  {
+  public:
+    CORBA_DomainManager_var (void); // default constructor
+    CORBA_DomainManager_var (CORBA_DomainManager_ptr p) : ptr_ (p) {}
+    CORBA_DomainManager_var (const CORBA_DomainManager_var &); // copy constructor
+    ~CORBA_DomainManager_var (void); // destructor
+
+    CORBA_DomainManager_var &operator= (CORBA_DomainManager_ptr);
+    CORBA_DomainManager_var &operator= (const CORBA_DomainManager_var &);
+    CORBA_DomainManager_ptr operator-> (void) const;
+
+    operator const CORBA_DomainManager_ptr &() const;
+    operator CORBA_DomainManager_ptr &();
+    // in, inout, out, _retn
+    CORBA_DomainManager_ptr in (void) const;
+    CORBA_DomainManager_ptr &inout (void);
+    CORBA_DomainManager_ptr &out (void);
+    CORBA_DomainManager_ptr _retn (void);
+    CORBA_DomainManager_ptr ptr (void) const;
+
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static CORBA_DomainManager_ptr duplicate (CORBA_DomainManager_ptr);
+    static void release (CORBA_DomainManager_ptr);
+    static CORBA_DomainManager_ptr nil (void);
+    static CORBA_DomainManager_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+
+  private:
+    CORBA_DomainManager_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    CORBA_DomainManager_var (const TAO_Base_var &rhs);
+    CORBA_DomainManager_var &operator= (const TAO_Base_var &rhs);
+  };
 
 
 #endif /* end #if !defined */
@@ -110,22 +112,22 @@ private:
 #if !defined (_CORBA_DOMAINMANAGER___OUT_CH_)
 #define _CORBA_DOMAINMANAGER___OUT_CH_
 
-class TAO_Export CORBA_DomainManager_out
-{
-public:
-  CORBA_DomainManager_out (CORBA_DomainManager_ptr &);
-  CORBA_DomainManager_out (CORBA_DomainManager_var &);
-  CORBA_DomainManager_out (const CORBA_DomainManager_out &);
-  CORBA_DomainManager_out &operator= (const CORBA_DomainManager_out &);
-  CORBA_DomainManager_out &operator= (const CORBA_DomainManager_var &);
-  CORBA_DomainManager_out &operator= (CORBA_DomainManager_ptr);
-  operator CORBA_DomainManager_ptr &();
-  CORBA_DomainManager_ptr &ptr (void);
-  CORBA_DomainManager_ptr operator-> (void);
-
-private:
-  CORBA_DomainManager_ptr &ptr_;
-};
+  class TAO_Export CORBA_DomainManager_out
+  {
+  public:
+    CORBA_DomainManager_out (CORBA_DomainManager_ptr &);
+    CORBA_DomainManager_out (CORBA_DomainManager_var &);
+    CORBA_DomainManager_out (const CORBA_DomainManager_out &);
+    CORBA_DomainManager_out &operator= (const CORBA_DomainManager_out &);
+    CORBA_DomainManager_out &operator= (const CORBA_DomainManager_var &);
+    CORBA_DomainManager_out &operator= (CORBA_DomainManager_ptr);
+    operator CORBA_DomainManager_ptr &();
+    CORBA_DomainManager_ptr &ptr (void);
+    CORBA_DomainManager_ptr operator-> (void);
+
+  private:
+    CORBA_DomainManager_ptr &ptr_;
+  };
 
 
 #endif /* end #if !defined */
@@ -134,83 +136,83 @@ private:
 #if !defined (_CORBA_DOMAINMANAGER_CH_)
 #define _CORBA_DOMAINMANAGER_CH_
 
-// Forward Classes Declaration
-class _TAO_CORBA_DomainManager_Proxy_Impl;
-class _TAO_CORBA_DomainManager_Remote_Proxy_Impl;
-class _TAO_CORBA_DomainManager_Proxy_Broker;
-class _TAO_CORBA_DomainManager_Remote_Proxy_Broker;
+  // Forward Classes Declaration
+  class _TAO_CORBA_DomainManager_Proxy_Impl;
+  class _TAO_CORBA_DomainManager_Remote_Proxy_Impl;
+  class _TAO_CORBA_DomainManager_Proxy_Broker;
+  class _TAO_CORBA_DomainManager_Remote_Proxy_Broker;
 
-class TAO_Export CORBA_DomainManager : public virtual CORBA_Object
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_DomainManager_ptr _ptr_type;
-  typedef CORBA_DomainManager_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static CORBA_DomainManager_ptr _duplicate (CORBA_DomainManager_ptr obj);
-  static CORBA_DomainManager_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static CORBA_DomainManager_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static CORBA_DomainManager_ptr _nil (void)
-    {
-      return (CORBA_DomainManager_ptr)0;
-    }
-
-  static void _tao_any_destructor (void*);
-
-  virtual CORBA::Policy_ptr get_domain_policy (
-      CORBA::PolicyType policy_type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  class TAO_Export CORBA_DomainManager : public virtual CORBA::Object
+  {
+  public:
+  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    typedef CORBA_DomainManager_ptr _ptr_type;
+    typedef CORBA_DomainManager_var _var_type;
+  #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+    // the static operations
+    static CORBA_DomainManager_ptr _duplicate (CORBA_DomainManager_ptr obj);
+    static CORBA_DomainManager_ptr _narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
+    static CORBA_DomainManager_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
+    static CORBA_DomainManager_ptr _nil (void)
+      {
+        return (CORBA_DomainManager_ptr)0;
+      }
 
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
+    static void _tao_any_destructor (void*);
 
-  virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Policy_ptr get_domain_policy (
+        CORBA::PolicyType policy_type,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    virtual CORBA::Boolean _is_a (
+        const CORBA::Char *type_id,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
+    virtual void *_tao_QueryInterface (ptr_arith_t type);
 
-private:
-  _TAO_CORBA_DomainManager_Proxy_Broker *the_TAO_CORBA_DomainManager_Proxy_Broker_;
+    virtual const char* _interface_repository_id (void) const;
 
-protected:
-  CORBA_DomainManager (int collocated = 0);
+  private:
+    _TAO_CORBA_DomainManager_Proxy_Broker *the_TAO_CORBA_DomainManager_Proxy_Broker_;
 
   protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void CORBA_DomainManager_setup_collocation (int collocated);
-
-    CORBA_DomainManager (
-      TAO_Stub *objref,
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-
-    friend class _TAO_CORBA_DomainManager_Remote_Proxy_Impl;
-    friend class _TAO_CORBA_DomainManager_ThruPOA_Proxy_Impl;
-    friend class _TAO_CORBA_DomainManager_Direct_Proxy_Impl;
-
-  virtual ~CORBA_DomainManager (void);
-private:
-  CORBA_DomainManager (const CORBA_DomainManager &);
-  void operator= (const CORBA_DomainManager &);
-};
+    CORBA_DomainManager (int collocated = 0);
+
+    protected:
+      // This methods travese the inheritance tree and set the
+      // parents piece of the given class in the right mode
+      virtual void CORBA_DomainManager_setup_collocation (int collocated);
+
+      CORBA_DomainManager (
+        TAO_Stub *objref,
+        CORBA::Boolean _tao_collocated = 0,
+        TAO_Abstract_ServantBase *servant = 0
+        );
+
+      friend class _TAO_CORBA_DomainManager_Remote_Proxy_Impl;
+      friend class _TAO_CORBA_DomainManager_ThruPOA_Proxy_Impl;
+      friend class _TAO_CORBA_DomainManager_Direct_Proxy_Impl;
+
+    virtual ~CORBA_DomainManager (void);
+  private:
+    CORBA_DomainManager (const CORBA_DomainManager &);
+    void operator= (const CORBA_DomainManager &);
+  };
 
 
 // The Proxy Implementations are used by each interface to
@@ -218,31 +220,31 @@ private:
 // an invocation logics.
 
 
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
+  ///////////////////////////////////////////////////////////////////////
+  //                    Base  Impl. Declaration
+  //
 
-class TAO_Export _TAO_CORBA_DomainManager_Proxy_Impl : public virtual TAO_Object_Proxy_Impl
-{
-public:
-  virtual ~_TAO_CORBA_DomainManager_Proxy_Impl (void) { }
+  class TAO_Export _TAO_CORBA_DomainManager_Proxy_Impl : public virtual TAO_Object_Proxy_Impl
+  {
+  public:
+    virtual ~_TAO_CORBA_DomainManager_Proxy_Impl (void) { }
 
-    virtual CORBA::Policy_ptr get_domain_policy (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::PolicyType policy_type,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
+        virtual CORBA::Policy_ptr get_domain_policy (
+        CORBA::Object_ptr _collocated_tao_target_,
+        CORBA::PolicyType policy_type,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
 
 protected:
-  _TAO_CORBA_DomainManager_Proxy_Impl (void);
+    _TAO_CORBA_DomainManager_Proxy_Impl (void);
 
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
+  };
+  //
+  //                Base  Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
 
 
 ///////////////////////////////////////////////////////////////////////
@@ -258,8 +260,8 @@ public:
 
   virtual ~_TAO_CORBA_DomainManager_Remote_Proxy_Impl (void) { }
 
-    virtual CORBA::Policy_ptr get_domain_policy (
-      CORBA_Object *_collocated_tao_target_,
+  virtual CORBA::Policy_ptr get_domain_policy (
+      CORBA::Object_ptr _collocated_tao_target_,
       CORBA::PolicyType policy_type,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -317,7 +319,7 @@ public:
 
   virtual _TAO_CORBA_DomainManager_Proxy_Impl &select_proxy (
     CORBA_DomainManager *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+    CORBA_Environment &ACE_TRY_ENV
   );
 
 private:
@@ -338,7 +340,7 @@ public:
 
 #endif /* end #if !defined */
 
-extern TAO_Export CORBA::TypeCode_ptr  _tc_CORBA_DomainManager;
+extern TAO_Export CORBA::TypeCode_ptr _tc_CORBA_DomainManager;
 
 
 #if !defined (_CORBA_CONSTRUCTIONPOLICY___PTR_CH_)
@@ -426,7 +428,7 @@ class _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl;
 class _TAO_CORBA_ConstructionPolicy_Proxy_Broker;
 class _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Broker;
 
-class TAO_Export CORBA_ConstructionPolicy: public virtual CORBA::Policy
+class TAO_Export CORBA_ConstructionPolicy: public virtual CORBA_Policy
 {
 public:
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -454,7 +456,7 @@ public:
   static void _tao_any_destructor (void*);
 
   virtual void make_domain_manager (
-      CORBA::InterfaceDef_ptr object_type,
+      CORBA_InterfaceDef_ptr object_type,
       CORBA::Boolean constr_policy,
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
@@ -510,14 +512,14 @@ private:
 //
 
 class TAO_Export _TAO_CORBA_ConstructionPolicy_Proxy_Impl :
-  public virtual _TAO_CORBA_Policy_Proxy_Impl
+  public virtual CORBA_TAO_Policy_Proxy_Impl
 {
 public:
   virtual ~_TAO_CORBA_ConstructionPolicy_Proxy_Impl (void) { }
 
     virtual void make_domain_manager (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::InterfaceDef_ptr object_type,
+      CORBA::Object_ptr _collocated_tao_target_,
+      CORBA_InterfaceDef_ptr object_type,
       CORBA::Boolean constr_policy,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -541,7 +543,7 @@ protected:
 class TAO_Export _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl :
   public virtual _TAO_CORBA_ConstructionPolicy_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_Policy_Remote_Proxy_Impl
+  public virtual CORBA_TAO_Policy_Remote_Proxy_Impl
 
 {
 public:
@@ -549,9 +551,9 @@ public:
 
   virtual ~_TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl (void) { }
 
-    virtual void make_domain_manager (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::InterfaceDef_ptr object_type,
+  virtual void make_domain_manager (
+      CORBA::Object_ptr _collocated_tao_target_,
+      CORBA_InterfaceDef_ptr object_type,
       CORBA::Boolean constr_policy,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -609,7 +611,7 @@ public:
 
   virtual _TAO_CORBA_ConstructionPolicy_Proxy_Impl &select_proxy (
     CORBA_ConstructionPolicy *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+    CORBA_Environment &ACE_TRY_ENV
   );
 
 private:
@@ -630,7 +632,7 @@ public:
 
 #endif /* end #if !defined */
 
-extern TAO_Export CORBA::TypeCode_ptr  _tc_CORBA_ConstructionPolicy;
+extern TAO_Export CORBA::TypeCode_ptr _tc_CORBA_ConstructionPolicy;
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
@@ -782,19 +784,21 @@ private:
 
 #endif /* end #if !defined */
 
-extern TAO_Export CORBA::TypeCode_ptr  _tc_CORBA_DomainManagerList;
+extern TAO_Export CORBA::TypeCode_ptr _tc_CORBA_DomainManagerList;
+
+
 
 // Proxy Broker Factory function pointer declarations.
 
 extern TAO_Export
 _TAO_CORBA_DomainManager_Proxy_Broker *
-(*_TAO_CORBA_DomainManager_Proxy_Broker_Factory_function_pointer) (
+(*CORBA__TAO_CORBA_DomainManager_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
 extern TAO_Export
 _TAO_CORBA_ConstructionPolicy_Proxy_Broker *
-(*_TAO_CORBA_ConstructionPolicy_Proxy_Broker_Factory_function_pointer) (
+(*CORBA__TAO_CORBA_ConstructionPolicy_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
diff --git a/TAO/tao/DomainC.i b/TAO/tao/DomainC.i
index a8f34e2f933..08c89453f73 100644
--- a/TAO/tao/DomainC.i
+++ b/TAO/tao/DomainC.i
@@ -23,49 +23,6 @@
 #if !defined (_CORBA_DOMAINMANAGER___CI_)
 #define _CORBA_DOMAINMANAGER___CI_
 
-ACE_INLINE CORBA_DomainManager_ptr
-tao_CORBA_DomainManager_duplicate (
-    CORBA_DomainManager_ptr p
-  )
-{
-  return CORBA_DomainManager::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_CORBA_DomainManager_release (
-    CORBA_DomainManager_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA_DomainManager_ptr
-tao_CORBA_DomainManager_nil (
-    void
-  )
-{
-  return CORBA_DomainManager::_nil ();
-}
-
-ACE_INLINE CORBA_DomainManager_ptr
-tao_CORBA_DomainManager_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return CORBA_DomainManager::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_CORBA_DomainManager_upcast (
-    void *src
-  )
-{
-  CORBA_DomainManager **tmp =
-    ACE_static_cast (CORBA_DomainManager **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 CORBA_DomainManager::CORBA_DomainManager (
     TAO_Stub *objref,
@@ -84,49 +41,6 @@ CORBA_DomainManager::CORBA_DomainManager (
 #if !defined (_CORBA_CONSTRUCTIONPOLICY___CI_)
 #define _CORBA_CONSTRUCTIONPOLICY___CI_
 
-ACE_INLINE CORBA_ConstructionPolicy_ptr
-tao_CORBA_ConstructionPolicy_duplicate (
-    CORBA_ConstructionPolicy_ptr p
-  )
-{
-  return CORBA_ConstructionPolicy::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_CORBA_ConstructionPolicy_release (
-    CORBA_ConstructionPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA_ConstructionPolicy_ptr
-tao_CORBA_ConstructionPolicy_nil (
-    void
-  )
-{
-  return CORBA_ConstructionPolicy::_nil ();
-}
-
-ACE_INLINE CORBA_ConstructionPolicy_ptr
-tao_CORBA_ConstructionPolicy_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return CORBA_ConstructionPolicy::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_CORBA_ConstructionPolicy_upcast (
-    void *src
-  )
-{
-  CORBA_ConstructionPolicy **tmp =
-    ACE_static_cast (CORBA_ConstructionPolicy **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 CORBA_ConstructionPolicy::CORBA_ConstructionPolicy (
     TAO_Stub *objref,
@@ -515,22 +429,22 @@ CORBA_DomainManagerList_out::operator[] (CORBA::ULong index)
 
 #endif /* end #if !defined */
 
-CORBA::Boolean TAO_Export operator<< (
+TAO_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const CORBA_DomainManager_ptr
   );
 
-CORBA::Boolean TAO_Export operator>> (
+TAO_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
     CORBA_DomainManager_ptr &
   );
 
-CORBA::Boolean TAO_Export operator<< (
+TAO_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const CORBA_ConstructionPolicy_ptr
   );
 
-CORBA::Boolean TAO_Export operator>> (
+TAO_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
     CORBA_ConstructionPolicy_ptr &
   );
diff --git a/TAO/tao/DynamicC.cpp b/TAO/tao/DynamicC.cpp
index 9cc3fcbfe19..310487d401c 100644
--- a/TAO/tao/DynamicC.cpp
+++ b/TAO/tao/DynamicC.cpp
@@ -21,53 +21,88 @@
 
 #include "DynamicC.h"
 
+#include "tao/StringSeqC.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus
+#endif /* __BORLANDC__ */
+
 #if !defined (__ACE_INLINE__)
 #include "DynamicC.i"
 #endif /* !defined INLINE */
 
-#include "tao/StringSeqC.h"
-
-static const CORBA::Long _oc_Dynamic_ParameterMode[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x44796e61), ACE_NTOHL (0x6d69632f), ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x724d6f64), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:Dynamic/ParameterMode:1.0
-  14, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x724d6f64), ACE_NTOHL (0x65000000),  // name = ParameterMode
-  3, // member count
-  9, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x0),  // name = PARAM_IN
-  10, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f4f55), ACE_NTOHL (0x54000000),  // name = PARAM_OUT
-  12, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-};
-static CORBA::TypeCode _tc_TAO_tc_Dynamic_ParameterMode (CORBA::tk_enum, sizeof (_oc_Dynamic_ParameterMode), (char *) &_oc_Dynamic_ParameterMode, 0, sizeof (Dynamic::ParameterMode));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Dynamic)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ParameterMode, &_tc_TAO_tc_Dynamic_ParameterMode)
-TAO_NAMESPACE_END
 static const CORBA::Long _oc_Dynamic_Parameter[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  26, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x44796e61), ACE_NTOHL (0x6d69632f), ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:Dynamic/Parameter:1.0
-  10, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72000000),  // name = Parameter
+  26,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x44796e61),
+  ACE_NTOHL (0x6d69632f),
+  ACE_NTOHL (0x50617261),
+  ACE_NTOHL (0x6d657465),
+  ACE_NTOHL (0x723a312e),
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:Dynamic/Parameter:1.0
+  10,
+  ACE_NTOHL (0x50617261),
+  ACE_NTOHL (0x6d657465),
+  ACE_NTOHL (0x72000000),  // name = Parameter
   2, // member count
-  9, ACE_NTOHL (0x61726775), ACE_NTOHL (0x6d656e74), ACE_NTOHL (0x0),  // name = argument
+  9,
+  ACE_NTOHL (0x61726775),
+  ACE_NTOHL (0x6d656e74),
+  ACE_NTOHL (0x0),  // name = argument
   CORBA::tk_any,
 
-  5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0),  // name = mode
+  5,
+  ACE_NTOHL (0x6d6f6465),
+  ACE_NTOHL (0x0),  // name = mode
   CORBA::tk_enum, // typecode kind
-  112, // encapsulation length
+  116, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x44796e61), ACE_NTOHL (0x6d69632f), ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x724d6f64), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:Dynamic/ParameterMode:1.0
-    14, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x724d6f64), ACE_NTOHL (0x65000000),  // name = ParameterMode
+    36,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5061),
+    ACE_NTOHL (0x72616d65),
+    ACE_NTOHL (0x7465724d),
+    ACE_NTOHL (0x6f64653a),
+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
+    14,
+    ACE_NTOHL (0x50617261),
+    ACE_NTOHL (0x6d657465),
+    ACE_NTOHL (0x724d6f64),
+    ACE_NTOHL (0x65000000),  // name = ParameterMode
     3, // member count
-    9, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x0),  // name = PARAM_IN
-    10, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f4f55), ACE_NTOHL (0x54000000),  // name = PARAM_OUT
-    12, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
+    9,
+    ACE_NTOHL (0x50415241),
+    ACE_NTOHL (0x4d5f494e),
+    ACE_NTOHL (0x0),  // name = PARAM_IN
+    10,
+    ACE_NTOHL (0x50415241),
+    ACE_NTOHL (0x4d5f4f55),
+    ACE_NTOHL (0x54000000),  // name = PARAM_OUT
+    12,
+    ACE_NTOHL (0x50415241),
+    ACE_NTOHL (0x4d5f494e),
+    ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
 
 };
-static CORBA::TypeCode _tc_TAO_tc_Dynamic_Parameter (CORBA::tk_struct, sizeof (_oc_Dynamic_Parameter), (char *) &_oc_Dynamic_Parameter, 0, sizeof (Dynamic::Parameter));
+
+static CORBA::TypeCode _tc_TAO_tc_Dynamic_Parameter (
+    CORBA::tk_struct,
+    sizeof (_oc_Dynamic_Parameter),
+    (char *) &_oc_Dynamic_Parameter,
+    0,
+    sizeof (Dynamic::Parameter)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (Dynamic)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Parameter, &_tc_TAO_tc_Dynamic_Parameter)
 TAO_NAMESPACE_END
+
 void Dynamic::Parameter::_tao_any_destructor (void *x)
 {
   Parameter *tmp = ACE_static_cast (Parameter*,x);
@@ -76,7 +111,7 @@ void Dynamic::Parameter::_tao_any_destructor (void *x)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMIC_PARAMETERLIST_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_DYNAMIC_PARAMETERLIST_CS_
 
@@ -85,43 +120,43 @@ void Dynamic::Parameter::_tao_any_destructor (void *x)
   {
     Dynamic::Parameter* tmp = 0;
     tmp = _TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (length);
-    
+
     if (this->buffer_ != 0)
     {
       Dynamic::Parameter *old = ACE_reinterpret_cast (Dynamic::Parameter *,this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp[i] = old[i];
-      
+
       if (this->release_)
         _TAO_Unbounded_Sequence_Dynamic_ParameterList::freebuf (old);
-      
+
     }
     this->buffer_ = tmp;
   }
-  
+
   void
   Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::_deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
-    
+
     Dynamic::Parameter *tmp = ACE_reinterpret_cast (Dynamic::Parameter *,this->buffer_);
-    
+
     _TAO_Unbounded_Sequence_Dynamic_ParameterList::freebuf (tmp);
     this->buffer_ = 0;
-  } 
-  
+  }
+
   Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::~_TAO_Unbounded_Sequence_Dynamic_ParameterList (void) // Dtor.
   {
     this->_deallocate_buffer ();
   }
-  
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_DYNAMIC_PARAMETERLIST_CS_)
 #define _DYNAMIC_PARAMETERLIST_CS_
@@ -133,30 +168,30 @@ void Dynamic::Parameter::_tao_any_destructor (void *x)
 Dynamic::ParameterList::ParameterList (void)
 {}
 Dynamic::ParameterList::ParameterList (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_Dynamic_ParameterList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<Dynamic::Parameter>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 Dynamic::ParameterList::ParameterList (CORBA::ULong max, CORBA::ULong length, Dynamic::Parameter *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_Dynamic_ParameterList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<Dynamic::Parameter>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 Dynamic::ParameterList::ParameterList (const ParameterList &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_Dynamic_ParameterList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<Dynamic::Parameter>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 Dynamic::ParameterList::~ParameterList (void) // dtor
@@ -173,80 +208,187 @@ void Dynamic::ParameterList::_tao_any_destructor (void *x)
 static const CORBA::Long _oc_Dynamic_ParameterList[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x44796e61), ACE_NTOHL (0x6d69632f), ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x724c6973), ACE_NTOHL (0x743a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:Dynamic/ParameterList:1.0
-  14, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x724c6973), ACE_NTOHL (0x74000000),  // name = ParameterList
+  30,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x44796e61),
+  ACE_NTOHL (0x6d69632f),
+  ACE_NTOHL (0x50617261),
+  ACE_NTOHL (0x6d657465),
+  ACE_NTOHL (0x724c6973),
+  ACE_NTOHL (0x743a312e),
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:Dynamic/ParameterList:1.0
+  14,
+  ACE_NTOHL (0x50617261),
+  ACE_NTOHL (0x6d657465),
+  ACE_NTOHL (0x724c6973),
+  ACE_NTOHL (0x74000000),  // name = ParameterList
   CORBA::tk_sequence, // typecode kind
-  224, // encapsulation length
+  228, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
-    208, // encapsulation length
+    212, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      26, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x44796e61), ACE_NTOHL (0x6d69632f), ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:Dynamic/Parameter:1.0
-      10, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72000000),  // name = Parameter
+      26,
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x44796e61),
+      ACE_NTOHL (0x6d69632f),
+      ACE_NTOHL (0x50617261),
+      ACE_NTOHL (0x6d657465),
+      ACE_NTOHL (0x723a312e),
+      ACE_NTOHL (0x30000000),  // repository ID = IDL:Dynamic/Parameter:1.0
+      10,
+      ACE_NTOHL (0x50617261),
+      ACE_NTOHL (0x6d657465),
+      ACE_NTOHL (0x72000000),  // name = Parameter
       2, // member count
-      9, ACE_NTOHL (0x61726775), ACE_NTOHL (0x6d656e74), ACE_NTOHL (0x0),  // name = argument
+      9,
+      ACE_NTOHL (0x61726775),
+      ACE_NTOHL (0x6d656e74),
+      ACE_NTOHL (0x0),  // name = argument
       CORBA::tk_any,
 
-      5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0),  // name = mode
+      5,
+      ACE_NTOHL (0x6d6f6465),
+      ACE_NTOHL (0x0),  // name = mode
       CORBA::tk_enum, // typecode kind
-      112, // encapsulation length
+      116, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
-        30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x44796e61), ACE_NTOHL (0x6d69632f), ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x724d6f64), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:Dynamic/ParameterMode:1.0
-        14, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x724d6f64), ACE_NTOHL (0x65000000),  // name = ParameterMode
+        36,
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f5061),
+        ACE_NTOHL (0x72616d65),
+        ACE_NTOHL (0x7465724d),
+        ACE_NTOHL (0x6f64653a),
+        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
+        14,
+        ACE_NTOHL (0x50617261),
+        ACE_NTOHL (0x6d657465),
+        ACE_NTOHL (0x724d6f64),
+        ACE_NTOHL (0x65000000),  // name = ParameterMode
         3, // member count
-        9, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x0),  // name = PARAM_IN
-        10, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f4f55), ACE_NTOHL (0x54000000),  // name = PARAM_OUT
-        12, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
+        9,
+        ACE_NTOHL (0x50415241),
+        ACE_NTOHL (0x4d5f494e),
+        ACE_NTOHL (0x0),  // name = PARAM_IN
+        10,
+        ACE_NTOHL (0x50415241),
+        ACE_NTOHL (0x4d5f4f55),
+        ACE_NTOHL (0x54000000),  // name = PARAM_OUT
+        12,
+        ACE_NTOHL (0x50415241),
+        ACE_NTOHL (0x4d5f494e),
+        ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
 
 
     0U,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_Dynamic_ParameterList (CORBA::tk_alias, sizeof (_oc_Dynamic_ParameterList), (char *) &_oc_Dynamic_ParameterList, 0, sizeof (Dynamic::ParameterList));
+
+static CORBA::TypeCode _tc_TAO_tc_Dynamic_ParameterList (
+    CORBA::tk_alias,
+    sizeof (_oc_Dynamic_ParameterList),
+    (char *) &_oc_Dynamic_ParameterList,
+    0,
+    sizeof (Dynamic::ParameterList)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (Dynamic)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ParameterList, &_tc_TAO_tc_Dynamic_ParameterList)
 TAO_NAMESPACE_END
+
 static const CORBA::Long _oc_Dynamic_ContextList[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  28, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x44796e61), ACE_NTOHL (0x6d69632f), ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x6578744c), ACE_NTOHL (0x6973743a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:Dynamic/ContextList:1.0
-  12, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x6578744c), ACE_NTOHL (0x69737400),  // name = ContextList
+  28,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x44796e61),
+  ACE_NTOHL (0x6d69632f),
+  ACE_NTOHL (0x436f6e74),
+  ACE_NTOHL (0x6578744c),
+  ACE_NTOHL (0x6973743a),
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:Dynamic/ContextList:1.0
+  12,
+  ACE_NTOHL (0x436f6e74),
+  ACE_NTOHL (0x6578744c),
+  ACE_NTOHL (0x69737400),  // name = ContextList
   CORBA::tk_alias, // typecode kind for typedefs
   80, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5374), ACE_NTOHL (0x72696e67), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StringSeq:1.0
-    10, ACE_NTOHL (0x53747269), ACE_NTOHL (0x6e675365), ACE_NTOHL (0x71000000),  // name = StringSeq
+    32,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5374),
+    ACE_NTOHL (0x72696e67),
+    ACE_NTOHL (0x5365713a),
+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StringSeq:1.0
+    10,
+    ACE_NTOHL (0x53747269),
+    ACE_NTOHL (0x6e675365),
+    ACE_NTOHL (0x71000000),  // name = 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,
 
 
 };
-static CORBA::TypeCode _tc_TAO_tc_Dynamic_ContextList (CORBA::tk_alias, sizeof (_oc_Dynamic_ContextList), (char *) &_oc_Dynamic_ContextList, 0, sizeof (Dynamic::ContextList));
+
+static CORBA::TypeCode _tc_TAO_tc_Dynamic_ContextList (
+    CORBA::tk_alias,
+    sizeof (_oc_Dynamic_ContextList),
+    (char *) &_oc_Dynamic_ContextList,
+    0,
+    sizeof (Dynamic::ContextList)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (Dynamic)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ContextList, &_tc_TAO_tc_Dynamic_ContextList)
 TAO_NAMESPACE_END
+
 static const CORBA::Long _oc_Dynamic_TypeCode[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  25, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x44796e61), ACE_NTOHL (0x6d69632f), ACE_NTOHL (0x54797065), ACE_NTOHL (0x436f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:Dynamic/TypeCode:1.0
-  9, ACE_NTOHL (0x54797065), ACE_NTOHL (0x436f6465), ACE_NTOHL (0x0),  // name = TypeCode
+  25,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x44796e61),
+  ACE_NTOHL (0x6d69632f),
+  ACE_NTOHL (0x54797065),
+  ACE_NTOHL (0x436f6465),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:Dynamic/TypeCode:1.0
+  9,
+  ACE_NTOHL (0x54797065),
+  ACE_NTOHL (0x436f6465),
+  ACE_NTOHL (0x0),  // name = TypeCode
   CORBA::tk_TypeCode,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_Dynamic_TypeCode (CORBA::tk_alias, sizeof (_oc_Dynamic_TypeCode), (char *) &_oc_Dynamic_TypeCode, 0, sizeof (Dynamic::TypeCode));
+
+static CORBA::TypeCode _tc_TAO_tc_Dynamic_TypeCode (
+    CORBA::tk_alias,
+    sizeof (_oc_Dynamic_TypeCode),
+    (char *) &_oc_Dynamic_TypeCode,
+    0,
+    sizeof (Dynamic::TypeCode)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (Dynamic)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TypeCode, &_tc_TAO_tc_Dynamic_TypeCode)
 TAO_NAMESPACE_END
 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMIC_EXCEPTIONLIST_CS_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMIC_EXCEPTIONLIST_CS_
 
@@ -256,59 +398,69 @@ TAO_NAMESPACE_END
   {
     CORBA::TypeCode **tmp = 0;
     tmp = _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (length);
-    
+
     if (this->buffer_ != 0)
     {
       CORBA::TypeCode **old = ACE_reinterpret_cast (CORBA::TypeCode**, this->buffer_);
       for (CORBA::ULong i = 0; i < this->length_; ++i)
-        if (!this->release_)
-          tmp[i] = CORBA::TypeCode::_duplicate (old[i]);
-        else
-          tmp[i] = old[i];
-        
+        {
+          if (!this->release_)
+            {
+              tmp[i] = CORBA::TypeCode::_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
+
       if (this->release_)
-        delete[] old;
-      
+        {
+          delete[] old;
+        }
     }
     this->buffer_ = tmp;
   }
-  
+
   void
   Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
     CORBA::TypeCode **tmp = ACE_reinterpret_cast (CORBA::TypeCode**, this->buffer_);
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::TypeCode::_nil ();
-    }
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = CORBA::TypeCode::_nil ();
+      }
+
     _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::freebuf (tmp);
     this->buffer_ = 0;
   }
-  
+
   Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::~_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (void)
   {
     this->_deallocate_buffer ();
   }
-  
+
   void
   Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
   {
     CORBA::TypeCode **tmp = ACE_reinterpret_cast (CORBA::TypeCode**, this->buffer_);
-    
+
     for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::TypeCode::_nil ();
-    }
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = CORBA::TypeCode::_nil ();
+      }
   }
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_DYNAMIC_EXCEPTIONLIST_CS_)
 #define _DYNAMIC_EXCEPTIONLIST_CS_
@@ -320,30 +472,30 @@ TAO_NAMESPACE_END
 Dynamic::ExceptionList::ExceptionList (void)
 {}
 Dynamic::ExceptionList::ExceptionList (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Pseudo_Sequence<CORBA::TypeCode,CORBA::TypeCode_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 Dynamic::ExceptionList::ExceptionList (CORBA::ULong max, CORBA::ULong length, CORBA::TypeCode_ptr *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Pseudo_Sequence<CORBA::TypeCode,CORBA::TypeCode_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 Dynamic::ExceptionList::ExceptionList (const ExceptionList &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Pseudo_Sequence<CORBA::TypeCode,CORBA::TypeCode_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 Dynamic::ExceptionList::~ExceptionList (void) // dtor
@@ -360,92 +512,113 @@ void Dynamic::ExceptionList::_tao_any_destructor (void *x)
 static const CORBA::Long _oc_Dynamic_ExceptionList[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x44796e61), ACE_NTOHL (0x6d69632f), ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e4c6973), ACE_NTOHL (0x743a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:Dynamic/ExceptionList:1.0
-  14, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e4c6973), ACE_NTOHL (0x74000000),  // name = ExceptionList
+  30,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x44796e61),
+  ACE_NTOHL (0x6d69632f),
+  ACE_NTOHL (0x45786365),
+  ACE_NTOHL (0x7074696f),
+  ACE_NTOHL (0x6e4c6973),
+  ACE_NTOHL (0x743a312e),
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:Dynamic/ExceptionList:1.0
+  14,
+  ACE_NTOHL (0x45786365),
+  ACE_NTOHL (0x7074696f),
+  ACE_NTOHL (0x6e4c6973),
+  ACE_NTOHL (0x74000000),  // name = ExceptionList
   CORBA::tk_sequence, // typecode kind
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_alias, // typecode kind for typedefs
     56, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      25, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x44796e61), ACE_NTOHL (0x6d69632f), ACE_NTOHL (0x54797065), ACE_NTOHL (0x436f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:Dynamic/TypeCode:1.0
-      9, ACE_NTOHL (0x54797065), ACE_NTOHL (0x436f6465), ACE_NTOHL (0x0),  // name = TypeCode
+      25,
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x44796e61),
+      ACE_NTOHL (0x6d69632f),
+      ACE_NTOHL (0x54797065),
+      ACE_NTOHL (0x436f6465),
+      ACE_NTOHL (0x3a312e30),
+      ACE_NTOHL (0x0),  // repository ID = IDL:Dynamic/TypeCode:1.0
+      9,
+      ACE_NTOHL (0x54797065),
+      ACE_NTOHL (0x436f6465),
+      ACE_NTOHL (0x0),  // name = TypeCode
       CORBA::tk_TypeCode,
 
 
     0U,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_Dynamic_ExceptionList (CORBA::tk_alias, sizeof (_oc_Dynamic_ExceptionList), (char *) &_oc_Dynamic_ExceptionList, 0, sizeof (Dynamic::ExceptionList));
+
+static CORBA::TypeCode _tc_TAO_tc_Dynamic_ExceptionList (
+    CORBA::tk_alias,
+    sizeof (_oc_Dynamic_ExceptionList),
+    (char *) &_oc_Dynamic_ExceptionList,
+    0,
+    sizeof (Dynamic::ExceptionList)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (Dynamic)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ExceptionList, &_tc_TAO_tc_Dynamic_ExceptionList)
 TAO_NAMESPACE_END
+
 static const CORBA::Long _oc_Dynamic_RequestContext[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x44796e61), ACE_NTOHL (0x6d69632f), ACE_NTOHL (0x52657175), ACE_NTOHL (0x65737443), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78743a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:Dynamic/RequestContext:1.0
-  15, ACE_NTOHL (0x52657175), ACE_NTOHL (0x65737443), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78740000),  // name = RequestContext
+  31,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x44796e61),
+  ACE_NTOHL (0x6d69632f),
+  ACE_NTOHL (0x52657175),
+  ACE_NTOHL (0x65737443),
+  ACE_NTOHL (0x6f6e7465),
+  ACE_NTOHL (0x78743a31),
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:Dynamic/RequestContext:1.0
+  15,
+  ACE_NTOHL (0x52657175),
+  ACE_NTOHL (0x65737443),
+  ACE_NTOHL (0x6f6e7465),
+  ACE_NTOHL (0x78740000),  // name = RequestContext
   CORBA::tk_alias, // typecode kind for typedefs
   80, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5374), ACE_NTOHL (0x72696e67), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StringSeq:1.0
-    10, ACE_NTOHL (0x53747269), ACE_NTOHL (0x6e675365), ACE_NTOHL (0x71000000),  // name = StringSeq
+    32,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5374),
+    ACE_NTOHL (0x72696e67),
+    ACE_NTOHL (0x5365713a),
+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StringSeq:1.0
+    10,
+    ACE_NTOHL (0x53747269),
+    ACE_NTOHL (0x6e675365),
+    ACE_NTOHL (0x71000000),  // name = 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,
 
 
 };
-static CORBA::TypeCode _tc_TAO_tc_Dynamic_RequestContext (CORBA::tk_alias, sizeof (_oc_Dynamic_RequestContext), (char *) &_oc_Dynamic_RequestContext, 0, sizeof (Dynamic::RequestContext));
+
+static CORBA::TypeCode _tc_TAO_tc_Dynamic_RequestContext (
+    CORBA::tk_alias,
+    sizeof (_oc_Dynamic_RequestContext),
+    (char *) &_oc_Dynamic_RequestContext,
+    0,
+    sizeof (Dynamic::RequestContext)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (Dynamic)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RequestContext, &_tc_TAO_tc_Dynamic_RequestContext)
 TAO_NAMESPACE_END
-void operator<<= (CORBA::Any &_tao_any, Dynamic::ParameterMode _tao_elem)
-{
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
-      Dynamic::_tc_ParameterMode,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Dynamic::ParameterMode &_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (Dynamic::_tc_ParameterMode, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        return 0;
-      }
-
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
-      );
-    if (stream >> _tao_elem)
-    {
-      return 1;
-    }
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
 
 void operator<<= (CORBA::Any &_tao_any, const Dynamic::Parameter &_tao_elem) // copying
 {
@@ -483,14 +656,12 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Dynamic::Parameter
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (Dynamic::_tc_Parameter, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (Dynamic::_tc_Parameter, ACE_TRY_ENV);
     ACE_TRY_CHECK;
 
     if (!result)
-      {
-        return 0;
-      }
+      return 0; // not equivalent
 
     if (_tao_any.any_owns_data ())
     {
@@ -576,14 +747,12 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Dynamic::Parameter
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (Dynamic::_tc_ParameterList, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (Dynamic::_tc_ParameterList, ACE_TRY_ENV);
     ACE_TRY_CHECK;
 
     if (!result)
-      {
-        return 0;
-      }
+      return 0; // not equivalent
 
     if (_tao_any.any_owns_data ())
     {
@@ -669,14 +838,12 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Dynamic::Exception
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (Dynamic::_tc_ExceptionList, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (Dynamic::_tc_ExceptionList, ACE_TRY_ENV);
     ACE_TRY_CHECK;
 
     if (!result)
-      {
-        return 0;
-      }
+      return 0; // not equivalent
 
     if (_tao_any.any_owns_data ())
     {
@@ -747,8 +914,13 @@ 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;
+    // Add a check to the length of the sequence
+    // to make sure it does not exceed the length
+    // of the stream. (See bug 58.)
+    if (_tao_seq_len > strm.length())
+      return 0;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
@@ -789,8 +961,13 @@ 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;
+    // Add a check to the length of the sequence
+    // to make sure it does not exceed the length
+    // of the stream. (See bug 58.)
+    if (_tao_seq_len > strm.length())
+      return 0;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
@@ -801,4 +978,3 @@ CORBA::Boolean operator>> (
   }
   return 0; // error
 }
-
diff --git a/TAO/tao/DynamicC.h b/TAO/tao/DynamicC.h
index 2a5eea8318f..1ab682fa029 100644
--- a/TAO/tao/DynamicC.h
+++ b/TAO/tao/DynamicC.h
@@ -52,17 +52,12 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
 TAO_NAMESPACE  Dynamic
 {
-  enum ParameterMode
-  {
-        PARAM_IN,
-        PARAM_OUT,
-        PARAM_INOUT
-  };
-  typedef ParameterMode &ParameterMode_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ParameterMode;
-
   struct Parameter;
   class Parameter_var;
 
@@ -76,7 +71,7 @@ TAO_NAMESPACE  Dynamic
     static void _tao_any_destructor (void*);
 
     CORBA::Any argument;
-    ACE_NESTED_CLASS (Dynamic, ParameterMode) mode;
+    CORBA::ParameterMode mode;
   };
 
   class TAO_Export Parameter_var
@@ -445,8 +440,6 @@ TAO_NAMESPACE  Dynamic
 }
 TAO_NAMESPACE_CLOSE // module Dynamic
 
-TAO_Export void operator<<= (CORBA::Any &, Dynamic::ParameterMode);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Dynamic::ParameterMode &);
 TAO_Export void operator<<= (CORBA::Any &, const Dynamic::Parameter &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, Dynamic::Parameter*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Dynamic::Parameter *&); // deprecated
@@ -462,8 +455,6 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Dynamic::Except
 
 #ifndef __ACE_INLINE__
 
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Dynamic::ParameterMode &); //
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Dynamic::ParameterMode &);
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Dynamic::Parameter &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Dynamic::Parameter &);
 
@@ -508,5 +499,9 @@ TAO_Export CORBA::Boolean operator>> (
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
 #include "ace/post.h"
 #endif /* ifndef */
diff --git a/TAO/tao/DynamicC.i b/TAO/tao/DynamicC.i
index 439f4e33bdc..09fd7a3ff51 100644
--- a/TAO/tao/DynamicC.i
+++ b/TAO/tao/DynamicC.i
@@ -68,11 +68,12 @@ Dynamic::Parameter_var::operator= (const ::Dynamic::Parameter_var &p)
         }
       else
         {
-          Dynamic::Parameter *deep_copy = new Dynamic::Parameter (*p.ptr_);
+          Parameter *deep_copy =
+            new Parameter (*p.ptr_);
           
           if (deep_copy != 0)
             {
-              Dynamic::Parameter *tmp = deep_copy;
+              Parameter *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -428,8 +429,8 @@ Dynamic::ParameterList_var::operator= (ParameterList *p)
   return *this;
 }
 
-ACE_INLINE Dynamic::ParameterList_var &
-Dynamic::ParameterList_var::operator= (const ::Dynamic::ParameterList_var &p) // deep copy
+ACE_INLINE ::Dynamic::ParameterList_var &
+Dynamic::ParameterList_var::operator= (const ::Dynamic::ParameterList_var &p)
 {
   if (this != &p)
     {
@@ -440,12 +441,12 @@ Dynamic::ParameterList_var::operator= (const ::Dynamic::ParameterList_var &p) //
         }
       else
         {
-          Dynamic::ParameterList *deep_copy = 
-            new Dynamic::ParameterList (*p.ptr_);
+          ParameterList *deep_copy =
+            new ParameterList (*p.ptr_);
           
           if (deep_copy != 0)
             {
-              Dynamic::ParameterList *tmp = deep_copy;
+              ParameterList *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -619,7 +620,9 @@ Dynamic::ParameterList_out::operator[] (CORBA::ULong index)
     ACE_NEW_RETURN (buf, CORBA::TypeCode*[nelems], 0);
     
     for (CORBA::ULong i = 0; i < nelems; i++)
-      buf[i] = CORBA::TypeCode::_nil ();
+      {
+        buf[i] = CORBA::TypeCode::_nil ();
+      }
     
     return buf;
   }
@@ -662,7 +665,9 @@ Dynamic::ParameterList_out::operator[] (CORBA::ULong index)
       CORBA::TypeCode ** const tmp2 = ACE_reinterpret_cast (CORBA::TypeCode ** ACE_CAST_CONST, rhs.buffer_);
       
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        tmp1[i] = CORBA::TypeCode::_duplicate (tmp2[i]);
+        {
+          tmp1[i] = CORBA::TypeCode::_duplicate (tmp2[i]);
+        }
       
       this->buffer_ = tmp1;
     }
@@ -702,7 +707,9 @@ Dynamic::ParameterList_out::operator[] (CORBA::ULong index)
     CORBA::TypeCode ** const tmp2 = ACE_reinterpret_cast (CORBA::TypeCode ** ACE_CAST_CONST, rhs.buffer_);
     
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      tmp1[i] = CORBA::TypeCode::_duplicate (tmp2[i]);
+      {
+        tmp1[i] = CORBA::TypeCode::_duplicate (tmp2[i]);
+      }
     
     return *this;
   }
@@ -802,8 +809,8 @@ Dynamic::ExceptionList_var::operator= (ExceptionList *p)
   return *this;
 }
 
-ACE_INLINE Dynamic::ExceptionList_var &
-Dynamic::ExceptionList_var::operator= (const ::Dynamic::ExceptionList_var &p) // deep copy
+ACE_INLINE ::Dynamic::ExceptionList_var &
+Dynamic::ExceptionList_var::operator= (const ::Dynamic::ExceptionList_var &p)
 {
   if (this != &p)
     {
@@ -814,12 +821,12 @@ Dynamic::ExceptionList_var::operator= (const ::Dynamic::ExceptionList_var &p) //
         }
       else
         {
-          Dynamic::ExceptionList *deep_copy = 
-            new Dynamic::ExceptionList (*p.ptr_);
+          ExceptionList *deep_copy =
+            new ExceptionList (*p.ptr_);
           
           if (deep_copy != 0)
             {
-              Dynamic::ExceptionList *tmp = deep_copy;
+              ExceptionList *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -973,25 +980,6 @@ Dynamic::ExceptionList_out::operator[] (CORBA::ULong index)
 
 #endif /* end #if !defined */
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const Dynamic::ParameterMode &_tao_enumval)
-{
-  CORBA::ULong _tao_temp = _tao_enumval;
-  return strm << _tao_temp;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Dynamic::ParameterMode &_tao_enumval)
-{
-  CORBA::ULong _tao_temp = 0;
-  CORBA::Boolean _tao_result = strm >> _tao_temp;
-  
-  if (_tao_result == 1)
-    {
-      _tao_enumval = ACE_static_cast (Dynamic::ParameterMode, _tao_temp);
-    }
-  
-  return _tao_result;
-}
-
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const Dynamic::Parameter &_tao_aggregate)
 {
   if (
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.cpp b/TAO/tao/IFR_Client/IFR_BaseC.cpp
index 99e0f7cd880..840c8537ffb 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.cpp
+++ b/TAO/tao/IFR_Client/IFR_BaseC.cpp
@@ -20,11 +20,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "IFR_BaseC.h"
-#include "tao/corbafwd.h"
-#include "tao/ClientRequestInfo.h"
+
+#include "tao/PortableInterceptor.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
+#include "tao/ClientRequestInfo.h"
+#include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 #if defined (__BORLANDC__)
@@ -202,7 +204,7 @@ CORBA_IRObject_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class CORBA_IRObject_out
+// Operations for class CORBA_IRObject_out
 // *************************************************************
 
 CORBA_IRObject_out::CORBA_IRObject_out (CORBA_IRObject_ptr &p)
@@ -273,19 +275,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -366,19 +368,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -474,17 +476,21 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_Remote_Proxy_Impl::def_kind (
       0,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get ri (
@@ -494,22 +500,31 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_Remote_Proxy_Impl::def_kind (
       );
       ACE_CHECK_RETURN  (_tao_retval);
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
           
           _tao_call.prepare_header (
@@ -517,6 +532,7 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_Remote_Proxy_Impl::def_kind (
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
+          
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
@@ -524,11 +540,24 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_Remote_Proxy_Impl::def_kind (
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 _tao_retval
               );
               
             }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
           
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
@@ -542,70 +571,51 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_Remote_Proxy_Impl::def_kind (
               
             }
           
-          TAO_INTERCEPTOR (
-              CORBA::DefinitionKind  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          CORBA::DefinitionKind _tao_retval_info = _tao_retval;
+          ri.result (_tao_retval_info);
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_retval;
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN  (_tao_retval);
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN  (_tao_retval);
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
+return _tao_retval;
 }
 
 void _TAO_CORBA_IRObject_Remote_Proxy_Impl::destroy (
@@ -632,17 +642,21 @@ void _TAO_CORBA_IRObject_Remote_Proxy_Impl::destroy (
       0,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_IRObject_destroy ri (
@@ -652,22 +666,31 @@ void _TAO_CORBA_IRObject_Remote_Proxy_Impl::destroy (
       );
       ACE_CHECK;
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
           
           _tao_call.prepare_header (
@@ -675,6 +698,7 @@ void _TAO_CORBA_IRObject_Remote_Proxy_Impl::destroy (
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
+          
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
@@ -682,71 +706,68 @@ void _TAO_CORBA_IRObject_Remote_Proxy_Impl::destroy (
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
               
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
+          
           
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 
@@ -823,9 +844,9 @@ CORBA_IRObject::CORBA_IRObject_setup_collocation (int collocated)
       ::_TAO_CORBA_IRObject_Remote_Proxy_Broker::the_TAO_CORBA_IRObject_Remote_Proxy_Broker ();
 }
 
-void CORBA_IRObject::_tao_any_destructor (void *x)
+void CORBA_IRObject::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_IRObject *tmp = ACE_static_cast (CORBA_IRObject*,x);
+  CORBA_IRObject *tmp = ACE_static_cast (CORBA_IRObject*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -1135,7 +1156,7 @@ CORBA_Contained_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class CORBA_Contained_out
+// Operations for class CORBA_Contained_out
 // *************************************************************
 
 CORBA_Contained_out::CORBA_Contained_out (CORBA_Contained_ptr &p)
@@ -1206,19 +1227,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -1300,19 +1321,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -1345,11 +1366,13 @@ TAO_ClientRequestInfo_CORBA_Contained_id_set::arguments (CORBA::Environment &ACE
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
+  
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
   
   return safe_parameter_list._retn ();
 }
@@ -1391,19 +1414,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -1485,19 +1508,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -1530,11 +1553,13 @@ TAO_ClientRequestInfo_CORBA_Contained_name_set::arguments (CORBA::Environment &A
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
+  
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
   
   return safe_parameter_list._retn ();
 }
@@ -1576,19 +1601,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -1670,19 +1695,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -1715,11 +1740,13 @@ TAO_ClientRequestInfo_CORBA_Contained_version_set::arguments (CORBA::Environment
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
+  
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= version_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
   
   return safe_parameter_list._retn ();
 }
@@ -1761,19 +1788,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -1854,19 +1881,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -1947,19 +1974,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -2040,19 +2067,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -2136,19 +2163,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -2187,22 +2214,19 @@ TAO_ClientRequestInfo_CORBA_Contained_move::arguments (CORBA::Environment &ACE_T
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_new_container = parameter_list->length ();
-  parameter_list->length (length_new_container + 1);
-  (*parameter_list)[length_new_container].argument <<=  this->new_container_;
   
-  (*parameter_list)[length_new_container].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_new_name = parameter_list->length ();
-  parameter_list->length (length_new_name + 1);
-  (*parameter_list)[length_new_name].argument <<= new_name_;
-  (*parameter_list)[length_new_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_new_version = parameter_list->length ();
-  parameter_list->length (length_new_version + 1);
-  (*parameter_list)[length_new_version].argument <<= new_version_;
-  (*parameter_list)[length_new_version].mode = Dynamic::PARAM_IN;
+  parameter_list->length (3);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<=  this->new_container_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= new_name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= new_version_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
   
   return safe_parameter_list._retn ();
 }
@@ -2271,17 +2295,21 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
       0,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Contained_id_get ri (
@@ -2291,22 +2319,31 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
       );
       ACE_CHECK_RETURN (0);
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
           
           _tao_call.prepare_header (
@@ -2314,6 +2351,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
@@ -2321,11 +2359,24 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
               
             }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
           
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
@@ -2339,71 +2390,52 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
               
             }
           
-          TAO_INTERCEPTOR (
-              char * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          char * _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 void _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
@@ -2431,17 +2463,21 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
       1,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Contained_id_set ri (
@@ -2452,22 +2488,31 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
       );
       ACE_CHECK;
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
           
           _tao_call.prepare_header (
@@ -2491,71 +2536,68 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
               
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
+          
           
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 char * _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
@@ -2582,17 +2624,21 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
       0,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Contained_name_get ri (
@@ -2602,22 +2648,31 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
       );
       ACE_CHECK_RETURN (0);
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
           
           _tao_call.prepare_header (
@@ -2625,6 +2680,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
@@ -2632,11 +2688,24 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
               
             }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
           
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
@@ -2650,71 +2719,52 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
               
             }
           
-          TAO_INTERCEPTOR (
-              char * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          char * _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 void _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
@@ -2742,17 +2792,21 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
       1,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Contained_name_set ri (
@@ -2763,22 +2817,31 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
       );
       ACE_CHECK;
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
           
           _tao_call.prepare_header (
@@ -2802,71 +2865,68 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
               
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
+          
           
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 char * _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
@@ -2893,17 +2953,21 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
       0,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Contained_version_get ri (
@@ -2913,22 +2977,31 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
       );
       ACE_CHECK_RETURN (0);
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
           
           _tao_call.prepare_header (
@@ -2936,6 +3009,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
@@ -2943,11 +3017,24 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
               
             }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
           
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
@@ -2961,71 +3048,52 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
               
             }
           
-          TAO_INTERCEPTOR (
-              char * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          char * _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 void _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
@@ -3053,17 +3121,21 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
       1,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Contained_version_set ri (
@@ -3074,22 +3146,31 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
       );
       ACE_CHECK;
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+          
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+#endif /* TAO_HAS_INTERCEPTORS */
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
           
           _tao_call.prepare_header (
@@ -3113,71 +3194,68 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
               
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
+          
           
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 CORBA_Container_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::defined_in (
@@ -3205,17 +3283,21 @@ CORBA_Container_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::defined_in (
       0,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Contained_defined_in_get ri (
@@ -3225,22 +3307,31 @@ CORBA_Container_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::defined_in (
       );
       ACE_CHECK_RETURN (0);
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
           
           _tao_call.prepare_header (
@@ -3248,6 +3339,7 @@ CORBA_Container_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::defined_in (
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
@@ -3255,11 +3347,24 @@ CORBA_Container_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::defined_in (
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
               
             }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
           
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
@@ -3273,71 +3378,52 @@ CORBA_Container_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::defined_in (
               
             }
           
-          TAO_INTERCEPTOR (
-              CORBA_Container_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          CORBA_Container_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 char * _TAO_CORBA_Contained_Remote_Proxy_Impl::absolute_name (
@@ -3364,17 +3450,21 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::absolute_name (
       0,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get ri (
@@ -3384,22 +3474,31 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::absolute_name (
       );
       ACE_CHECK_RETURN (0);
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+          
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+#endif /* TAO_HAS_INTERCEPTORS */
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
           
           _tao_call.prepare_header (
@@ -3407,6 +3506,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::absolute_name (
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
@@ -3414,11 +3514,24 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::absolute_name (
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
               
             }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
           
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
@@ -3432,71 +3545,52 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::absolute_name (
               
             }
           
-          TAO_INTERCEPTOR (
-              char * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          char * _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_Repository_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::containing_repository (
@@ -3524,17 +3618,21 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::containing_reposito
       0,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get ri (
@@ -3544,22 +3642,31 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::containing_reposito
       );
       ACE_CHECK_RETURN (0);
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
           
           _tao_call.prepare_header (
@@ -3567,6 +3674,7 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::containing_reposito
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
@@ -3574,11 +3682,24 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::containing_reposito
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
               
             }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
           
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
@@ -3592,71 +3713,52 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::containing_reposito
               
             }
           
-          TAO_INTERCEPTOR (
-              CORBA_Repository_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          CORBA_Repository_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_Contained::Description * _TAO_CORBA_Contained_Remote_Proxy_Impl::describe (
@@ -3684,17 +3786,21 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_Remote_Proxy_Impl::describe
       0,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Contained_describe ri (
@@ -3704,22 +3810,31 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_Remote_Proxy_Impl::describe
       );
       ACE_CHECK_RETURN (0);
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+          
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+#endif /* TAO_HAS_INTERCEPTORS */
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
           
           _tao_call.prepare_header (
@@ -3727,6 +3842,7 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_Remote_Proxy_Impl::describe
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
@@ -3734,11 +3850,24 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_Remote_Proxy_Impl::describe
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
               
             }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
           
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
@@ -3752,71 +3881,52 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_Remote_Proxy_Impl::describe
               
             }
           
-          TAO_INTERCEPTOR (
-              CORBA_Contained::Description * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          CORBA_Contained::Description * _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 void _TAO_CORBA_Contained_Remote_Proxy_Impl::move (
@@ -3846,17 +3956,21 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::move (
       1,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Contained_move ri (
@@ -3869,22 +3983,31 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::move (
       );
       ACE_CHECK;
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
           
           _tao_call.prepare_header (
@@ -3910,71 +4033,68 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::move (
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
               
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
+          
           
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 
@@ -4053,9 +4173,9 @@ CORBA_Contained::CORBA_Contained_setup_collocation (int collocated)
   this->CORBA_IRObject_setup_collocation (collocated);
 }
 
-void CORBA_Contained::_tao_any_destructor (void *x)
+void CORBA_Contained::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_Contained *tmp = ACE_static_cast (CORBA_Contained*,x);
+  CORBA_Contained *tmp = ACE_static_cast (CORBA_Contained*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -4511,9 +4631,9 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Contained_Description (
 CORBA::TypeCode_ptr CORBA_Contained::_tc_Description =
   &_tc_TAO_tc_CORBA_Contained_Description;
 
-void CORBA_Contained::Description::_tao_any_destructor (void *x)
+void CORBA_Contained::Description::_tao_any_destructor (void *_tao_void_pointer)
 {
-  Description *tmp = ACE_static_cast (Description*,x);
+  Description *tmp = ACE_static_cast (Description*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -4558,93 +4678,93 @@ void CORBA_Contained::move (
 }
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CS_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CS_
 
-  // The Base_Sequence functions, please see tao/Sequence.h
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA_Contained **tmp = 0;
-    tmp = _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA_Contained **old = ACE_reinterpret_cast (CORBA_Contained**, this->buffer_);
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = CORBA_Contained::_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete[] old;
-        }
-    }
-    this->buffer_ = tmp;
-  }
+// The Base_Sequence functions, please see tao/Sequence.h
+void
+_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_allocate_buffer (CORBA::ULong length)
+{
+  CORBA_Contained **tmp = 0;
+  tmp = _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (length);
   
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_deallocate_buffer (void)
+  if (this->buffer_ != 0)
   {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    CORBA_Contained **tmp = ACE_reinterpret_cast (CORBA_Contained**, this->buffer_);
-    
+    CORBA_Contained **old = ACE_reinterpret_cast (CORBA_Contained**, this->buffer_);
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
-        CORBA::release (tmp[i]);
-        tmp[i] = CORBA_Contained::_nil ();
+        if (!this->release_)
+          {
+            tmp[i] = CORBA_Contained::_duplicate (old[i]);
+          }
+        else
+          {
+            tmp[i] = old[i];
+          }
       }
     
-    _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  }
-  
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::~_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (void)
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-  {
-    CORBA_Contained **tmp = ACE_reinterpret_cast (CORBA_Contained**, this->buffer_);
-    
-    for (CORBA::ULong i = nl; i < ol; ++i)
+    if (this->release_)
       {
-        CORBA::release (tmp[i]);
-        tmp[i] = CORBA_Contained::_nil ();
+        delete[] old;
       }
   }
+  this->buffer_ = tmp;
+}
+
+void
+_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    return;
+  CORBA_Contained **tmp = ACE_reinterpret_cast (CORBA_Contained**, this->buffer_);
   
-  void 
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_downcast (
-      void* target,
-      CORBA_Object *src,
-      CORBA_Environment &ACE_TRY_ENV
-    )
-  {
-    CORBA_Contained **tmp = ACE_static_cast (CORBA_Contained**, target);
-    *tmp = CORBA_Contained::_narrow (src, ACE_TRY_ENV);
-    ACE_CHECK;
-  }
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      CORBA::release (tmp[i]);
+      tmp[i] = CORBA_Contained::_nil ();
+    }
+  
+  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::freebuf (tmp);
+  this->buffer_ = 0;
+}
 
-  CORBA_Object*
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_upcast (void *src) const
-  {
-    CORBA_Contained **tmp = ACE_static_cast (CORBA_Contained**, src);
-    return *tmp;
-  }
+_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::~_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (void)
+{
+  this->_deallocate_buffer ();
+}
+
+void
+_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+{
+  CORBA_Contained **tmp = ACE_reinterpret_cast (CORBA_Contained**, this->buffer_);
   
+  for (CORBA::ULong i = nl; i < ol; ++i)
+    {
+      CORBA::release (tmp[i]);
+      tmp[i] = CORBA_Contained::_nil ();
+    }
+}
+
+void 
+_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_downcast (
+    void* target,
+    CORBA_Object *src,
+    CORBA_Environment &ACE_TRY_ENV
+  )
+{
+  CORBA_Contained **tmp = ACE_static_cast (CORBA_Contained**, target);
+  *tmp = CORBA_Contained::_narrow (src, ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+CORBA_Object*
+_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_upcast (void *src) const
+{
+  CORBA_Contained **tmp = ACE_static_cast (CORBA_Contained**, src);
+  return *tmp;
+}
+
 #endif /* end #if !defined */
 
 
@@ -4662,35 +4782,35 @@ CORBA_ContainedSeq::CORBA_ContainedSeq (void)
 CORBA_ContainedSeq::CORBA_ContainedSeq (CORBA::ULong max) // uses max size
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq
+_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA_Contained,CORBA_Contained_var>
+TAO_Unbounded_Object_Sequence<CORBA_Contained,CORBA_Contained_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 CORBA_ContainedSeq::CORBA_ContainedSeq (CORBA::ULong max, CORBA::ULong length, CORBA_Contained_ptr *buffer, CORBA::Boolean release)
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq
+_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA_Contained,CORBA_Contained_var>
+TAO_Unbounded_Object_Sequence<CORBA_Contained,CORBA_Contained_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 CORBA_ContainedSeq::CORBA_ContainedSeq (const CORBA_ContainedSeq &seq) // copy ctor
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq
+_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA_Contained,CORBA_Contained_var>
+TAO_Unbounded_Object_Sequence<CORBA_Contained,CORBA_Contained_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 CORBA_ContainedSeq::~CORBA_ContainedSeq (void) // dtor
 {}
-void CORBA_ContainedSeq::_tao_any_destructor (void *x)
+void CORBA_ContainedSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_ContainedSeq *tmp = ACE_static_cast (CORBA_ContainedSeq*,x);
+  CORBA_ContainedSeq *tmp = ACE_static_cast (CORBA_ContainedSeq*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -4698,92 +4818,92 @@ void CORBA_ContainedSeq::_tao_any_destructor (void *x)
 #endif /* end #if !defined */
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_INTERFACEDEFSEQ_CS_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_INTERFACEDEFSEQ_CS_
 
-  // The Base_Sequence functions, please see tao/Sequence.h
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA_InterfaceDef **tmp = 0;
-    tmp = _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA_InterfaceDef **old = ACE_reinterpret_cast (CORBA_InterfaceDef**, this->buffer_);
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = tao_CORBA_InterfaceDef_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete[] old;
-        }
-    }
-    this->buffer_ = tmp;
-  }
+// The Base_Sequence functions, please see tao/Sequence.h
+void
+_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_allocate_buffer (CORBA::ULong length)
+{
+  CORBA_InterfaceDef **tmp = 0;
+  tmp = _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (length);
   
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_deallocate_buffer (void)
+  if (this->buffer_ != 0)
   {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    CORBA_InterfaceDef **tmp = ACE_reinterpret_cast (CORBA_InterfaceDef**, this->buffer_);
-    
+    CORBA_InterfaceDef **old = ACE_reinterpret_cast (CORBA_InterfaceDef**, this->buffer_);
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
-        tao_CORBA_InterfaceDef_release (tmp[i]);
-        tmp[i] = tao_CORBA_InterfaceDef_nil ();
+        if (!this->release_)
+          {
+            tmp[i] = tao_CORBA_InterfaceDef_duplicate (old[i]);
+          }
+        else
+          {
+            tmp[i] = old[i];
+          }
       }
     
-    _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  }
-  
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (void)
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-  {
-    CORBA_InterfaceDef **tmp = ACE_reinterpret_cast (CORBA_InterfaceDef**, this->buffer_);
-    
-    for (CORBA::ULong i = nl; i < ol; ++i)
+    if (this->release_)
       {
-        tao_CORBA_InterfaceDef_release (tmp[i]);
-        tmp[i] = tao_CORBA_InterfaceDef_nil ();
+        delete[] old;
       }
   }
+  this->buffer_ = tmp;
+}
+
+void
+_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    return;
+  CORBA_InterfaceDef **tmp = ACE_reinterpret_cast (CORBA_InterfaceDef**, this->buffer_);
   
-  void 
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_downcast (
-      void* target,
-      CORBA_Object *src,
-      CORBA_Environment &ACE_TRY_ENV
-    )
-  {
-    CORBA_InterfaceDef **tmp = ACE_static_cast (CORBA_InterfaceDef**, target);
-    *tmp = tao_CORBA_InterfaceDef_narrow (src, ACE_TRY_ENV);
-    ACE_CHECK;
-  }
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      tao_CORBA_InterfaceDef_release (tmp[i]);
+      tmp[i] = tao_CORBA_InterfaceDef_nil ();
+    }
+  
+  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::freebuf (tmp);
+  this->buffer_ = 0;
+}
 
-  CORBA_Object*
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_upcast (void *src) const
-  {
-    return tao_CORBA_InterfaceDef_upcast (src);
-  }
+_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (void)
+{
+  this->_deallocate_buffer ();
+}
+
+void
+_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+{
+  CORBA_InterfaceDef **tmp = ACE_reinterpret_cast (CORBA_InterfaceDef**, this->buffer_);
   
+  for (CORBA::ULong i = nl; i < ol; ++i)
+    {
+      tao_CORBA_InterfaceDef_release (tmp[i]);
+      tmp[i] = tao_CORBA_InterfaceDef_nil ();
+    }
+}
+
+void 
+_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_downcast (
+    void* target,
+    CORBA_Object *src,
+    CORBA_Environment &ACE_TRY_ENV
+  )
+{
+  CORBA_InterfaceDef **tmp = ACE_static_cast (CORBA_InterfaceDef**, target);
+  *tmp = tao_CORBA_InterfaceDef_narrow (src, ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+CORBA_Object*
+_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_upcast (void *src) const
+{
+  return tao_CORBA_InterfaceDef_upcast (src);
+}
+
 #endif /* end #if !defined */
 
 
@@ -4801,35 +4921,35 @@ CORBA_InterfaceDefSeq::CORBA_InterfaceDefSeq (void)
 CORBA_InterfaceDefSeq::CORBA_InterfaceDefSeq (CORBA::ULong max) // uses max size
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq
+_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA_InterfaceDef,CORBA_InterfaceDef_var>
+TAO_Unbounded_Object_Sequence<CORBA_InterfaceDef,CORBA_InterfaceDef_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 CORBA_InterfaceDefSeq::CORBA_InterfaceDefSeq (CORBA::ULong max, CORBA::ULong length, CORBA_InterfaceDef_ptr *buffer, CORBA::Boolean release)
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq
+_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA_InterfaceDef,CORBA_InterfaceDef_var>
+TAO_Unbounded_Object_Sequence<CORBA_InterfaceDef,CORBA_InterfaceDef_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 CORBA_InterfaceDefSeq::CORBA_InterfaceDefSeq (const CORBA_InterfaceDefSeq &seq) // copy ctor
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq
+_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA_InterfaceDef,CORBA_InterfaceDef_var>
+TAO_Unbounded_Object_Sequence<CORBA_InterfaceDef,CORBA_InterfaceDef_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 CORBA_InterfaceDefSeq::~CORBA_InterfaceDefSeq (void) // dtor
 {}
-void CORBA_InterfaceDefSeq::_tao_any_destructor (void *x)
+void CORBA_InterfaceDefSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_InterfaceDefSeq *tmp = ACE_static_cast (CORBA_InterfaceDefSeq*,x);
+  CORBA_InterfaceDefSeq *tmp = ACE_static_cast (CORBA_InterfaceDefSeq*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -4837,92 +4957,92 @@ void CORBA_InterfaceDefSeq::_tao_any_destructor (void *x)
 #endif /* end #if !defined */
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CS_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CS_
 
-  // The Base_Sequence functions, please see tao/Sequence.h
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA_ValueDef **tmp = 0;
-    tmp = _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA_ValueDef **old = ACE_reinterpret_cast (CORBA_ValueDef**, this->buffer_);
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = tao_CORBA_ValueDef_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete[] old;
-        }
-    }
-    this->buffer_ = tmp;
-  }
+// The Base_Sequence functions, please see tao/Sequence.h
+void
+_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_allocate_buffer (CORBA::ULong length)
+{
+  CORBA_ValueDef **tmp = 0;
+  tmp = _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (length);
   
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_deallocate_buffer (void)
+  if (this->buffer_ != 0)
   {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    CORBA_ValueDef **tmp = ACE_reinterpret_cast (CORBA_ValueDef**, this->buffer_);
-    
+    CORBA_ValueDef **old = ACE_reinterpret_cast (CORBA_ValueDef**, this->buffer_);
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
-        tao_CORBA_ValueDef_release (tmp[i]);
-        tmp[i] = tao_CORBA_ValueDef_nil ();
+        if (!this->release_)
+          {
+            tmp[i] = tao_CORBA_ValueDef_duplicate (old[i]);
+          }
+        else
+          {
+            tmp[i] = old[i];
+          }
       }
     
-    _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  }
-  
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (void)
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-  {
-    CORBA_ValueDef **tmp = ACE_reinterpret_cast (CORBA_ValueDef**, this->buffer_);
-    
-    for (CORBA::ULong i = nl; i < ol; ++i)
+    if (this->release_)
       {
-        tao_CORBA_ValueDef_release (tmp[i]);
-        tmp[i] = tao_CORBA_ValueDef_nil ();
+        delete[] old;
       }
   }
+  this->buffer_ = tmp;
+}
+
+void
+_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    return;
+  CORBA_ValueDef **tmp = ACE_reinterpret_cast (CORBA_ValueDef**, this->buffer_);
   
-  void 
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_downcast (
-      void* target,
-      CORBA_Object *src,
-      CORBA_Environment &ACE_TRY_ENV
-    )
-  {
-    CORBA_ValueDef **tmp = ACE_static_cast (CORBA_ValueDef**, target);
-    *tmp = tao_CORBA_ValueDef_narrow (src, ACE_TRY_ENV);
-    ACE_CHECK;
-  }
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      tao_CORBA_ValueDef_release (tmp[i]);
+      tmp[i] = tao_CORBA_ValueDef_nil ();
+    }
+  
+  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::freebuf (tmp);
+  this->buffer_ = 0;
+}
 
-  CORBA_Object*
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_upcast (void *src) const
-  {
-    return tao_CORBA_ValueDef_upcast (src);
-  }
+_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (void)
+{
+  this->_deallocate_buffer ();
+}
+
+void
+_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+{
+  CORBA_ValueDef **tmp = ACE_reinterpret_cast (CORBA_ValueDef**, this->buffer_);
   
+  for (CORBA::ULong i = nl; i < ol; ++i)
+    {
+      tao_CORBA_ValueDef_release (tmp[i]);
+      tmp[i] = tao_CORBA_ValueDef_nil ();
+    }
+}
+
+void 
+_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_downcast (
+    void* target,
+    CORBA_Object *src,
+    CORBA_Environment &ACE_TRY_ENV
+  )
+{
+  CORBA_ValueDef **tmp = ACE_static_cast (CORBA_ValueDef**, target);
+  *tmp = tao_CORBA_ValueDef_narrow (src, ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+CORBA_Object*
+_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_upcast (void *src) const
+{
+  return tao_CORBA_ValueDef_upcast (src);
+}
+
 #endif /* end #if !defined */
 
 
@@ -4940,35 +5060,35 @@ CORBA_ValueDefSeq::CORBA_ValueDefSeq (void)
 CORBA_ValueDefSeq::CORBA_ValueDefSeq (CORBA::ULong max) // uses max size
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq
+_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA_ValueDef,CORBA_ValueDef_var>
+TAO_Unbounded_Object_Sequence<CORBA_ValueDef,CORBA_ValueDef_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 CORBA_ValueDefSeq::CORBA_ValueDefSeq (CORBA::ULong max, CORBA::ULong length, CORBA_ValueDef_ptr *buffer, CORBA::Boolean release)
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq
+_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA_ValueDef,CORBA_ValueDef_var>
+TAO_Unbounded_Object_Sequence<CORBA_ValueDef,CORBA_ValueDef_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 CORBA_ValueDefSeq::CORBA_ValueDefSeq (const CORBA_ValueDefSeq &seq) // copy ctor
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq
+_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA_ValueDef,CORBA_ValueDef_var>
+TAO_Unbounded_Object_Sequence<CORBA_ValueDef,CORBA_ValueDef_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 CORBA_ValueDefSeq::~CORBA_ValueDefSeq (void) // dtor
 {}
-void CORBA_ValueDefSeq::_tao_any_destructor (void *x)
+void CORBA_ValueDefSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_ValueDefSeq *tmp = ACE_static_cast (CORBA_ValueDefSeq*,x);
+  CORBA_ValueDefSeq *tmp = ACE_static_cast (CORBA_ValueDefSeq*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -4976,92 +5096,92 @@ void CORBA_ValueDefSeq::_tao_any_destructor (void *x)
 #endif /* end #if !defined */
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_ABSTRACTINTERFACEDEFSEQ_CS_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_ABSTRACTINTERFACEDEFSEQ_CS_
 
-  // The Base_Sequence functions, please see tao/Sequence.h
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA_AbstractInterfaceDef **tmp = 0;
-    tmp = _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA_AbstractInterfaceDef **old = ACE_reinterpret_cast (CORBA_AbstractInterfaceDef**, this->buffer_);
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = tao_CORBA_AbstractInterfaceDef_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete[] old;
-        }
-    }
-    this->buffer_ = tmp;
-  }
+// The Base_Sequence functions, please see tao/Sequence.h
+void
+_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_allocate_buffer (CORBA::ULong length)
+{
+  CORBA_AbstractInterfaceDef **tmp = 0;
+  tmp = _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (length);
   
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_deallocate_buffer (void)
+  if (this->buffer_ != 0)
   {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    CORBA_AbstractInterfaceDef **tmp = ACE_reinterpret_cast (CORBA_AbstractInterfaceDef**, this->buffer_);
-    
+    CORBA_AbstractInterfaceDef **old = ACE_reinterpret_cast (CORBA_AbstractInterfaceDef**, this->buffer_);
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
-        tao_CORBA_AbstractInterfaceDef_release (tmp[i]);
-        tmp[i] = tao_CORBA_AbstractInterfaceDef_nil ();
+        if (!this->release_)
+          {
+            tmp[i] = tao_CORBA_AbstractInterfaceDef_duplicate (old[i]);
+          }
+        else
+          {
+            tmp[i] = old[i];
+          }
       }
     
-    _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  }
-  
-  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (void)
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-  {
-    CORBA_AbstractInterfaceDef **tmp = ACE_reinterpret_cast (CORBA_AbstractInterfaceDef**, this->buffer_);
-    
-    for (CORBA::ULong i = nl; i < ol; ++i)
+    if (this->release_)
       {
-        tao_CORBA_AbstractInterfaceDef_release (tmp[i]);
-        tmp[i] = tao_CORBA_AbstractInterfaceDef_nil ();
+        delete[] old;
       }
   }
+  this->buffer_ = tmp;
+}
+
+void
+_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    return;
+  CORBA_AbstractInterfaceDef **tmp = ACE_reinterpret_cast (CORBA_AbstractInterfaceDef**, this->buffer_);
   
-  void 
-  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_downcast (
-      void* target,
-      CORBA_Object *src,
-      CORBA_Environment &ACE_TRY_ENV
-    )
-  {
-    CORBA_AbstractInterfaceDef **tmp = ACE_static_cast (CORBA_AbstractInterfaceDef**, target);
-    *tmp = tao_CORBA_AbstractInterfaceDef_narrow (src, ACE_TRY_ENV);
-    ACE_CHECK;
-  }
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      tao_CORBA_AbstractInterfaceDef_release (tmp[i]);
+      tmp[i] = tao_CORBA_AbstractInterfaceDef_nil ();
+    }
+  
+  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::freebuf (tmp);
+  this->buffer_ = 0;
+}
 
-  CORBA_Object*
-  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_upcast (void *src) const
-  {
-    return tao_CORBA_AbstractInterfaceDef_upcast (src);
-  }
+_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (void)
+{
+  this->_deallocate_buffer ();
+}
+
+void
+_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+{
+  CORBA_AbstractInterfaceDef **tmp = ACE_reinterpret_cast (CORBA_AbstractInterfaceDef**, this->buffer_);
   
+  for (CORBA::ULong i = nl; i < ol; ++i)
+    {
+      tao_CORBA_AbstractInterfaceDef_release (tmp[i]);
+      tmp[i] = tao_CORBA_AbstractInterfaceDef_nil ();
+    }
+}
+
+void 
+_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_downcast (
+    void* target,
+    CORBA_Object *src,
+    CORBA_Environment &ACE_TRY_ENV
+  )
+{
+  CORBA_AbstractInterfaceDef **tmp = ACE_static_cast (CORBA_AbstractInterfaceDef**, target);
+  *tmp = tao_CORBA_AbstractInterfaceDef_narrow (src, ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+CORBA_Object*
+_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_upcast (void *src) const
+{
+  return tao_CORBA_AbstractInterfaceDef_upcast (src);
+}
+
 #endif /* end #if !defined */
 
 
@@ -5079,35 +5199,35 @@ CORBA_AbstractInterfaceDefSeq::CORBA_AbstractInterfaceDefSeq (void)
 CORBA_AbstractInterfaceDefSeq::CORBA_AbstractInterfaceDefSeq (CORBA::ULong max) // uses max size
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq
+_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA_AbstractInterfaceDef,CORBA_AbstractInterfaceDef_var>
+TAO_Unbounded_Object_Sequence<CORBA_AbstractInterfaceDef,CORBA_AbstractInterfaceDef_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 CORBA_AbstractInterfaceDefSeq::CORBA_AbstractInterfaceDefSeq (CORBA::ULong max, CORBA::ULong length, CORBA_AbstractInterfaceDef_ptr *buffer, CORBA::Boolean release)
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq
+_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA_AbstractInterfaceDef,CORBA_AbstractInterfaceDef_var>
+TAO_Unbounded_Object_Sequence<CORBA_AbstractInterfaceDef,CORBA_AbstractInterfaceDef_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 CORBA_AbstractInterfaceDefSeq::CORBA_AbstractInterfaceDefSeq (const CORBA_AbstractInterfaceDefSeq &seq) // copy ctor
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq
+_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA_AbstractInterfaceDef,CORBA_AbstractInterfaceDef_var>
+TAO_Unbounded_Object_Sequence<CORBA_AbstractInterfaceDef,CORBA_AbstractInterfaceDef_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 CORBA_AbstractInterfaceDefSeq::~CORBA_AbstractInterfaceDefSeq (void) // dtor
 {}
-void CORBA_AbstractInterfaceDefSeq::_tao_any_destructor (void *x)
+void CORBA_AbstractInterfaceDefSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_AbstractInterfaceDefSeq *tmp = ACE_static_cast (CORBA_AbstractInterfaceDefSeq*,x);
+  CORBA_AbstractInterfaceDefSeq *tmp = ACE_static_cast (CORBA_AbstractInterfaceDefSeq*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -5115,92 +5235,92 @@ void CORBA_AbstractInterfaceDefSeq::_tao_any_destructor (void *x)
 #endif /* end #if !defined */
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_LOCALINTERFACEDEFSEQ_CS_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_LOCALINTERFACEDEFSEQ_CS_
 
-  // The Base_Sequence functions, please see tao/Sequence.h
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA_LocalInterfaceDef **tmp = 0;
-    tmp = _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA_LocalInterfaceDef **old = ACE_reinterpret_cast (CORBA_LocalInterfaceDef**, this->buffer_);
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = tao_CORBA_LocalInterfaceDef_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete[] old;
-        }
-    }
-    this->buffer_ = tmp;
-  }
+// The Base_Sequence functions, please see tao/Sequence.h
+void
+_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_allocate_buffer (CORBA::ULong length)
+{
+  CORBA_LocalInterfaceDef **tmp = 0;
+  tmp = _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (length);
   
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_deallocate_buffer (void)
+  if (this->buffer_ != 0)
   {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    CORBA_LocalInterfaceDef **tmp = ACE_reinterpret_cast (CORBA_LocalInterfaceDef**, this->buffer_);
-    
+    CORBA_LocalInterfaceDef **old = ACE_reinterpret_cast (CORBA_LocalInterfaceDef**, this->buffer_);
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
-        tao_CORBA_LocalInterfaceDef_release (tmp[i]);
-        tmp[i] = tao_CORBA_LocalInterfaceDef_nil ();
+        if (!this->release_)
+          {
+            tmp[i] = tao_CORBA_LocalInterfaceDef_duplicate (old[i]);
+          }
+        else
+          {
+            tmp[i] = old[i];
+          }
       }
     
-    _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  }
-  
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (void)
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-  {
-    CORBA_LocalInterfaceDef **tmp = ACE_reinterpret_cast (CORBA_LocalInterfaceDef**, this->buffer_);
-    
-    for (CORBA::ULong i = nl; i < ol; ++i)
+    if (this->release_)
       {
-        tao_CORBA_LocalInterfaceDef_release (tmp[i]);
-        tmp[i] = tao_CORBA_LocalInterfaceDef_nil ();
+        delete[] old;
       }
   }
+  this->buffer_ = tmp;
+}
+
+void
+_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    return;
+  CORBA_LocalInterfaceDef **tmp = ACE_reinterpret_cast (CORBA_LocalInterfaceDef**, this->buffer_);
   
-  void 
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_downcast (
-      void* target,
-      CORBA_Object *src,
-      CORBA_Environment &ACE_TRY_ENV
-    )
-  {
-    CORBA_LocalInterfaceDef **tmp = ACE_static_cast (CORBA_LocalInterfaceDef**, target);
-    *tmp = tao_CORBA_LocalInterfaceDef_narrow (src, ACE_TRY_ENV);
-    ACE_CHECK;
-  }
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      tao_CORBA_LocalInterfaceDef_release (tmp[i]);
+      tmp[i] = tao_CORBA_LocalInterfaceDef_nil ();
+    }
+  
+  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::freebuf (tmp);
+  this->buffer_ = 0;
+}
 
-  CORBA_Object*
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_upcast (void *src) const
-  {
-    return tao_CORBA_LocalInterfaceDef_upcast (src);
-  }
+_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (void)
+{
+  this->_deallocate_buffer ();
+}
+
+void
+_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+{
+  CORBA_LocalInterfaceDef **tmp = ACE_reinterpret_cast (CORBA_LocalInterfaceDef**, this->buffer_);
   
+  for (CORBA::ULong i = nl; i < ol; ++i)
+    {
+      tao_CORBA_LocalInterfaceDef_release (tmp[i]);
+      tmp[i] = tao_CORBA_LocalInterfaceDef_nil ();
+    }
+}
+
+void 
+_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_downcast (
+    void* target,
+    CORBA_Object *src,
+    CORBA_Environment &ACE_TRY_ENV
+  )
+{
+  CORBA_LocalInterfaceDef **tmp = ACE_static_cast (CORBA_LocalInterfaceDef**, target);
+  *tmp = tao_CORBA_LocalInterfaceDef_narrow (src, ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+CORBA_Object*
+_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_upcast (void *src) const
+{
+  return tao_CORBA_LocalInterfaceDef_upcast (src);
+}
+
 #endif /* end #if !defined */
 
 
@@ -5218,91 +5338,91 @@ CORBA_LocalInterfaceDefSeq::CORBA_LocalInterfaceDefSeq (void)
 CORBA_LocalInterfaceDefSeq::CORBA_LocalInterfaceDefSeq (CORBA::ULong max) // uses max size
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq
+_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA_LocalInterfaceDef,CORBA_LocalInterfaceDef_var>
+TAO_Unbounded_Object_Sequence<CORBA_LocalInterfaceDef,CORBA_LocalInterfaceDef_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 CORBA_LocalInterfaceDefSeq::CORBA_LocalInterfaceDefSeq (CORBA::ULong max, CORBA::ULong length, CORBA_LocalInterfaceDef_ptr *buffer, CORBA::Boolean release)
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq
+_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA_LocalInterfaceDef,CORBA_LocalInterfaceDef_var>
+TAO_Unbounded_Object_Sequence<CORBA_LocalInterfaceDef,CORBA_LocalInterfaceDef_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 CORBA_LocalInterfaceDefSeq::CORBA_LocalInterfaceDefSeq (const CORBA_LocalInterfaceDefSeq &seq) // copy ctor
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq
+_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA_LocalInterfaceDef,CORBA_LocalInterfaceDef_var>
+TAO_Unbounded_Object_Sequence<CORBA_LocalInterfaceDef,CORBA_LocalInterfaceDef_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 CORBA_LocalInterfaceDefSeq::~CORBA_LocalInterfaceDefSeq (void) // dtor
 {}
-void CORBA_LocalInterfaceDefSeq::_tao_any_destructor (void *x)
+void CORBA_LocalInterfaceDefSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_LocalInterfaceDefSeq *tmp = ACE_static_cast (CORBA_LocalInterfaceDefSeq*,x);
+  CORBA_LocalInterfaceDefSeq *tmp = ACE_static_cast (CORBA_LocalInterfaceDefSeq*, _tao_void_pointer);
   delete tmp;
 }
 
 
 #endif /* end #if !defined */
 
-void CORBA_StructMember::_tao_any_destructor (void *x)
+void CORBA_StructMember::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_StructMember *tmp = ACE_static_cast (CORBA_StructMember*,x);
+  CORBA_StructMember *tmp = ACE_static_cast (CORBA_StructMember*, _tao_void_pointer);
   delete tmp;
 }
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_STRUCTMEMBERSEQ_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_STRUCTMEMBERSEQ_CS_
 
-  void
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA_StructMember* tmp = 0;
-    tmp = _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA_StructMember *old = ACE_reinterpret_cast (CORBA_StructMember *,this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-      
-      if (this->release_)
-        _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::freebuf (old);
-      
-    }
-    this->buffer_ = tmp;
-  }
+void
+_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::_allocate_buffer (CORBA::ULong length)
+{
+  CORBA_StructMember* tmp = 0;
+  tmp = _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::allocbuf (length);
   
-  void
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::_deallocate_buffer (void)
+  if (this->buffer_ != 0)
   {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
+    CORBA_StructMember *old = ACE_reinterpret_cast (CORBA_StructMember *,this->buffer_);
+    
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
+      tmp[i] = old[i];
     
-    CORBA_StructMember *tmp = ACE_reinterpret_cast (CORBA_StructMember *,this->buffer_);
+    if (this->release_)
+      _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::freebuf (old);
     
-    _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  } 
-  
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::~_TAO_Unbounded_Sequence_CORBA_StructMemberSeq (void) // Dtor.
-  {
-    this->_deallocate_buffer ();
   }
+  this->buffer_ = tmp;
+}
+
+void
+_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    return;
   
+  CORBA_StructMember *tmp = ACE_reinterpret_cast (CORBA_StructMember *,this->buffer_);
   
+  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::freebuf (tmp);
+  this->buffer_ = 0;
+} 
+
+_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::~_TAO_Unbounded_Sequence_CORBA_StructMemberSeq (void) // Dtor.
+{
+  this->_deallocate_buffer ();
+}
+
+
 #endif /* end #if !defined */
 
 
@@ -5320,91 +5440,91 @@ CORBA_StructMemberSeq::CORBA_StructMemberSeq (void)
 CORBA_StructMemberSeq::CORBA_StructMemberSeq (CORBA::ULong max) // uses max size
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq
+_TAO_Unbounded_Sequence_CORBA_StructMemberSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_StructMember>
+TAO_Unbounded_Sequence<CORBA_StructMember>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 CORBA_StructMemberSeq::CORBA_StructMemberSeq (CORBA::ULong max, CORBA::ULong length, CORBA_StructMember *buffer, CORBA::Boolean release)
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq
+_TAO_Unbounded_Sequence_CORBA_StructMemberSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_StructMember>
+TAO_Unbounded_Sequence<CORBA_StructMember>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 CORBA_StructMemberSeq::CORBA_StructMemberSeq (const CORBA_StructMemberSeq &seq) // copy ctor
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq
+_TAO_Unbounded_Sequence_CORBA_StructMemberSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_StructMember>
+TAO_Unbounded_Sequence<CORBA_StructMember>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 CORBA_StructMemberSeq::~CORBA_StructMemberSeq (void) // dtor
 {}
-void CORBA_StructMemberSeq::_tao_any_destructor (void *x)
+void CORBA_StructMemberSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_StructMemberSeq *tmp = ACE_static_cast (CORBA_StructMemberSeq*,x);
+  CORBA_StructMemberSeq *tmp = ACE_static_cast (CORBA_StructMemberSeq*, _tao_void_pointer);
   delete tmp;
 }
 
 
 #endif /* end #if !defined */
 
-void CORBA_Initializer::_tao_any_destructor (void *x)
+void CORBA_Initializer::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_Initializer *tmp = ACE_static_cast (CORBA_Initializer*,x);
+  CORBA_Initializer *tmp = ACE_static_cast (CORBA_Initializer*, _tao_void_pointer);
   delete tmp;
 }
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_INITIALIZERSEQ_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_INITIALIZERSEQ_CS_
 
-  void
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA_Initializer* tmp = 0;
-    tmp = _TAO_Unbounded_Sequence_CORBA_InitializerSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA_Initializer *old = ACE_reinterpret_cast (CORBA_Initializer *,this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-      
-      if (this->release_)
-        _TAO_Unbounded_Sequence_CORBA_InitializerSeq::freebuf (old);
-      
-    }
-    this->buffer_ = tmp;
-  }
+void
+_TAO_Unbounded_Sequence_CORBA_InitializerSeq::_allocate_buffer (CORBA::ULong length)
+{
+  CORBA_Initializer* tmp = 0;
+  tmp = _TAO_Unbounded_Sequence_CORBA_InitializerSeq::allocbuf (length);
   
-  void
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq::_deallocate_buffer (void)
+  if (this->buffer_ != 0)
   {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
+    CORBA_Initializer *old = ACE_reinterpret_cast (CORBA_Initializer *,this->buffer_);
     
-    CORBA_Initializer *tmp = ACE_reinterpret_cast (CORBA_Initializer *,this->buffer_);
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
+      tmp[i] = old[i];
+    
+    if (this->release_)
+      _TAO_Unbounded_Sequence_CORBA_InitializerSeq::freebuf (old);
     
-    _TAO_Unbounded_Sequence_CORBA_InitializerSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  } 
-  
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq::~_TAO_Unbounded_Sequence_CORBA_InitializerSeq (void) // Dtor.
-  {
-    this->_deallocate_buffer ();
   }
+  this->buffer_ = tmp;
+}
+
+void
+_TAO_Unbounded_Sequence_CORBA_InitializerSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    return;
   
+  CORBA_Initializer *tmp = ACE_reinterpret_cast (CORBA_Initializer *,this->buffer_);
   
+  _TAO_Unbounded_Sequence_CORBA_InitializerSeq::freebuf (tmp);
+  this->buffer_ = 0;
+} 
+
+_TAO_Unbounded_Sequence_CORBA_InitializerSeq::~_TAO_Unbounded_Sequence_CORBA_InitializerSeq (void) // Dtor.
+{
+  this->_deallocate_buffer ();
+}
+
+
 #endif /* end #if !defined */
 
 
@@ -5422,91 +5542,92 @@ CORBA_InitializerSeq::CORBA_InitializerSeq (void)
 CORBA_InitializerSeq::CORBA_InitializerSeq (CORBA::ULong max) // uses max size
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq
+_TAO_Unbounded_Sequence_CORBA_InitializerSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_Initializer>
+TAO_Unbounded_Sequence<CORBA_Initializer>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 CORBA_InitializerSeq::CORBA_InitializerSeq (CORBA::ULong max, CORBA::ULong length, CORBA_Initializer *buffer, CORBA::Boolean release)
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq
+_TAO_Unbounded_Sequence_CORBA_InitializerSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_Initializer>
+TAO_Unbounded_Sequence<CORBA_Initializer>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 CORBA_InitializerSeq::CORBA_InitializerSeq (const CORBA_InitializerSeq &seq) // copy ctor
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq
+_TAO_Unbounded_Sequence_CORBA_InitializerSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_Initializer>
+TAO_Unbounded_Sequence<CORBA_Initializer>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 CORBA_InitializerSeq::~CORBA_InitializerSeq (void) // dtor
 {}
-void CORBA_InitializerSeq::_tao_any_destructor (void *x)
+void CORBA_InitializerSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_InitializerSeq *tmp = ACE_static_cast (CORBA_InitializerSeq*,x);
+  CORBA_InitializerSeq *tmp = ACE_static_cast (CORBA_InitializerSeq*, _tao_void_pointer);
   delete tmp;
 }
 
 
 #endif /* end #if !defined */
 
-void CORBA_UnionMember::_tao_any_destructor (void *x)
+
+void CORBA_UnionMember::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_UnionMember *tmp = ACE_static_cast (CORBA_UnionMember*,x);
+  CORBA_UnionMember *tmp = ACE_static_cast (CORBA_UnionMember*, _tao_void_pointer);
   delete tmp;
 }
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_UNIONMEMBERSEQ_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_UNIONMEMBERSEQ_CS_
 
-  void
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA_UnionMember* tmp = 0;
-    tmp = _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA_UnionMember *old = ACE_reinterpret_cast (CORBA_UnionMember *,this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-      
-      if (this->release_)
-        _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::freebuf (old);
-      
-    }
-    this->buffer_ = tmp;
-  }
+void
+_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::_allocate_buffer (CORBA::ULong length)
+{
+  CORBA_UnionMember* tmp = 0;
+  tmp = _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::allocbuf (length);
   
-  void
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::_deallocate_buffer (void)
+  if (this->buffer_ != 0)
   {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
+    CORBA_UnionMember *old = ACE_reinterpret_cast (CORBA_UnionMember *,this->buffer_);
     
-    CORBA_UnionMember *tmp = ACE_reinterpret_cast (CORBA_UnionMember *,this->buffer_);
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
+      tmp[i] = old[i];
+    
+    if (this->release_)
+      _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::freebuf (old);
     
-    _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  } 
-  
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::~_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (void) // Dtor.
-  {
-    this->_deallocate_buffer ();
   }
+  this->buffer_ = tmp;
+}
+
+void
+_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    return;
   
+  CORBA_UnionMember *tmp = ACE_reinterpret_cast (CORBA_UnionMember *,this->buffer_);
   
+  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::freebuf (tmp);
+  this->buffer_ = 0;
+} 
+
+_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::~_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (void) // Dtor.
+{
+  this->_deallocate_buffer ();
+}
+
+
 #endif /* end #if !defined */
 
 
@@ -5524,35 +5645,35 @@ CORBA_UnionMemberSeq::CORBA_UnionMemberSeq (void)
 CORBA_UnionMemberSeq::CORBA_UnionMemberSeq (CORBA::ULong max) // uses max size
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq
+_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_UnionMember>
+TAO_Unbounded_Sequence<CORBA_UnionMember>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 CORBA_UnionMemberSeq::CORBA_UnionMemberSeq (CORBA::ULong max, CORBA::ULong length, CORBA_UnionMember *buffer, CORBA::Boolean release)
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq
+_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_UnionMember>
+TAO_Unbounded_Sequence<CORBA_UnionMember>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 CORBA_UnionMemberSeq::CORBA_UnionMemberSeq (const CORBA_UnionMemberSeq &seq) // copy ctor
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq
+_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_UnionMember>
+TAO_Unbounded_Sequence<CORBA_UnionMember>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 CORBA_UnionMemberSeq::~CORBA_UnionMemberSeq (void) // dtor
 {}
-void CORBA_UnionMemberSeq::_tao_any_destructor (void *x)
+void CORBA_UnionMemberSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_UnionMemberSeq *tmp = ACE_static_cast (CORBA_UnionMemberSeq*,x);
+  CORBA_UnionMemberSeq *tmp = ACE_static_cast (CORBA_UnionMemberSeq*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -5571,35 +5692,35 @@ CORBA_EnumMemberSeq::CORBA_EnumMemberSeq (void)
 CORBA_EnumMemberSeq::CORBA_EnumMemberSeq (CORBA::ULong max) // uses max size
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
+TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
+TAO_Unbounded_String_Sequence
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 CORBA_EnumMemberSeq::CORBA_EnumMemberSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
+TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
+TAO_Unbounded_String_Sequence
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 CORBA_EnumMemberSeq::CORBA_EnumMemberSeq (const CORBA_EnumMemberSeq &seq) // copy ctor
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
+TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
+TAO_Unbounded_String_Sequence
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 CORBA_EnumMemberSeq::~CORBA_EnumMemberSeq (void) // dtor
 {}
-void CORBA_EnumMemberSeq::_tao_any_destructor (void *x)
+void CORBA_EnumMemberSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_EnumMemberSeq *tmp = ACE_static_cast (CORBA_EnumMemberSeq*,x);
+  CORBA_EnumMemberSeq *tmp = ACE_static_cast (CORBA_EnumMemberSeq*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -5773,7 +5894,7 @@ CORBA_Container_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class CORBA_Container_out
+// Operations for class CORBA_Container_out
 // *************************************************************
 
 CORBA_Container_out::CORBA_Container_out (CORBA_Container_ptr &p)
@@ -5845,19 +5966,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -5892,11 +6013,13 @@ TAO_ClientRequestInfo_CORBA_Container_lookup::arguments (CORBA::Environment &ACE
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_search_name = parameter_list->length ();
-  parameter_list->length (length_search_name + 1);
-  (*parameter_list)[length_search_name].argument <<= search_name_;
-  (*parameter_list)[length_search_name].mode = Dynamic::PARAM_IN;
+  
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= search_name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
   
   return safe_parameter_list._retn ();
 }
@@ -5950,19 +6073,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -6000,17 +6123,16 @@ TAO_ClientRequestInfo_CORBA_Container_contents::arguments (CORBA::Environment &A
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_limit_type = parameter_list->length ();
-  parameter_list->length (length_limit_type + 1);
-  (*parameter_list)[length_limit_type].argument <<=  this->limit_type_;
   
-  (*parameter_list)[length_limit_type].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_exclude_inherited = parameter_list->length ();
-  parameter_list->length (length_exclude_inherited + 1);
-  (*parameter_list)[length_exclude_inherited].argument <<= CORBA::Any::from_boolean (this->exclude_inherited_);
-  (*parameter_list)[length_exclude_inherited].mode = Dynamic::PARAM_IN;
+  parameter_list->length (2);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<=  this->limit_type_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->exclude_inherited_);
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
   
   return safe_parameter_list._retn ();
 }
@@ -6066,19 +6188,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -6122,27 +6244,22 @@ TAO_ClientRequestInfo_CORBA_Container_lookup_name::arguments (CORBA::Environment
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_search_name = parameter_list->length ();
-  parameter_list->length (length_search_name + 1);
-  (*parameter_list)[length_search_name].argument <<= search_name_;
-  (*parameter_list)[length_search_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_levels_to_search = parameter_list->length ();
-  parameter_list->length (length_levels_to_search + 1);
-  (*parameter_list)[length_levels_to_search].argument <<= levels_to_search_;
-  (*parameter_list)[length_levels_to_search].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_limit_type = parameter_list->length ();
-  parameter_list->length (length_limit_type + 1);
-  (*parameter_list)[length_limit_type].argument <<=  this->limit_type_;
   
-  (*parameter_list)[length_limit_type].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_exclude_inherited = parameter_list->length ();
-  parameter_list->length (length_exclude_inherited + 1);
-  (*parameter_list)[length_exclude_inherited].argument <<= CORBA::Any::from_boolean (this->exclude_inherited_);
-  (*parameter_list)[length_exclude_inherited].mode = Dynamic::PARAM_IN;
+  parameter_list->length (4);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= search_name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= levels_to_search_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->limit_type_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->exclude_inherited_);
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
   
   return safe_parameter_list._retn ();
 }
@@ -6197,19 +6314,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -6250,22 +6367,19 @@ TAO_ClientRequestInfo_CORBA_Container_describe_contents::arguments (CORBA::Envir
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_limit_type = parameter_list->length ();
-  parameter_list->length (length_limit_type + 1);
-  (*parameter_list)[length_limit_type].argument <<=  this->limit_type_;
   
-  (*parameter_list)[length_limit_type].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_exclude_inherited = parameter_list->length ();
-  parameter_list->length (length_exclude_inherited + 1);
-  (*parameter_list)[length_exclude_inherited].argument <<= CORBA::Any::from_boolean (this->exclude_inherited_);
-  (*parameter_list)[length_exclude_inherited].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_max_returned_objs = parameter_list->length ();
-  parameter_list->length (length_max_returned_objs + 1);
-  (*parameter_list)[length_max_returned_objs].argument <<= max_returned_objs_;
-  (*parameter_list)[length_max_returned_objs].mode = Dynamic::PARAM_IN;
+  parameter_list->length (3);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<=  this->limit_type_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->exclude_inherited_);
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= max_returned_objs_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
   
   return safe_parameter_list._retn ();
 }
@@ -6320,19 +6434,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -6373,21 +6487,19 @@ TAO_ClientRequestInfo_CORBA_Container_create_module::arguments (CORBA::Environme
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
+  
+  parameter_list->length (3);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= version_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
   
   return safe_parameter_list._retn ();
 }
@@ -6444,19 +6556,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -6503,32 +6615,25 @@ TAO_ClientRequestInfo_CORBA_Container_create_constant::arguments (CORBA::Environ
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_type = parameter_list->length ();
-  parameter_list->length (length_type + 1);
-  (*parameter_list)[length_type].argument <<=  this->type_;
   
-  (*parameter_list)[length_type].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_value = parameter_list->length ();
-  parameter_list->length (length_value + 1);
-  (*parameter_list)[length_value].argument <<= value_;
-  (*parameter_list)[length_value].mode = Dynamic::PARAM_IN;
+  parameter_list->length (5);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= version_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->type_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= value_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
   
   return safe_parameter_list._retn ();
 }
@@ -6584,19 +6689,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -6640,27 +6745,22 @@ TAO_ClientRequestInfo_CORBA_Container_create_struct::arguments (CORBA::Environme
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_members = parameter_list->length ();
-  parameter_list->length (length_members + 1);
-  (*parameter_list)[length_members].argument <<=  this->members_;
   
-  (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
+  parameter_list->length (4);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= version_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->members_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
   
   return safe_parameter_list._retn ();
 }
@@ -6717,19 +6817,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -6776,33 +6876,25 @@ TAO_ClientRequestInfo_CORBA_Container_create_union::arguments (CORBA::Environmen
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_discriminator_type = parameter_list->length ();
-  parameter_list->length (length_discriminator_type + 1);
-  (*parameter_list)[length_discriminator_type].argument <<=  this->discriminator_type_;
-  
-  (*parameter_list)[length_discriminator_type].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_members = parameter_list->length ();
-  parameter_list->length (length_members + 1);
-  (*parameter_list)[length_members].argument <<=  this->members_;
   
-  (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
+  parameter_list->length (5);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= version_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->discriminator_type_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->members_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
   
   return safe_parameter_list._retn ();
 }
@@ -6858,19 +6950,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -6914,27 +7006,22 @@ TAO_ClientRequestInfo_CORBA_Container_create_enum::arguments (CORBA::Environment
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_members = parameter_list->length ();
-  parameter_list->length (length_members + 1);
-  (*parameter_list)[length_members].argument <<=  this->members_;
   
-  (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
+  parameter_list->length (4);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= version_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->members_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
   
   return safe_parameter_list._retn ();
 }
@@ -6990,19 +7077,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -7046,27 +7133,22 @@ TAO_ClientRequestInfo_CORBA_Container_create_alias::arguments (CORBA::Environmen
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_original_type = parameter_list->length ();
-  parameter_list->length (length_original_type + 1);
-  (*parameter_list)[length_original_type].argument <<=  this->original_type_;
   
-  (*parameter_list)[length_original_type].mode = Dynamic::PARAM_IN;
+  parameter_list->length (4);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= version_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->original_type_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
   
   return safe_parameter_list._retn ();
 }
@@ -7122,19 +7204,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -7178,27 +7260,22 @@ TAO_ClientRequestInfo_CORBA_Container_create_interface::arguments (CORBA::Enviro
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_base_interfaces = parameter_list->length ();
-  parameter_list->length (length_base_interfaces + 1);
-  (*parameter_list)[length_base_interfaces].argument <<=  this->base_interfaces_;
   
-  (*parameter_list)[length_base_interfaces].mode = Dynamic::PARAM_IN;
+  parameter_list->length (4);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= version_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->base_interfaces_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
   
   return safe_parameter_list._retn ();
 }
@@ -7260,19 +7337,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -7334,60 +7411,40 @@ TAO_ClientRequestInfo_CORBA_Container_create_value::arguments (CORBA::Environmen
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_is_custom = parameter_list->length ();
-  parameter_list->length (length_is_custom + 1);
-  (*parameter_list)[length_is_custom].argument <<= CORBA::Any::from_boolean (this->is_custom_);
-  (*parameter_list)[length_is_custom].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_is_abstract = parameter_list->length ();
-  parameter_list->length (length_is_abstract + 1);
-  (*parameter_list)[length_is_abstract].argument <<= CORBA::Any::from_boolean (this->is_abstract_);
-  (*parameter_list)[length_is_abstract].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_base_value = parameter_list->length ();
-  parameter_list->length (length_base_value + 1);
-  (*parameter_list)[length_base_value].argument <<=  this->base_value_;
-  
-  (*parameter_list)[length_base_value].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_is_truncatable = parameter_list->length ();
-  parameter_list->length (length_is_truncatable + 1);
-  (*parameter_list)[length_is_truncatable].argument <<= CORBA::Any::from_boolean (this->is_truncatable_);
-  (*parameter_list)[length_is_truncatable].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_abstract_base_values = parameter_list->length ();
-  parameter_list->length (length_abstract_base_values + 1);
-  (*parameter_list)[length_abstract_base_values].argument <<=  this->abstract_base_values_;
-  
-  (*parameter_list)[length_abstract_base_values].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_supported_interfaces = parameter_list->length ();
-  parameter_list->length (length_supported_interfaces + 1);
-  (*parameter_list)[length_supported_interfaces].argument <<=  this->supported_interfaces_;
   
-  (*parameter_list)[length_supported_interfaces].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_initializers = parameter_list->length ();
-  parameter_list->length (length_initializers + 1);
-  (*parameter_list)[length_initializers].argument <<=  this->initializers_;
-  
-  (*parameter_list)[length_initializers].mode = Dynamic::PARAM_IN;
+  parameter_list->length (10);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= version_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_custom_);
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_abstract_);
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->base_value_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_truncatable_);
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->abstract_base_values_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->supported_interfaces_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->initializers_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
   
   return safe_parameter_list._retn ();
 }
@@ -7443,19 +7500,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -7499,27 +7556,22 @@ TAO_ClientRequestInfo_CORBA_Container_create_value_box::arguments (CORBA::Enviro
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_original_type_def = parameter_list->length ();
-  parameter_list->length (length_original_type_def + 1);
-  (*parameter_list)[length_original_type_def].argument <<=  this->original_type_def_;
   
-  (*parameter_list)[length_original_type_def].mode = Dynamic::PARAM_IN;
+  parameter_list->length (4);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= version_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->original_type_def_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
   
   return safe_parameter_list._retn ();
 }
@@ -7575,19 +7627,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -7631,27 +7683,22 @@ TAO_ClientRequestInfo_CORBA_Container_create_exception::arguments (CORBA::Enviro
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_members = parameter_list->length ();
-  parameter_list->length (length_members + 1);
-  (*parameter_list)[length_members].argument <<=  this->members_;
   
-  (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
+  parameter_list->length (4);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= version_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->members_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
   
   return safe_parameter_list._retn ();
 }
@@ -7706,19 +7753,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -7759,21 +7806,19 @@ TAO_ClientRequestInfo_CORBA_Container_create_native::arguments (CORBA::Environme
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
+  
+  parameter_list->length (3);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= version_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
   
   return safe_parameter_list._retn ();
 }
@@ -7829,19 +7874,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -7885,27 +7930,22 @@ TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::arguments (CORB
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_base_interfaces = parameter_list->length ();
-  parameter_list->length (length_base_interfaces + 1);
-  (*parameter_list)[length_base_interfaces].argument <<=  this->base_interfaces_;
   
-  (*parameter_list)[length_base_interfaces].mode = Dynamic::PARAM_IN;
+  parameter_list->length (4);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= version_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->base_interfaces_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
   
   return safe_parameter_list._retn ();
 }
@@ -7961,19 +8001,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -8017,27 +8057,22 @@ TAO_ClientRequestInfo_CORBA_Container_create_local_interface::arguments (CORBA::
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_base_interfaces = parameter_list->length ();
-  parameter_list->length (length_base_interfaces + 1);
-  (*parameter_list)[length_base_interfaces].argument <<=  this->base_interfaces_;
   
-  (*parameter_list)[length_base_interfaces].mode = Dynamic::PARAM_IN;
+  parameter_list->length (4);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= version_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->base_interfaces_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
   
   return safe_parameter_list._retn ();
 }
@@ -8118,17 +8153,21 @@ CORBA_Contained_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::lookup (
       1,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_lookup ri (
@@ -8139,22 +8178,31 @@ CORBA_Contained_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::lookup (
       );
       ACE_CHECK_RETURN (0);
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
           
           _tao_call.prepare_header (
@@ -8179,11 +8227,24 @@ CORBA_Contained_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::lookup (
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
               
             }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
           
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
@@ -8197,71 +8258,52 @@ CORBA_Contained_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::lookup (
               
             }
           
-          TAO_INTERCEPTOR (
-              CORBA_Contained_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          CORBA_Contained_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::contents (
@@ -8292,17 +8334,21 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::contents (
       1,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_contents ri (
@@ -8314,22 +8360,31 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::contents (
       );
       ACE_CHECK_RETURN (0);
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
           
           _tao_call.prepare_header (
@@ -8355,11 +8410,24 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::contents (
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
               
             }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
           
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
@@ -8373,71 +8441,52 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::contents (
               
             }
           
-          TAO_INTERCEPTOR (
-              CORBA_ContainedSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          CORBA_ContainedSeq * _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::lookup_name (
@@ -8470,17 +8519,21 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::lookup_name (
       1,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_lookup_name ri (
@@ -8494,22 +8547,31 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::lookup_name (
       );
       ACE_CHECK_RETURN (0);
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+          
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+#endif /* TAO_HAS_INTERCEPTORS */
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
           
           _tao_call.prepare_header (
@@ -8537,11 +8599,24 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::lookup_name (
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
               
             }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
           
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
@@ -8555,71 +8630,52 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::lookup_name (
               
             }
           
-          TAO_INTERCEPTOR (
-              CORBA_ContainedSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          CORBA_ContainedSeq * _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::describe_contents (
@@ -8651,17 +8707,21 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::descri
       1,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_describe_contents ri (
@@ -8674,22 +8734,31 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::descri
       );
       ACE_CHECK_RETURN (0);
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
           
           _tao_call.prepare_header (
@@ -8716,11 +8785,24 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::descri
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
               
             }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
           
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
@@ -8734,71 +8816,52 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::descri
               
             }
           
-          TAO_INTERCEPTOR (
-              CORBA_Container::DescriptionSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          CORBA_Container::DescriptionSeq * _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_ModuleDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_module (
@@ -8829,17 +8892,21 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_module (
       1,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_module ri (
@@ -8852,22 +8919,31 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_module (
       );
       ACE_CHECK_RETURN (0);
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
           
           _tao_call.prepare_header (
@@ -8894,11 +8970,24 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_module (
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
               
             }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
           
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
@@ -8912,71 +9001,52 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_module (
               
             }
           
-          TAO_INTERCEPTOR (
-              CORBA_ModuleDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          CORBA_ModuleDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_ConstantDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_constant (
@@ -9009,17 +9079,21 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_constant (
       1,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_constant ri (
@@ -9034,22 +9108,31 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_constant (
       );
       ACE_CHECK_RETURN (0);
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
           
           _tao_call.prepare_header (
@@ -9078,11 +9161,24 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_constant (
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
               
             }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
           
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
@@ -9096,71 +9192,52 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_constant (
               
             }
           
-          TAO_INTERCEPTOR (
-              CORBA_ConstantDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          CORBA_ConstantDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_StructDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_struct (
@@ -9192,17 +9269,21 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_struct (
       1,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_struct ri (
@@ -9216,22 +9297,31 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_struct (
       );
       ACE_CHECK_RETURN (0);
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
           
           _tao_call.prepare_header (
@@ -9259,11 +9349,24 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_struct (
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
               
             }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
           
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
@@ -9277,71 +9380,52 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_struct (
               
             }
           
-          TAO_INTERCEPTOR (
-              CORBA_StructDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          CORBA_StructDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_UnionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_union (
@@ -9374,17 +9458,21 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_union (
       1,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_union ri (
@@ -9399,22 +9487,31 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_union (
       );
       ACE_CHECK_RETURN (0);
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
           
           _tao_call.prepare_header (
@@ -9443,11 +9540,24 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_union (
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
               
             }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
           
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
@@ -9461,71 +9571,52 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_union (
               
             }
           
-          TAO_INTERCEPTOR (
-              CORBA_UnionDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          CORBA_UnionDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_EnumDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_enum (
@@ -9557,17 +9648,21 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_enum (
       1,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_enum ri (
@@ -9581,22 +9676,31 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_enum (
       );
       ACE_CHECK_RETURN (0);
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
           
           _tao_call.prepare_header (
@@ -9624,11 +9728,24 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_enum (
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
               
             }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
           
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
@@ -9642,71 +9759,52 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_enum (
               
             }
           
-          TAO_INTERCEPTOR (
-              CORBA_EnumDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          CORBA_EnumDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_AliasDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_alias (
@@ -9738,17 +9836,21 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_alias (
       1,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_alias ri (
@@ -9762,22 +9864,31 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_alias (
       );
       ACE_CHECK_RETURN (0);
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
           
           _tao_call.prepare_header (
@@ -9805,11 +9916,24 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_alias (
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
               
             }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
           
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
@@ -9823,71 +9947,52 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_alias (
               
             }
           
-          TAO_INTERCEPTOR (
-              CORBA_AliasDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          CORBA_AliasDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_InterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_interface (
@@ -9919,17 +10024,21 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_interface
       1,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_interface ri (
@@ -9943,22 +10052,31 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_interface
       );
       ACE_CHECK_RETURN (0);
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
           
           _tao_call.prepare_header (
@@ -9986,11 +10104,24 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_interface
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
               
             }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
           
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
@@ -10004,71 +10135,52 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_interface
               
             }
           
-          TAO_INTERCEPTOR (
-              CORBA_InterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          CORBA_InterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_ValueDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value (
@@ -10106,17 +10218,21 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value (
       1,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_value ri (
@@ -10136,22 +10252,31 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value (
       );
       ACE_CHECK_RETURN (0);
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
           
           _tao_call.prepare_header (
@@ -10185,11 +10310,24 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value (
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
               
             }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
           
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
@@ -10203,71 +10341,52 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value (
               
             }
           
-          TAO_INTERCEPTOR (
-              CORBA_ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          CORBA_ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value_box (
@@ -10299,17 +10418,21 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value_box (
       1,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_value_box ri (
@@ -10323,22 +10446,31 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value_box (
       );
       ACE_CHECK_RETURN (0);
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
           
           _tao_call.prepare_header (
@@ -10366,11 +10498,24 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value_box (
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
               
             }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
           
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
@@ -10384,71 +10529,52 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value_box (
               
             }
           
-          TAO_INTERCEPTOR (
-              CORBA_ValueBoxDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          CORBA_ValueBoxDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_ExceptionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_exception (
@@ -10480,17 +10606,21 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_exception
       1,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_exception ri (
@@ -10504,22 +10634,31 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_exception
       );
       ACE_CHECK_RETURN (0);
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
           
           _tao_call.prepare_header (
@@ -10547,11 +10686,24 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_exception
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
               
             }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
           
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
@@ -10565,71 +10717,52 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_exception
               
             }
           
-          TAO_INTERCEPTOR (
-              CORBA_ExceptionDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          CORBA_ExceptionDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_NativeDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_native (
@@ -10660,17 +10793,21 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_native (
       1,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_native ri (
@@ -10683,22 +10820,31 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_native (
       );
       ACE_CHECK_RETURN (0);
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
           
           _tao_call.prepare_header (
@@ -10725,11 +10871,24 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_native (
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
               
             }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
           
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
@@ -10743,71 +10902,52 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_native (
               
             }
           
-          TAO_INTERCEPTOR (
-              CORBA_NativeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          CORBA_NativeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_abstract_interface (
@@ -10839,17 +10979,21 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_ab
       1,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface ri (
@@ -10863,22 +11007,31 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_ab
       );
       ACE_CHECK_RETURN (0);
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
           
           _tao_call.prepare_header (
@@ -10906,11 +11059,24 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_ab
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
               
             }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
           
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
@@ -10924,71 +11090,52 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_ab
               
             }
           
-          TAO_INTERCEPTOR (
-              CORBA_AbstractInterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          CORBA_AbstractInterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_local_interface (
@@ -11020,17 +11167,21 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_local
       1,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_local_interface ri (
@@ -11044,22 +11195,31 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_local
       );
       ACE_CHECK_RETURN (0);
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
           
           _tao_call.prepare_header (
@@ -11087,11 +11247,24 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_local
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
               
             }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
           
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
@@ -11105,71 +11278,52 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_local
               
             }
           
-          TAO_INTERCEPTOR (
-              CORBA_LocalInterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          CORBA_LocalInterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 
@@ -11248,9 +11402,9 @@ CORBA_Container::CORBA_Container_setup_collocation (int collocated)
   this->CORBA_IRObject_setup_collocation (collocated);
 }
 
-void CORBA_Container::_tao_any_destructor (void *x)
+void CORBA_Container::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_Container *tmp = ACE_static_cast (CORBA_Container*,x);
+  CORBA_Container *tmp = ACE_static_cast (CORBA_Container*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -11635,56 +11789,56 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_Description (
 CORBA::TypeCode_ptr CORBA_Container::_tc_Description =
   &_tc_TAO_tc_CORBA_Container_Description;
 
-void CORBA_Container::Description::_tao_any_destructor (void *x)
+void CORBA_Container::Description::_tao_any_destructor (void *_tao_void_pointer)
 {
-  Description *tmp = ACE_static_cast (Description*,x);
+  Description *tmp = ACE_static_cast (Description*, _tao_void_pointer);
   delete tmp;
 }
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_CONTAINER_DESCRIPTIONSEQ_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_CONTAINER_DESCRIPTIONSEQ_CS_
 
-  void
-  CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA_Container::Description* tmp = 0;
-    tmp = _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA_Container::Description *old = ACE_reinterpret_cast (CORBA_Container::Description *,this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-      
-      if (this->release_)
-        _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::freebuf (old);
-      
-    }
-    this->buffer_ = tmp;
-  }
+void
+CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_allocate_buffer (CORBA::ULong length)
+{
+  CORBA_Container::Description* tmp = 0;
+  tmp = _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (length);
   
-  void
-  CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_deallocate_buffer (void)
+  if (this->buffer_ != 0)
   {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
+    CORBA_Container::Description *old = ACE_reinterpret_cast (CORBA_Container::Description *,this->buffer_);
     
-    CORBA_Container::Description *tmp = ACE_reinterpret_cast (CORBA_Container::Description *,this->buffer_);
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
+      tmp[i] = old[i];
+    
+    if (this->release_)
+      _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::freebuf (old);
     
-    _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  } 
-  
-  CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (void) // Dtor.
-  {
-    this->_deallocate_buffer ();
   }
+  this->buffer_ = tmp;
+}
+
+void
+CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    return;
   
+  CORBA_Container::Description *tmp = ACE_reinterpret_cast (CORBA_Container::Description *,this->buffer_);
   
+  _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::freebuf (tmp);
+  this->buffer_ = 0;
+} 
+
+CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (void) // Dtor.
+{
+  this->_deallocate_buffer ();
+}
+
+
 #endif /* end #if !defined */
 
 
@@ -11702,35 +11856,35 @@ CORBA_Container::DescriptionSeq::DescriptionSeq (void)
 CORBA_Container::DescriptionSeq::DescriptionSeq (CORBA::ULong max) // uses max size
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq
+_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_Container::Description>
+TAO_Unbounded_Sequence<CORBA_Container::Description>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 CORBA_Container::DescriptionSeq::DescriptionSeq (CORBA::ULong max, CORBA::ULong length, CORBA_Container::Description *buffer, CORBA::Boolean release)
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq
+_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_Container::Description>
+TAO_Unbounded_Sequence<CORBA_Container::Description>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 CORBA_Container::DescriptionSeq::DescriptionSeq (const DescriptionSeq &seq) // copy ctor
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq
+_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_Container::Description>
+TAO_Unbounded_Sequence<CORBA_Container::Description>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 CORBA_Container::DescriptionSeq::~DescriptionSeq (void) // dtor
 {}
-void CORBA_Container::DescriptionSeq::_tao_any_destructor (void *x)
+void CORBA_Container::DescriptionSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  DescriptionSeq *tmp = ACE_static_cast (DescriptionSeq*,x);
+  DescriptionSeq *tmp = ACE_static_cast (DescriptionSeq*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -12489,7 +12643,7 @@ CORBA_IDLType_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class CORBA_IDLType_out
+// Operations for class CORBA_IDLType_out
 // *************************************************************
 
 CORBA_IDLType_out::CORBA_IDLType_out (CORBA_IDLType_ptr &p)
@@ -12560,19 +12714,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -12681,17 +12835,21 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_Remote_Proxy_Impl::type (
       0,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_IDLType_type_get ri (
@@ -12701,22 +12859,31 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_Remote_Proxy_Impl::type (
       );
       ACE_CHECK_RETURN (0);
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
           
           _tao_call.prepare_header (
@@ -12724,6 +12891,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_Remote_Proxy_Impl::type (
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
@@ -12731,11 +12899,24 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_Remote_Proxy_Impl::type (
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
               
             }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
           
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
@@ -12749,71 +12930,52 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_Remote_Proxy_Impl::type (
               
             }
           
-          TAO_INTERCEPTOR (
-              CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 
@@ -12892,9 +13054,9 @@ CORBA_IDLType::CORBA_IDLType_setup_collocation (int collocated)
   this->CORBA_IRObject_setup_collocation (collocated);
 }
 
-void CORBA_IDLType::_tao_any_destructor (void *x)
+void CORBA_IDLType::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_IDLType *tmp = ACE_static_cast (CORBA_IDLType*,x);
+  CORBA_IDLType *tmp = ACE_static_cast (CORBA_IDLType*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -13200,7 +13362,7 @@ CORBA_TypedefDef_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class CORBA_TypedefDef_out
+// Operations for class CORBA_TypedefDef_out
 // *************************************************************
 
 CORBA_TypedefDef_out::CORBA_TypedefDef_out (CORBA_TypedefDef_ptr &p)
@@ -13352,9 +13514,9 @@ CORBA_TypedefDef::CORBA_TypedefDef_setup_collocation (int collocated)
   this->CORBA_IDLType_setup_collocation (collocated);
 }
 
-void CORBA_TypedefDef::_tao_any_destructor (void *x)
+void CORBA_TypedefDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_TypedefDef *tmp = ACE_static_cast (CORBA_TypedefDef*,x);
+  CORBA_TypedefDef *tmp = ACE_static_cast (CORBA_TypedefDef*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -13502,9 +13664,9 @@ const char* CORBA_TypedefDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/TypedefDef:1.0";
 }
 
-void CORBA_TypeDescription::_tao_any_destructor (void *x)
+void CORBA_TypeDescription::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_TypeDescription *tmp = ACE_static_cast (CORBA_TypeDescription*,x);
+  CORBA_TypeDescription *tmp = ACE_static_cast (CORBA_TypeDescription*, _tao_void_pointer);
   delete tmp;
 }
 
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.h b/TAO/tao/IFR_Client/IFR_BaseC.h
index 6d12d988c68..76ad3c6c826 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.h
+++ b/TAO/tao/IFR_Client/IFR_BaseC.h
@@ -30,7 +30,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Invocation.h"
-#include "tao/PortableInterceptor.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -55,6 +54,7 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+
 #if !defined (_CORBA_IROBJECT___PTR_CH_)
 #define _CORBA_IROBJECT___PTR_CH_
 
@@ -70,29 +70,32 @@ class TAO_IFR_Client_Export CORBA_IRObject_var : public TAO_Base_var
 {
 public:
   CORBA_IRObject_var (void); // default constructor
-  CORBA_IRObject_var (CORBA_IRObject_ptr p) : ptr_ (p) {} 
+  CORBA_IRObject_var (CORBA_IRObject_ptr p) : ptr_ (p) {}
   CORBA_IRObject_var (const CORBA_IRObject_var &); // copy constructor
   ~CORBA_IRObject_var (void); // destructor
-  
+
   CORBA_IRObject_var &operator= (CORBA_IRObject_ptr);
   CORBA_IRObject_var &operator= (const CORBA_IRObject_var &);
   CORBA_IRObject_ptr operator-> (void) const;
-  
+
   operator const CORBA_IRObject_ptr &() const;
   operator CORBA_IRObject_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   CORBA_IRObject_ptr in (void) const;
   CORBA_IRObject_ptr &inout (void);
   CORBA_IRObject_ptr &out (void);
   CORBA_IRObject_ptr _retn (void);
   CORBA_IRObject_ptr ptr (void) const;
-  
+
   // Hooks used by template sequence and object manager classes
   // for non-defined forward declared interfaces.
   static CORBA_IRObject_ptr duplicate (CORBA_IRObject_ptr);
   static void release (CORBA_IRObject_ptr);
   static CORBA_IRObject_ptr nil (void);
-  static CORBA_IRObject_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA_IRObject_ptr narrow (
+      CORBA::Object *,
+      CORBA::Environment &
+    );
   static CORBA::Object * upcast (void *);
 
 private:
@@ -139,7 +142,8 @@ class _TAO_CORBA_IRObject_Remote_Proxy_Impl;
 class _TAO_CORBA_IRObject_Proxy_Broker;
 class _TAO_CORBA_IRObject_Remote_Proxy_Broker;
 
-class TAO_IFR_Client_Export CORBA_IRObject : public virtual CORBA_Object
+class TAO_IFR_Client_Export CORBA_IRObject
+  : public virtual CORBA_Object
 {
 public:
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -149,16 +153,19 @@ public:
 
   // the static operations
   static CORBA_IRObject_ptr _duplicate (CORBA_IRObject_ptr obj);
+
   static CORBA_IRObject_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
   static CORBA_IRObject_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
   static CORBA_IRObject_ptr _nil (void)
     {
       return (CORBA_IRObject_ptr)0;
@@ -167,7 +174,7 @@ public:
   static void _tao_any_destructor (void*);
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -175,7 +182,7 @@ public:
     ));
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -183,57 +190,57 @@ public:
     ));
 
   virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
+      const CORBA::Char *type_id,
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
   virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
+
   virtual const char* _interface_repository_id (void) const;
 
 private:
   _TAO_CORBA_IRObject_Proxy_Broker *the_TAO_CORBA_IRObject_Proxy_Broker_;
-  
+
 protected:
   CORBA_IRObject (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void CORBA_IRObject_setup_collocation (int collocated);
-    
-    CORBA_IRObject (
-      TAO_Stub *objref, 
+
+  // This methods travese the inheritance tree and set the
+  // parents piece of the given class in the right mode
+  virtual void CORBA_IRObject_setup_collocation (int collocated);
+
+  CORBA_IRObject (
+      TAO_Stub *objref,
       CORBA::Boolean _tao_collocated = 0,
       TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_CORBA_IRObject_Remote_Proxy_Impl;
-    friend class _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl;
-    friend class _TAO_CORBA_IRObject_Direct_Proxy_Impl;
-  
+    );
+
+  friend class _TAO_CORBA_IRObject_Remote_Proxy_Impl;
+  friend class _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl;
+  friend class _TAO_CORBA_IRObject_Direct_Proxy_Impl;
+
   virtual ~CORBA_IRObject (void);
+
 private:
   CORBA_IRObject (const CORBA_IRObject &);
   void operator= (const CORBA_IRObject &);
 };
 
-
 // The Proxy Implementations are used by each interface to
 // perform a call. Each different implementation encapsulate
 // an invocation logics.
 
 
 ///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
+//                    Base Proxy Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_CORBA_IRObject_Proxy_Impl : public virtual TAO_Object_Proxy_Impl
+class TAO_IFR_Client_Export _TAO_CORBA_IRObject_Proxy_Impl
+  : public virtual TAO_Object_Proxy_Impl
 {
 public:
   virtual ~_TAO_CORBA_IRObject_Proxy_Impl (void) { }
-  
-    virtual CORBA::DefinitionKind def_kind (
+  virtual CORBA::DefinitionKind def_kind (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -249,29 +256,29 @@ public:
       CORBA::SystemException
     )) = 0;
 
+
 protected:
   _TAO_CORBA_IRObject_Proxy_Impl (void);
-
 };
+
 //
-//                Base  Proxy Impl. Declaration
+//               End Base Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
 ///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
+//                Remote Proxy Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_CORBA_IRObject_Remote_Proxy_Impl : 
-  public virtual _TAO_CORBA_IRObject_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl
+class TAO_IFR_Client_Export _TAO_CORBA_IRObject_Remote_Proxy_Impl
+  : public virtual _TAO_CORBA_IRObject_Proxy_Impl,
+    public virtual TAO_Remote_Object_Proxy_Impl
 {
 public:
   _TAO_CORBA_IRObject_Remote_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_IRObject_Remote_Proxy_Impl (void) { }
-  
-    virtual CORBA::DefinitionKind def_kind (
+  virtual CORBA::DefinitionKind def_kind (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -287,22 +294,21 @@ public:
       CORBA::SystemException
     ));
 
+
 };
 
 //
-//                Base  Proxy Impl. Declaration
+//             End Remote Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
 // The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
+// the right proxy for performing a call. In the new
 // collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
-
+// a call by call basis.
 
 
 ///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
+//                 Base Proxy Broker Declaration
 //
 
 class TAO_IFR_Client_Export _TAO_CORBA_IRObject_Proxy_Broker
@@ -310,94 +316,97 @@ class TAO_IFR_Client_Export _TAO_CORBA_IRObject_Proxy_Broker
 public:
   virtual ~_TAO_CORBA_IRObject_Proxy_Broker (void);
   virtual _TAO_CORBA_IRObject_Proxy_Impl &select_proxy (
-    CORBA_IRObject *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
+      CORBA_IRObject *object,
+      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+    ) = 0;
 
 protected:
   _TAO_CORBA_IRObject_Proxy_Broker (void);
-  
+
 };
 
 //
-//              End Base Proxy Broker Declaration 
+//              End Base Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
 ///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
+//                 Remote Proxy Broker Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_CORBA_IRObject_Remote_Proxy_Broker : public virtual _TAO_CORBA_IRObject_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_IRObject_Remote_Proxy_Broker
+  : public virtual _TAO_CORBA_IRObject_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_IRObject_Remote_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_IRObject_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_CORBA_IRObject_Proxy_Impl &select_proxy (
-    CORBA_IRObject *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
 
-private:
-  _TAO_CORBA_IRObject_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
+  virtual _TAO_CORBA_IRObject_Proxy_Impl &select_proxy (
+      CORBA_IRObject *object,
+      CORBA_Environment &ACE_TRY_ENV
+    );
 
-public:
-  static _TAO_CORBA_IRObject_Remote_Proxy_Broker *the_TAO_CORBA_IRObject_Remote_Proxy_Broker (void);
-};
+  private:
+    _TAO_CORBA_IRObject_Remote_Proxy_Impl remote_proxy_impl_;
 
+  public:
+    // This member function is used to get an handle to the unique instance
+    // of the Remote Proxy Broker that is available for a given
+    // interface.
+    static _TAO_CORBA_IRObject_Remote_Proxy_Broker *the_TAO_CORBA_IRObject_Remote_Proxy_Broker (void);
+  };
 
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+  //
+  //              End Remote Proxy Broker Declaration
+  ///////////////////////////////////////////////////////////////////////
 
 
 #endif /* end #if !defined */
 
-class CORBA_Repository;
+  class CORBA_Repository;
 
 #if !defined (_CORBA_REPOSITORY___VAR_CH_)
 #define _CORBA_REPOSITORY___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_Repository_var : public TAO_Base_var
-{
-public:
-  CORBA_Repository_var (void); // default constructor
-  CORBA_Repository_var (CORBA_Repository_ptr p) : ptr_ (p) {} 
-  CORBA_Repository_var (const CORBA_Repository_var &); // copy constructor
-  ~CORBA_Repository_var (void); // destructor
-  
-  CORBA_Repository_var &operator= (CORBA_Repository_ptr);
-  CORBA_Repository_var &operator= (const CORBA_Repository_var &);
-  CORBA_Repository_ptr operator-> (void) const;
-  
-  operator const CORBA_Repository_ptr &() const;
-  operator CORBA_Repository_ptr &();
-  // in, inout, out, _retn 
-  CORBA_Repository_ptr in (void) const;
-  CORBA_Repository_ptr &inout (void);
-  CORBA_Repository_ptr &out (void);
-  CORBA_Repository_ptr _retn (void);
-  CORBA_Repository_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_Repository_ptr duplicate (CORBA_Repository_ptr);
-  static void release (CORBA_Repository_ptr);
-  static CORBA_Repository_ptr nil (void);
-  static CORBA_Repository_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
+  class TAO_IFR_Client_Export CORBA_Repository_var : public TAO_Base_var
+  {
+  public:
+    CORBA_Repository_var (void); // default constructor
+    CORBA_Repository_var (CORBA_Repository_ptr p) : ptr_ (p) {}
+    CORBA_Repository_var (const CORBA_Repository_var &); // copy constructor
+    ~CORBA_Repository_var (void); // destructor
+
+    CORBA_Repository_var &operator= (CORBA_Repository_ptr);
+    CORBA_Repository_var &operator= (const CORBA_Repository_var &);
+    CORBA_Repository_ptr operator-> (void) const;
+
+    operator const CORBA_Repository_ptr &() const;
+    operator CORBA_Repository_ptr &();
+    // in, inout, out, _retn
+    CORBA_Repository_ptr in (void) const;
+    CORBA_Repository_ptr &inout (void);
+    CORBA_Repository_ptr &out (void);
+    CORBA_Repository_ptr _retn (void);
+    CORBA_Repository_ptr ptr (void) const;
+
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static CORBA_Repository_ptr duplicate (CORBA_Repository_ptr);
+    static void release (CORBA_Repository_ptr);
+    static CORBA_Repository_ptr nil (void);
+    static CORBA_Repository_ptr narrow (
+        CORBA::Object *,
+        CORBA::Environment &
+      );
+    static CORBA::Object * upcast (void *);
 
-private:
-  CORBA_Repository_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_Repository_var (const TAO_Base_var &rhs);
-  CORBA_Repository_var &operator= (const TAO_Base_var &rhs);
-};
+  private:
+    CORBA_Repository_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    CORBA_Repository_var (const TAO_Base_var &rhs);
+    CORBA_Repository_var &operator= (const TAO_Base_var &rhs);
+  };
 
 
 #endif /* end #if !defined */
@@ -406,32 +415,32 @@ private:
 #if !defined (_CORBA_REPOSITORY___OUT_CH_)
 #define _CORBA_REPOSITORY___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_Repository_out
-{
-public:
-  CORBA_Repository_out (CORBA_Repository_ptr &);
-  CORBA_Repository_out (CORBA_Repository_var &);
-  CORBA_Repository_out (const CORBA_Repository_out &);
-  CORBA_Repository_out &operator= (const CORBA_Repository_out &);
-  CORBA_Repository_out &operator= (const CORBA_Repository_var &);
-  CORBA_Repository_out &operator= (CORBA_Repository_ptr);
-  operator CORBA_Repository_ptr &();
-  CORBA_Repository_ptr &ptr (void);
-  CORBA_Repository_ptr operator-> (void);
+  class TAO_IFR_Client_Export CORBA_Repository_out
+  {
+  public:
+    CORBA_Repository_out (CORBA_Repository_ptr &);
+    CORBA_Repository_out (CORBA_Repository_var &);
+    CORBA_Repository_out (const CORBA_Repository_out &);
+    CORBA_Repository_out &operator= (const CORBA_Repository_out &);
+    CORBA_Repository_out &operator= (const CORBA_Repository_var &);
+    CORBA_Repository_out &operator= (CORBA_Repository_ptr);
+    operator CORBA_Repository_ptr &();
+    CORBA_Repository_ptr &ptr (void);
+    CORBA_Repository_ptr operator-> (void);
 
-private:
-  CORBA_Repository_ptr &ptr_;
-};
+  private:
+    CORBA_Repository_ptr &ptr_;
+  };
 
 
 #endif /* end #if !defined */
 
-class CORBA_Container;
+  class CORBA_Container;
 
 #if !defined (_CORBA_CONTAINER___PTR_CH_)
 #define _CORBA_CONTAINER___PTR_CH_
 
-typedef CORBA_Container *CORBA_Container_ptr;
+  typedef CORBA_Container *CORBA_Container_ptr;
 
 #endif /* end #if !defined */
 
@@ -439,41 +448,44 @@ typedef CORBA_Container *CORBA_Container_ptr;
 #if !defined (_CORBA_CONTAINER___VAR_CH_)
 #define _CORBA_CONTAINER___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_Container_var : public TAO_Base_var
-{
-public:
-  CORBA_Container_var (void); // default constructor
-  CORBA_Container_var (CORBA_Container_ptr p) : ptr_ (p) {} 
-  CORBA_Container_var (const CORBA_Container_var &); // copy constructor
-  ~CORBA_Container_var (void); // destructor
-  
-  CORBA_Container_var &operator= (CORBA_Container_ptr);
-  CORBA_Container_var &operator= (const CORBA_Container_var &);
-  CORBA_Container_ptr operator-> (void) const;
-  
-  operator const CORBA_Container_ptr &() const;
-  operator CORBA_Container_ptr &();
-  // in, inout, out, _retn 
-  CORBA_Container_ptr in (void) const;
-  CORBA_Container_ptr &inout (void);
-  CORBA_Container_ptr &out (void);
-  CORBA_Container_ptr _retn (void);
-  CORBA_Container_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_Container_ptr duplicate (CORBA_Container_ptr);
-  static void release (CORBA_Container_ptr);
-  static CORBA_Container_ptr nil (void);
-  static CORBA_Container_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
+  class TAO_IFR_Client_Export CORBA_Container_var : public TAO_Base_var
+  {
+  public:
+    CORBA_Container_var (void); // default constructor
+    CORBA_Container_var (CORBA_Container_ptr p) : ptr_ (p) {}
+    CORBA_Container_var (const CORBA_Container_var &); // copy constructor
+    ~CORBA_Container_var (void); // destructor
+
+    CORBA_Container_var &operator= (CORBA_Container_ptr);
+    CORBA_Container_var &operator= (const CORBA_Container_var &);
+    CORBA_Container_ptr operator-> (void) const;
+
+    operator const CORBA_Container_ptr &() const;
+    operator CORBA_Container_ptr &();
+    // in, inout, out, _retn
+    CORBA_Container_ptr in (void) const;
+    CORBA_Container_ptr &inout (void);
+    CORBA_Container_ptr &out (void);
+    CORBA_Container_ptr _retn (void);
+    CORBA_Container_ptr ptr (void) const;
+
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static CORBA_Container_ptr duplicate (CORBA_Container_ptr);
+    static void release (CORBA_Container_ptr);
+    static CORBA_Container_ptr nil (void);
+    static CORBA_Container_ptr narrow (
+        CORBA::Object *,
+        CORBA::Environment &
+      );
+    static CORBA::Object * upcast (void *);
 
-private:
-  CORBA_Container_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_Container_var (const TAO_Base_var &rhs);
-  CORBA_Container_var &operator= (const TAO_Base_var &rhs);
-};
+  private:
+    CORBA_Container_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    CORBA_Container_var (const TAO_Base_var &rhs);
+    CORBA_Container_var &operator= (const TAO_Base_var &rhs);
+  };
 
 
 #endif /* end #if !defined */
@@ -482,22 +494,22 @@ private:
 #if !defined (_CORBA_CONTAINER___OUT_CH_)
 #define _CORBA_CONTAINER___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_Container_out
-{
-public:
-  CORBA_Container_out (CORBA_Container_ptr &);
-  CORBA_Container_out (CORBA_Container_var &);
-  CORBA_Container_out (const CORBA_Container_out &);
-  CORBA_Container_out &operator= (const CORBA_Container_out &);
-  CORBA_Container_out &operator= (const CORBA_Container_var &);
-  CORBA_Container_out &operator= (CORBA_Container_ptr);
-  operator CORBA_Container_ptr &();
-  CORBA_Container_ptr &ptr (void);
-  CORBA_Container_ptr operator-> (void);
+  class TAO_IFR_Client_Export CORBA_Container_out
+  {
+  public:
+    CORBA_Container_out (CORBA_Container_ptr &);
+    CORBA_Container_out (CORBA_Container_var &);
+    CORBA_Container_out (const CORBA_Container_out &);
+    CORBA_Container_out &operator= (const CORBA_Container_out &);
+    CORBA_Container_out &operator= (const CORBA_Container_var &);
+    CORBA_Container_out &operator= (CORBA_Container_ptr);
+    operator CORBA_Container_ptr &();
+    CORBA_Container_ptr &ptr (void);
+    CORBA_Container_ptr operator-> (void);
 
-private:
-  CORBA_Container_ptr &ptr_;
-};
+  private:
+    CORBA_Container_ptr &ptr_;
+  };
 
 
 #endif /* end #if !defined */
@@ -506,8 +518,8 @@ private:
 #if !defined (_CORBA_CONTAINED___PTR_CH_)
 #define _CORBA_CONTAINED___PTR_CH_
 
-class CORBA_Contained;
-typedef CORBA_Contained *CORBA_Contained_ptr;
+  class CORBA_Contained;
+  typedef CORBA_Contained *CORBA_Contained_ptr;
 
 #endif /* end #if !defined */
 
@@ -515,41 +527,44 @@ typedef CORBA_Contained *CORBA_Contained_ptr;
 #if !defined (_CORBA_CONTAINED___VAR_CH_)
 #define _CORBA_CONTAINED___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_Contained_var : public TAO_Base_var
-{
-public:
-  CORBA_Contained_var (void); // default constructor
-  CORBA_Contained_var (CORBA_Contained_ptr p) : ptr_ (p) {} 
-  CORBA_Contained_var (const CORBA_Contained_var &); // copy constructor
-  ~CORBA_Contained_var (void); // destructor
-  
-  CORBA_Contained_var &operator= (CORBA_Contained_ptr);
-  CORBA_Contained_var &operator= (const CORBA_Contained_var &);
-  CORBA_Contained_ptr operator-> (void) const;
-  
-  operator const CORBA_Contained_ptr &() const;
-  operator CORBA_Contained_ptr &();
-  // in, inout, out, _retn 
-  CORBA_Contained_ptr in (void) const;
-  CORBA_Contained_ptr &inout (void);
-  CORBA_Contained_ptr &out (void);
-  CORBA_Contained_ptr _retn (void);
-  CORBA_Contained_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_Contained_ptr duplicate (CORBA_Contained_ptr);
-  static void release (CORBA_Contained_ptr);
-  static CORBA_Contained_ptr nil (void);
-  static CORBA_Contained_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
+  class TAO_IFR_Client_Export CORBA_Contained_var : public TAO_Base_var
+  {
+  public:
+    CORBA_Contained_var (void); // default constructor
+    CORBA_Contained_var (CORBA_Contained_ptr p) : ptr_ (p) {}
+    CORBA_Contained_var (const CORBA_Contained_var &); // copy constructor
+    ~CORBA_Contained_var (void); // destructor
+
+    CORBA_Contained_var &operator= (CORBA_Contained_ptr);
+    CORBA_Contained_var &operator= (const CORBA_Contained_var &);
+    CORBA_Contained_ptr operator-> (void) const;
+
+    operator const CORBA_Contained_ptr &() const;
+    operator CORBA_Contained_ptr &();
+    // in, inout, out, _retn
+    CORBA_Contained_ptr in (void) const;
+    CORBA_Contained_ptr &inout (void);
+    CORBA_Contained_ptr &out (void);
+    CORBA_Contained_ptr _retn (void);
+    CORBA_Contained_ptr ptr (void) const;
+
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static CORBA_Contained_ptr duplicate (CORBA_Contained_ptr);
+    static void release (CORBA_Contained_ptr);
+    static CORBA_Contained_ptr nil (void);
+    static CORBA_Contained_ptr narrow (
+        CORBA::Object *,
+        CORBA::Environment &
+      );
+    static CORBA::Object * upcast (void *);
 
-private:
-  CORBA_Contained_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_Contained_var (const TAO_Base_var &rhs);
-  CORBA_Contained_var &operator= (const TAO_Base_var &rhs);
-};
+  private:
+    CORBA_Contained_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    CORBA_Contained_var (const TAO_Base_var &rhs);
+    CORBA_Contained_var &operator= (const TAO_Base_var &rhs);
+  };
 
 
 #endif /* end #if !defined */
@@ -558,22 +573,22 @@ private:
 #if !defined (_CORBA_CONTAINED___OUT_CH_)
 #define _CORBA_CONTAINED___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_Contained_out
-{
-public:
-  CORBA_Contained_out (CORBA_Contained_ptr &);
-  CORBA_Contained_out (CORBA_Contained_var &);
-  CORBA_Contained_out (const CORBA_Contained_out &);
-  CORBA_Contained_out &operator= (const CORBA_Contained_out &);
-  CORBA_Contained_out &operator= (const CORBA_Contained_var &);
-  CORBA_Contained_out &operator= (CORBA_Contained_ptr);
-  operator CORBA_Contained_ptr &();
-  CORBA_Contained_ptr &ptr (void);
-  CORBA_Contained_ptr operator-> (void);
+  class TAO_IFR_Client_Export CORBA_Contained_out
+  {
+  public:
+    CORBA_Contained_out (CORBA_Contained_ptr &);
+    CORBA_Contained_out (CORBA_Contained_var &);
+    CORBA_Contained_out (const CORBA_Contained_out &);
+    CORBA_Contained_out &operator= (const CORBA_Contained_out &);
+    CORBA_Contained_out &operator= (const CORBA_Contained_var &);
+    CORBA_Contained_out &operator= (CORBA_Contained_ptr);
+    operator CORBA_Contained_ptr &();
+    CORBA_Contained_ptr &ptr (void);
+    CORBA_Contained_ptr operator-> (void);
 
-private:
-  CORBA_Contained_ptr &ptr_;
-};
+  private:
+    CORBA_Contained_ptr &ptr_;
+  };
 
 
 #endif /* end #if !defined */
@@ -582,612 +597,630 @@ private:
 #if !defined (_CORBA_CONTAINED_CH_)
 #define _CORBA_CONTAINED_CH_
 
-// Forward Classes Declaration
-class _TAO_CORBA_Contained_Proxy_Impl;
-class _TAO_CORBA_Contained_Remote_Proxy_Impl;
-class _TAO_CORBA_Contained_Proxy_Broker;
-class _TAO_CORBA_Contained_Remote_Proxy_Broker;
+  // Forward Classes Declaration
+  class _TAO_CORBA_Contained_Proxy_Impl;
+  class _TAO_CORBA_Contained_Remote_Proxy_Impl;
+  class _TAO_CORBA_Contained_Proxy_Broker;
+  class _TAO_CORBA_Contained_Remote_Proxy_Broker;
 
-class TAO_IFR_Client_Export CORBA_Contained: public virtual CORBA_IRObject
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_Contained_ptr _ptr_type;
-  typedef CORBA_Contained_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
+  class TAO_IFR_Client_Export CORBA_Contained
+    : public virtual CORBA_IRObject
+  {
+  public:
+  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    typedef CORBA_Contained_ptr _ptr_type;
+    typedef CORBA_Contained_var _var_type;
+  #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-  // the static operations
-  static CORBA_Contained_ptr _duplicate (CORBA_Contained_ptr obj);
-  static CORBA_Contained_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_Contained_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_Contained_ptr _nil (void)
-    {
-      return (CORBA_Contained_ptr)0;
-    }
+    // the static operations
+    static CORBA_Contained_ptr _duplicate (CORBA_Contained_ptr obj);
 
-  static void _tao_any_destructor (void*);
+    static CORBA_Contained_ptr _narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
 
-  virtual char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    static CORBA_Contained_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
 
-  virtual void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    static CORBA_Contained_ptr _nil (void)
+      {
+        return (CORBA_Contained_ptr)0;
+      }
 
-  virtual char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    static void _tao_any_destructor (void*);
 
-  virtual void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    virtual char * id (
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    virtual void id (
+        const char * id,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
 
-  virtual char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    virtual char * name (
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    virtual void name (
+        const char * name,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
 
-  virtual void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    virtual char * version (
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    virtual void version (
+        const char * version,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
 
-  virtual CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    virtual CORBA_Container_ptr defined_in (
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
 
-  virtual char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    virtual char * absolute_name (
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
 
-  virtual CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    virtual CORBA_Repository_ptr containing_repository (
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
 
-  struct Description;
-  class Description_var;
-  
-  struct TAO_IFR_Client_Export Description
-  {
+    struct Description;
+    class Description_var;
+
+    struct TAO_IFR_Client_Export Description
+    {
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef Description_var _var_type;
+      typedef Description_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-    static void _tao_any_destructor (void*);
+      static void _tao_any_destructor (void*);
 
-    CORBA::DefinitionKind kind;
-    CORBA::Any value;
-  };
+      CORBA::DefinitionKind kind;
+      CORBA::Any value;
 
-  class TAO_IFR_Client_Export Description_var
-  {
-  public:
-    Description_var (void); // default constructor
-    Description_var (Description *);
-    Description_var (const Description_var &); // copy constructor
-    ~Description_var (void); // destructor
-    
-    Description_var &operator= (Description *);
-    Description_var &operator= (const Description_var &);
-    Description *operator-> (void);
-    const Description *operator-> (void) const;
-    
-    operator const Description &() const;
-    operator Description &();
-    operator Description &() const;
-    operator Description *&(); // variable-size types only
-    
-    // in, inout, out, _retn 
-    const Description &in (void) const;
-    Description &inout (void);
-    Description *&out (void);
-    Description *_retn (void);
-    Description *ptr (void) const;
+    };
 
-  private:
-    Description *ptr_;
-  };
+    class TAO_IFR_Client_Export Description_var
+    {
+    public:
+      Description_var (void);
+      Description_var (Description *);
+      Description_var (const Description_var &);
+      ~Description_var (void);
+
+      Description_var &operator= (Description *);
+      Description_var &operator= (const Description_var &);
+      Description *operator-> (void);
+      const Description *operator-> (void) const;
+
+      operator const Description &() const;
+      operator Description &();
+      operator Description &() const;
+      // Variable-size types only.
+      operator Description *&();
+
+      // in, inout, out, _retn
+      const Description &in (void) const;
+      Description &inout (void);
+      Description *&out (void);
+      Description *_retn (void);
+      Description *ptr (void) const;
+
+    private:
+      Description *ptr_;
+    };
 
-  class TAO_IFR_Client_Export Description_out
-  {
-  public:
-    Description_out (Description *&);
-    Description_out (Description_var &);
-    Description_out (const Description_out &);
-    Description_out &operator= (const Description_out &);
-    Description_out &operator= (Description *);
-    operator Description *&();
-    Description *&ptr (void);
-    Description *operator-> (void);
-    
-  private:
-    Description *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const Description_var &);
-  };
+    class TAO_IFR_Client_Export Description_out
+    {
+    public:
+      Description_out (Description *&);
+      Description_out (Description_var &);
+      Description_out (const Description_out &);
+      Description_out &operator= (const Description_out &);
+      Description_out &operator= (Description *);
+      operator Description *&();
+      Description *&ptr (void);
+      Description *operator-> (void);
+
+    private:
+      Description *&ptr_;
+      // Assignment from T_var not allowed.
+      void operator= (const Description_var &);
+    };
 
-  static CORBA::TypeCode_ptr _tc_Description;
+    static CORBA::TypeCode_ptr _tc_Description;
 
-  virtual CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    virtual CORBA_Contained::Description * describe (
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    virtual void move (
+        CORBA_Container_ptr new_container,
+        const char * new_name,
+        const char * new_version,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    virtual CORBA::Boolean _is_a (
+        const CORBA::Char *type_id,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
 
-  virtual void move (
-      CORBA_Container_ptr new_container,
-      const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    virtual void *_tao_QueryInterface (ptr_arith_t type);
 
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
+    virtual const char* _interface_repository_id (void) const;
+
+  private:
+    _TAO_CORBA_Contained_Proxy_Broker *the_TAO_CORBA_Contained_Proxy_Broker_;
 
-private:
-  _TAO_CORBA_Contained_Proxy_Broker *the_TAO_CORBA_Contained_Proxy_Broker_;
-  
-protected:
-  CORBA_Contained (int collocated = 0);
-  
   protected:
+    CORBA_Contained (int collocated = 0);
+
     // This methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode
     virtual void CORBA_Contained_setup_collocation (int collocated);
-    
+
     CORBA_Contained (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
+        TAO_Stub *objref,
+        CORBA::Boolean _tao_collocated = 0,
+        TAO_Abstract_ServantBase *servant = 0
       );
-    
+
     friend class _TAO_CORBA_Contained_Remote_Proxy_Impl;
     friend class _TAO_CORBA_Contained_ThruPOA_Proxy_Impl;
     friend class _TAO_CORBA_Contained_Direct_Proxy_Impl;
-  
-  virtual ~CORBA_Contained (void);
-private:
-  CORBA_Contained (const CORBA_Contained &);
-  void operator= (const CORBA_Contained &);
-};
-
-
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_Contained_Proxy_Impl : 
-  public virtual _TAO_CORBA_IRObject_Proxy_Impl
-{
-public:
-  virtual ~_TAO_CORBA_Contained_Proxy_Impl (void) { }
-  
-    virtual char * id (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void id (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual char * name (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void name (
-      CORBA_Object *_collocated_tao_target_,
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual char * version (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void version (
-      CORBA_Object *_collocated_tao_target_,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_Container_ptr defined_in (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual char * absolute_name (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_Repository_ptr containing_repository (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_Contained::Description * describe (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
 
-  virtual void move (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA_Container_ptr new_container,
-      const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
+    virtual ~CORBA_Contained (void);
 
-protected:
-  _TAO_CORBA_Contained_Proxy_Impl (void);
+  private:
+    CORBA_Contained (const CORBA_Contained &);
+    void operator= (const CORBA_Contained &);
+  };
 
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
+  // The Proxy Implementations are used by each interface to
+  // perform a call. Each different implementation encapsulate
+  // an invocation logics.
 
 
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
+  ///////////////////////////////////////////////////////////////////////
+  //                    Base Proxy Impl. Declaration
+  //
 
-class TAO_IFR_Client_Export _TAO_CORBA_Contained_Remote_Proxy_Impl : 
-  public virtual _TAO_CORBA_Contained_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_IRObject_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_CORBA_Contained_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_CORBA_Contained_Remote_Proxy_Impl (void) { }
-  
+  class TAO_IFR_Client_Export _TAO_CORBA_Contained_Proxy_Impl
+    : public virtual _TAO_CORBA_IRObject_Proxy_Impl
+  {
+  public:
+    virtual ~_TAO_CORBA_Contained_Proxy_Impl (void) { }
     virtual char * id (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void id (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual char * name (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+        CORBA_Object *_collocated_tao_target_,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual void id (
+        CORBA_Object *_collocated_tao_target_,
+        const char * id,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual char * name (
+        CORBA_Object *_collocated_tao_target_,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual void name (
+        CORBA_Object *_collocated_tao_target_,
+        const char * name,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual char * version (
+        CORBA_Object *_collocated_tao_target_,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual void version (
+        CORBA_Object *_collocated_tao_target_,
+        const char * version,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual CORBA_Container_ptr defined_in (
+        CORBA_Object *_collocated_tao_target_,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual char * absolute_name (
+        CORBA_Object *_collocated_tao_target_,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual CORBA_Repository_ptr containing_repository (
+        CORBA_Object *_collocated_tao_target_,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual CORBA_Contained::Description * describe (
+        CORBA_Object *_collocated_tao_target_,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual void move (
+        CORBA_Object *_collocated_tao_target_,
+        CORBA_Container_ptr new_container,
+        const char * new_name,
+        const char * new_version,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
 
-  virtual void name (
-      CORBA_Object *_collocated_tao_target_,
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
 
-  virtual char * version (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  protected:
+    _TAO_CORBA_Contained_Proxy_Impl (void);
+  };
 
-  virtual void version (
-      CORBA_Object *_collocated_tao_target_,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  //
+  //               End Base Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
 
-  virtual CORBA_Container_ptr defined_in (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
 
-  virtual char * absolute_name (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  ///////////////////////////////////////////////////////////////////////
+  //                Remote Proxy Impl. Declaration
+  //
 
-  virtual CORBA_Repository_ptr containing_repository (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  class TAO_IFR_Client_Export _TAO_CORBA_Contained_Remote_Proxy_Impl
+    : public virtual _TAO_CORBA_Contained_Proxy_Impl,
+      public virtual TAO_Remote_Object_Proxy_Impl,
+      public virtual _TAO_CORBA_IRObject_Remote_Proxy_Impl
+  {
+  public:
+    _TAO_CORBA_Contained_Remote_Proxy_Impl (void);
 
-  virtual CORBA_Contained::Description * describe (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    virtual ~_TAO_CORBA_Contained_Remote_Proxy_Impl (void) { }
+    virtual char * id (
+        CORBA_Object *_collocated_tao_target_,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    virtual void id (
+        CORBA_Object *_collocated_tao_target_,
+        const char * id,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    virtual char * name (
+        CORBA_Object *_collocated_tao_target_,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    virtual void name (
+        CORBA_Object *_collocated_tao_target_,
+        const char * name,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    virtual char * version (
+        CORBA_Object *_collocated_tao_target_,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    virtual void version (
+        CORBA_Object *_collocated_tao_target_,
+        const char * version,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    virtual CORBA_Container_ptr defined_in (
+        CORBA_Object *_collocated_tao_target_,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    virtual char * absolute_name (
+        CORBA_Object *_collocated_tao_target_,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    virtual CORBA_Repository_ptr containing_repository (
+        CORBA_Object *_collocated_tao_target_,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    virtual CORBA_Contained::Description * describe (
+        CORBA_Object *_collocated_tao_target_,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    virtual void move (
+        CORBA_Object *_collocated_tao_target_,
+        CORBA_Container_ptr new_container,
+        const char * new_name,
+        const char * new_version,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
 
-  virtual void move (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA_Container_ptr new_container,
-      const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
 
-};
+  };
 
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
+  //
+  //             End Remote Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
 
+  // The Proxy Brokers are used by each interface to get
+  // the right proxy for performing a call. In the new
+  // collocation scheme, the proxy to be used can vary on
+  // a call by call basis.
 
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
 
+  ///////////////////////////////////////////////////////////////////////
+  //                 Base Proxy Broker Declaration
+  //
 
+    class TAO_IFR_Client_Export _TAO_CORBA_Contained_Proxy_Broker
+  {
+  public:
+    virtual ~_TAO_CORBA_Contained_Proxy_Broker (void);
+    virtual _TAO_CORBA_Contained_Proxy_Impl &select_proxy (
+        CORBA_Contained *object,
+        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+      ) = 0;
 
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
+  protected:
+    _TAO_CORBA_Contained_Proxy_Broker (void);
 
-class TAO_IFR_Client_Export _TAO_CORBA_Contained_Proxy_Broker
-{
-public:
-  virtual ~_TAO_CORBA_Contained_Proxy_Broker (void);
-  virtual _TAO_CORBA_Contained_Proxy_Impl &select_proxy (
-    CORBA_Contained *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
+  };
 
-protected:
-  _TAO_CORBA_Contained_Proxy_Broker (void);
-  
-};
+  //
+  //              End Base Proxy Broker Declaration
+  ///////////////////////////////////////////////////////////////////////
 
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
 
+  ///////////////////////////////////////////////////////////////////////
+  //                 Remote Proxy Broker Declaration
+  //
 
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
+  class TAO_IFR_Client_Export _TAO_CORBA_Contained_Remote_Proxy_Broker
+    : public virtual _TAO_CORBA_Contained_Proxy_Broker
+  {
+  public:
+    _TAO_CORBA_Contained_Remote_Proxy_Broker (void);
 
-class TAO_IFR_Client_Export _TAO_CORBA_Contained_Remote_Proxy_Broker : public virtual _TAO_CORBA_Contained_Proxy_Broker
-{
-public: 
-  _TAO_CORBA_Contained_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_CORBA_Contained_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_CORBA_Contained_Proxy_Impl &select_proxy (
-    CORBA_Contained *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
+    virtual ~_TAO_CORBA_Contained_Remote_Proxy_Broker (void);
 
-private:
-  _TAO_CORBA_Contained_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
+    virtual _TAO_CORBA_Contained_Proxy_Impl &select_proxy (
+        CORBA_Contained *object,
+        CORBA_Environment &ACE_TRY_ENV
+      );
 
-public:
-  static _TAO_CORBA_Contained_Remote_Proxy_Broker *the_TAO_CORBA_Contained_Remote_Proxy_Broker (void);
-};
+    private:
+      _TAO_CORBA_Contained_Remote_Proxy_Impl remote_proxy_impl_;
 
+    public:
+      // This member function is used to get an handle to the unique instance
+      // of the Remote Proxy Broker that is available for a given
+      // interface.
+      static _TAO_CORBA_Contained_Remote_Proxy_Broker *the_TAO_CORBA_Contained_Remote_Proxy_Broker (void);
+    };
 
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+    //
+    //              End Remote Proxy Broker Declaration
+    ///////////////////////////////////////////////////////////////////////
 
 
 #endif /* end #if !defined */
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CH_
 
-  class _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    // = Initialization and termination methods.
-    
-    _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (void);
-    _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (CORBA::ULong maximum,
-      CORBA::ULong length,
-      CORBA_Contained* *value,
-      CORBA::Boolean release = 0);
-    _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq(const _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &rhs);
-    virtual ~_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (void);
-    _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &operator= (const _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &rhs);
-    TAO_Object_Manager<CORBA_Contained,CORBA_Contained_var> operator[] (CORBA::ULong index) const;
-    static CORBA_Contained **allocbuf (CORBA::ULong nelems);
-    static void freebuf (CORBA_Contained **buffer);
-    // The Base_Sequence functions, please see tao/Sequence.h
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    CORBA_Contained* *get_buffer (CORBA::Boolean orphan = 0);
-    const CORBA_Contained* *get_buffer (void) const;
-    virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-    virtual void _downcast (
-        void* target,
-        CORBA_Object *src,
-        CORBA_Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    virtual CORBA_Object* _upcast (void *src) const;
-    
-  };
+    class _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq
+      : public TAO_Unbounded_Base_Sequence
+    {
+    public:
+      // = Initialization and termination methods.
+      _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (void);
+      _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (CORBA::ULong maximum);
+      _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (
+          CORBA::ULong maximum,
+          CORBA::ULong length,
+          CORBA_Contained* *value,
+          CORBA::Boolean release = 0
+        );
+      _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (
+          const _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &rhs
+        );
+      _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &operator= (
+          const _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &rhs
+        );
+      virtual ~_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (void);
+
+      // = Accessors.
+      TAO_Object_Manager<CORBA_Contained,CORBA_Contained_var> operator[] (CORBA::ULong index) const;
+
+      // = Static operations.
+      static CORBA_Contained **allocbuf (CORBA::ULong nelems);
+      static void freebuf (CORBA_Contained **buffer);
+
+      // Implement the TAO_Base_Sequence methods (see Sequence.h)
+      virtual void _allocate_buffer (CORBA::ULong length);
+      virtual void _deallocate_buffer (void);
+      CORBA_Contained* *get_buffer (CORBA::Boolean orphan = 0);
+      const CORBA_Contained* *get_buffer (void) const;
+      virtual void _shrink_buffer (
+          CORBA::ULong nl,
+          CORBA::ULong ol
+        );
+
+      virtual void _downcast (
+          void* target,
+          CORBA_Object *src,
+          CORBA_Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        );
+      virtual CORBA_Object* _upcast (void *src) const;
+    };
 
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_CONTAINEDSEQ_CH_)
 #define _CORBA_CONTAINEDSEQ_CH_
 
-class CORBA_ContainedSeq;
-class CORBA_ContainedSeq_var;
+    class CORBA_ContainedSeq;
+    class CORBA_ContainedSeq_var;
 
-// *************************************************************
-// CORBA_ContainedSeq
-// *************************************************************
+    // *************************************************************
+    // CORBA_ContainedSeq
+    // *************************************************************
 
-class TAO_IFR_Client_Export CORBA_ContainedSeq : public 
+    class TAO_IFR_Client_Export CORBA_ContainedSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq
+    _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA_Contained,CORBA_Contained_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-{
-public:
-  CORBA_ContainedSeq (void); // default ctor
-  CORBA_ContainedSeq (CORBA::ULong max); // uses max size
-  CORBA_ContainedSeq (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    CORBA_Contained_ptr *buffer, 
-    CORBA::Boolean release = 0
-  );
-  CORBA_ContainedSeq (const CORBA_ContainedSeq &); // copy ctor
-  ~CORBA_ContainedSeq (void);
-  static void _tao_any_destructor (void*);
+    TAO_Unbounded_Object_Sequence<CORBA_Contained,CORBA_Contained_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+    {
+    public:
+      CORBA_ContainedSeq (void); // default ctor
+      CORBA_ContainedSeq (CORBA::ULong max); // uses max size
+      CORBA_ContainedSeq (
+          CORBA::ULong max,
+          CORBA::ULong length,
+          CORBA_Contained_ptr *buffer,
+          CORBA::Boolean release = 0
+        );
+      CORBA_ContainedSeq (const CORBA_ContainedSeq &); // copy ctor
+      ~CORBA_ContainedSeq (void);
+      static void _tao_any_destructor (void*);
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_ContainedSeq_var _var_type;
+      typedef CORBA_ContainedSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-};
+
+    };
 
 #endif /* end #if !defined */
 
@@ -1195,40 +1228,40 @@ public:
 #if !defined (_CORBA_CONTAINEDSEQ___VAR_CH_)
 #define _CORBA_CONTAINEDSEQ___VAR_CH_
 
-// *************************************************************
-// class CORBA_ContainedSeq_var
-// *************************************************************
-
-class TAO_IFR_Client_Export CORBA_ContainedSeq_var
-{
-public:
-  CORBA_ContainedSeq_var (void); // default constructor
-  CORBA_ContainedSeq_var (CORBA_ContainedSeq *);
-  CORBA_ContainedSeq_var (const CORBA_ContainedSeq_var &); // copy constructor
-  ~CORBA_ContainedSeq_var (void); // destructor
-  
-  CORBA_ContainedSeq_var &operator= (CORBA_ContainedSeq *);
-  CORBA_ContainedSeq_var &operator= (const CORBA_ContainedSeq_var &);
-  CORBA_ContainedSeq *operator-> (void);
-  const CORBA_ContainedSeq *operator-> (void) const;
-  
-  operator const CORBA_ContainedSeq &() const;
-  operator CORBA_ContainedSeq &();
-  operator CORBA_ContainedSeq &() const;
-  operator CORBA_ContainedSeq *&(); // variable-size base types only
-  
-  TAO_Object_Manager<CORBA_Contained, CORBA_Contained_var> operator[] (CORBA::ULong index);
-  
-  // in, inout, out, _retn 
-  const CORBA_ContainedSeq &in (void) const;
-  CORBA_ContainedSeq &inout (void);
-  CORBA_ContainedSeq *&out (void);
-  CORBA_ContainedSeq *_retn (void);
-  CORBA_ContainedSeq *ptr (void) const;
+    // *************************************************************
+    // class CORBA_ContainedSeq_var
+    // *************************************************************
 
-private:
-  CORBA_ContainedSeq *ptr_;
-};
+    class TAO_IFR_Client_Export CORBA_ContainedSeq_var
+    {
+    public:
+      CORBA_ContainedSeq_var (void);
+      CORBA_ContainedSeq_var (CORBA_ContainedSeq *);
+      CORBA_ContainedSeq_var (const CORBA_ContainedSeq_var &);
+      ~CORBA_ContainedSeq_var (void);
+
+      CORBA_ContainedSeq_var &operator= (CORBA_ContainedSeq *);
+      CORBA_ContainedSeq_var &operator= (const CORBA_ContainedSeq_var &);
+      CORBA_ContainedSeq *operator-> (void);
+      const CORBA_ContainedSeq *operator-> (void) const;
+
+      operator const CORBA_ContainedSeq &() const;
+      operator CORBA_ContainedSeq &();
+      operator CORBA_ContainedSeq &() const;
+      operator CORBA_ContainedSeq *&(); // variable-size base types only
+
+      TAO_Object_Manager<CORBA_Contained, CORBA_Contained_var> operator[] (CORBA::ULong index);
+
+      // in, inout, out, _retn
+      const CORBA_ContainedSeq &in (void) const;
+      CORBA_ContainedSeq &inout (void);
+      CORBA_ContainedSeq *&out (void);
+      CORBA_ContainedSeq *_retn (void);
+      CORBA_ContainedSeq *ptr (void) const;
+
+    private:
+      CORBA_ContainedSeq *ptr_;
+    };
 
 
 #endif /* end #if !defined */
@@ -1237,34 +1270,34 @@ private:
 #if !defined (_CORBA_CONTAINEDSEQ___OUT_CH_)
 #define _CORBA_CONTAINEDSEQ___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_ContainedSeq_out
-{
-public:
-  CORBA_ContainedSeq_out (CORBA_ContainedSeq *&);
-  CORBA_ContainedSeq_out (CORBA_ContainedSeq_var &);
-  CORBA_ContainedSeq_out (const CORBA_ContainedSeq_out &);
-  CORBA_ContainedSeq_out &operator= (const CORBA_ContainedSeq_out &);
-  CORBA_ContainedSeq_out &operator= (CORBA_ContainedSeq *);
-  operator CORBA_ContainedSeq *&();
-  CORBA_ContainedSeq *&ptr (void);
-  CORBA_ContainedSeq *operator-> (void);
-  TAO_Object_Manager<CORBA_Contained, CORBA_Contained_var> operator[] (CORBA::ULong index);
-  
-private:
-  CORBA_ContainedSeq *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_ContainedSeq_var &);
-};
+    class TAO_IFR_Client_Export CORBA_ContainedSeq_out
+    {
+    public:
+      CORBA_ContainedSeq_out (CORBA_ContainedSeq *&);
+      CORBA_ContainedSeq_out (CORBA_ContainedSeq_var &);
+      CORBA_ContainedSeq_out (const CORBA_ContainedSeq_out &);
+      CORBA_ContainedSeq_out &operator= (const CORBA_ContainedSeq_out &);
+      CORBA_ContainedSeq_out &operator= (CORBA_ContainedSeq *);
+      operator CORBA_ContainedSeq *&();
+      CORBA_ContainedSeq *&ptr (void);
+      CORBA_ContainedSeq *operator-> (void);
+      TAO_Object_Manager<CORBA_Contained, CORBA_Contained_var> operator[] (CORBA::ULong index);
+
+    private:
+      CORBA_ContainedSeq *&ptr_;
+      // Assignment from T_var not allowed.
+      void operator= (const CORBA_ContainedSeq_var &);
+    };
 
 
 #endif /* end #if !defined */
 
-class CORBA_ModuleDef;
+    class CORBA_ModuleDef;
 
 #if !defined (_CORBA_MODULEDEF___PTR_CH_)
 #define _CORBA_MODULEDEF___PTR_CH_
 
-typedef CORBA_ModuleDef *CORBA_ModuleDef_ptr;
+    typedef CORBA_ModuleDef *CORBA_ModuleDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -1272,41 +1305,44 @@ typedef CORBA_ModuleDef *CORBA_ModuleDef_ptr;
 #if !defined (_CORBA_MODULEDEF___VAR_CH_)
 #define _CORBA_MODULEDEF___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_ModuleDef_var : public TAO_Base_var
-{
-public:
-  CORBA_ModuleDef_var (void); // default constructor
-  CORBA_ModuleDef_var (CORBA_ModuleDef_ptr p) : ptr_ (p) {} 
-  CORBA_ModuleDef_var (const CORBA_ModuleDef_var &); // copy constructor
-  ~CORBA_ModuleDef_var (void); // destructor
-  
-  CORBA_ModuleDef_var &operator= (CORBA_ModuleDef_ptr);
-  CORBA_ModuleDef_var &operator= (const CORBA_ModuleDef_var &);
-  CORBA_ModuleDef_ptr operator-> (void) const;
-  
-  operator const CORBA_ModuleDef_ptr &() const;
-  operator CORBA_ModuleDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_ModuleDef_ptr in (void) const;
-  CORBA_ModuleDef_ptr &inout (void);
-  CORBA_ModuleDef_ptr &out (void);
-  CORBA_ModuleDef_ptr _retn (void);
-  CORBA_ModuleDef_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_ModuleDef_ptr duplicate (CORBA_ModuleDef_ptr);
-  static void release (CORBA_ModuleDef_ptr);
-  static CORBA_ModuleDef_ptr nil (void);
-  static CORBA_ModuleDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
-
-private:
-  CORBA_ModuleDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_ModuleDef_var (const TAO_Base_var &rhs);
-  CORBA_ModuleDef_var &operator= (const TAO_Base_var &rhs);
-};
+    class TAO_IFR_Client_Export CORBA_ModuleDef_var : public TAO_Base_var
+    {
+    public:
+      CORBA_ModuleDef_var (void); // default constructor
+      CORBA_ModuleDef_var (CORBA_ModuleDef_ptr p) : ptr_ (p) {}
+      CORBA_ModuleDef_var (const CORBA_ModuleDef_var &); // copy constructor
+      ~CORBA_ModuleDef_var (void); // destructor
+
+      CORBA_ModuleDef_var &operator= (CORBA_ModuleDef_ptr);
+      CORBA_ModuleDef_var &operator= (const CORBA_ModuleDef_var &);
+      CORBA_ModuleDef_ptr operator-> (void) const;
+
+      operator const CORBA_ModuleDef_ptr &() const;
+      operator CORBA_ModuleDef_ptr &();
+      // in, inout, out, _retn
+      CORBA_ModuleDef_ptr in (void) const;
+      CORBA_ModuleDef_ptr &inout (void);
+      CORBA_ModuleDef_ptr &out (void);
+      CORBA_ModuleDef_ptr _retn (void);
+      CORBA_ModuleDef_ptr ptr (void) const;
+
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static CORBA_ModuleDef_ptr duplicate (CORBA_ModuleDef_ptr);
+      static void release (CORBA_ModuleDef_ptr);
+      static CORBA_ModuleDef_ptr nil (void);
+      static CORBA_ModuleDef_ptr narrow (
+          CORBA::Object *,
+          CORBA::Environment &
+        );
+      static CORBA::Object * upcast (void *);
+
+    private:
+      CORBA_ModuleDef_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      CORBA_ModuleDef_var (const TAO_Base_var &rhs);
+      CORBA_ModuleDef_var &operator= (const TAO_Base_var &rhs);
+    };
 
 
 #endif /* end #if !defined */
@@ -1315,32 +1351,32 @@ private:
 #if !defined (_CORBA_MODULEDEF___OUT_CH_)
 #define _CORBA_MODULEDEF___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_ModuleDef_out
-{
-public:
-  CORBA_ModuleDef_out (CORBA_ModuleDef_ptr &);
-  CORBA_ModuleDef_out (CORBA_ModuleDef_var &);
-  CORBA_ModuleDef_out (const CORBA_ModuleDef_out &);
-  CORBA_ModuleDef_out &operator= (const CORBA_ModuleDef_out &);
-  CORBA_ModuleDef_out &operator= (const CORBA_ModuleDef_var &);
-  CORBA_ModuleDef_out &operator= (CORBA_ModuleDef_ptr);
-  operator CORBA_ModuleDef_ptr &();
-  CORBA_ModuleDef_ptr &ptr (void);
-  CORBA_ModuleDef_ptr operator-> (void);
-
-private:
-  CORBA_ModuleDef_ptr &ptr_;
-};
+    class TAO_IFR_Client_Export CORBA_ModuleDef_out
+    {
+    public:
+      CORBA_ModuleDef_out (CORBA_ModuleDef_ptr &);
+      CORBA_ModuleDef_out (CORBA_ModuleDef_var &);
+      CORBA_ModuleDef_out (const CORBA_ModuleDef_out &);
+      CORBA_ModuleDef_out &operator= (const CORBA_ModuleDef_out &);
+      CORBA_ModuleDef_out &operator= (const CORBA_ModuleDef_var &);
+      CORBA_ModuleDef_out &operator= (CORBA_ModuleDef_ptr);
+      operator CORBA_ModuleDef_ptr &();
+      CORBA_ModuleDef_ptr &ptr (void);
+      CORBA_ModuleDef_ptr operator-> (void);
+
+    private:
+      CORBA_ModuleDef_ptr &ptr_;
+    };
 
 
 #endif /* end #if !defined */
 
-class CORBA_ConstantDef;
+    class CORBA_ConstantDef;
 
 #if !defined (_CORBA_CONSTANTDEF___PTR_CH_)
 #define _CORBA_CONSTANTDEF___PTR_CH_
 
-typedef CORBA_ConstantDef *CORBA_ConstantDef_ptr;
+    typedef CORBA_ConstantDef *CORBA_ConstantDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -1348,41 +1384,44 @@ typedef CORBA_ConstantDef *CORBA_ConstantDef_ptr;
 #if !defined (_CORBA_CONSTANTDEF___VAR_CH_)
 #define _CORBA_CONSTANTDEF___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_ConstantDef_var : public TAO_Base_var
-{
-public:
-  CORBA_ConstantDef_var (void); // default constructor
-  CORBA_ConstantDef_var (CORBA_ConstantDef_ptr p) : ptr_ (p) {} 
-  CORBA_ConstantDef_var (const CORBA_ConstantDef_var &); // copy constructor
-  ~CORBA_ConstantDef_var (void); // destructor
-  
-  CORBA_ConstantDef_var &operator= (CORBA_ConstantDef_ptr);
-  CORBA_ConstantDef_var &operator= (const CORBA_ConstantDef_var &);
-  CORBA_ConstantDef_ptr operator-> (void) const;
-  
-  operator const CORBA_ConstantDef_ptr &() const;
-  operator CORBA_ConstantDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_ConstantDef_ptr in (void) const;
-  CORBA_ConstantDef_ptr &inout (void);
-  CORBA_ConstantDef_ptr &out (void);
-  CORBA_ConstantDef_ptr _retn (void);
-  CORBA_ConstantDef_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_ConstantDef_ptr duplicate (CORBA_ConstantDef_ptr);
-  static void release (CORBA_ConstantDef_ptr);
-  static CORBA_ConstantDef_ptr nil (void);
-  static CORBA_ConstantDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
-
-private:
-  CORBA_ConstantDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_ConstantDef_var (const TAO_Base_var &rhs);
-  CORBA_ConstantDef_var &operator= (const TAO_Base_var &rhs);
-};
+    class TAO_IFR_Client_Export CORBA_ConstantDef_var : public TAO_Base_var
+    {
+    public:
+      CORBA_ConstantDef_var (void); // default constructor
+      CORBA_ConstantDef_var (CORBA_ConstantDef_ptr p) : ptr_ (p) {}
+      CORBA_ConstantDef_var (const CORBA_ConstantDef_var &); // copy constructor
+      ~CORBA_ConstantDef_var (void); // destructor
+
+      CORBA_ConstantDef_var &operator= (CORBA_ConstantDef_ptr);
+      CORBA_ConstantDef_var &operator= (const CORBA_ConstantDef_var &);
+      CORBA_ConstantDef_ptr operator-> (void) const;
+
+      operator const CORBA_ConstantDef_ptr &() const;
+      operator CORBA_ConstantDef_ptr &();
+      // in, inout, out, _retn
+      CORBA_ConstantDef_ptr in (void) const;
+      CORBA_ConstantDef_ptr &inout (void);
+      CORBA_ConstantDef_ptr &out (void);
+      CORBA_ConstantDef_ptr _retn (void);
+      CORBA_ConstantDef_ptr ptr (void) const;
+
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static CORBA_ConstantDef_ptr duplicate (CORBA_ConstantDef_ptr);
+      static void release (CORBA_ConstantDef_ptr);
+      static CORBA_ConstantDef_ptr nil (void);
+      static CORBA_ConstantDef_ptr narrow (
+          CORBA::Object *,
+          CORBA::Environment &
+        );
+      static CORBA::Object * upcast (void *);
+
+    private:
+      CORBA_ConstantDef_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      CORBA_ConstantDef_var (const TAO_Base_var &rhs);
+      CORBA_ConstantDef_var &operator= (const TAO_Base_var &rhs);
+    };
 
 
 #endif /* end #if !defined */
@@ -1391,32 +1430,32 @@ private:
 #if !defined (_CORBA_CONSTANTDEF___OUT_CH_)
 #define _CORBA_CONSTANTDEF___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_ConstantDef_out
-{
-public:
-  CORBA_ConstantDef_out (CORBA_ConstantDef_ptr &);
-  CORBA_ConstantDef_out (CORBA_ConstantDef_var &);
-  CORBA_ConstantDef_out (const CORBA_ConstantDef_out &);
-  CORBA_ConstantDef_out &operator= (const CORBA_ConstantDef_out &);
-  CORBA_ConstantDef_out &operator= (const CORBA_ConstantDef_var &);
-  CORBA_ConstantDef_out &operator= (CORBA_ConstantDef_ptr);
-  operator CORBA_ConstantDef_ptr &();
-  CORBA_ConstantDef_ptr &ptr (void);
-  CORBA_ConstantDef_ptr operator-> (void);
-
-private:
-  CORBA_ConstantDef_ptr &ptr_;
-};
+    class TAO_IFR_Client_Export CORBA_ConstantDef_out
+    {
+    public:
+      CORBA_ConstantDef_out (CORBA_ConstantDef_ptr &);
+      CORBA_ConstantDef_out (CORBA_ConstantDef_var &);
+      CORBA_ConstantDef_out (const CORBA_ConstantDef_out &);
+      CORBA_ConstantDef_out &operator= (const CORBA_ConstantDef_out &);
+      CORBA_ConstantDef_out &operator= (const CORBA_ConstantDef_var &);
+      CORBA_ConstantDef_out &operator= (CORBA_ConstantDef_ptr);
+      operator CORBA_ConstantDef_ptr &();
+      CORBA_ConstantDef_ptr &ptr (void);
+      CORBA_ConstantDef_ptr operator-> (void);
+
+    private:
+      CORBA_ConstantDef_ptr &ptr_;
+    };
 
 
 #endif /* end #if !defined */
 
-class CORBA_IDLType;
+    class CORBA_IDLType;
 
 #if !defined (_CORBA_IDLTYPE___PTR_CH_)
 #define _CORBA_IDLTYPE___PTR_CH_
 
-typedef CORBA_IDLType *CORBA_IDLType_ptr;
+    typedef CORBA_IDLType *CORBA_IDLType_ptr;
 
 #endif /* end #if !defined */
 
@@ -1424,41 +1463,44 @@ typedef CORBA_IDLType *CORBA_IDLType_ptr;
 #if !defined (_CORBA_IDLTYPE___VAR_CH_)
 #define _CORBA_IDLTYPE___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_IDLType_var : public TAO_Base_var
-{
-public:
-  CORBA_IDLType_var (void); // default constructor
-  CORBA_IDLType_var (CORBA_IDLType_ptr p) : ptr_ (p) {} 
-  CORBA_IDLType_var (const CORBA_IDLType_var &); // copy constructor
-  ~CORBA_IDLType_var (void); // destructor
-  
-  CORBA_IDLType_var &operator= (CORBA_IDLType_ptr);
-  CORBA_IDLType_var &operator= (const CORBA_IDLType_var &);
-  CORBA_IDLType_ptr operator-> (void) const;
-  
-  operator const CORBA_IDLType_ptr &() const;
-  operator CORBA_IDLType_ptr &();
-  // in, inout, out, _retn 
-  CORBA_IDLType_ptr in (void) const;
-  CORBA_IDLType_ptr &inout (void);
-  CORBA_IDLType_ptr &out (void);
-  CORBA_IDLType_ptr _retn (void);
-  CORBA_IDLType_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_IDLType_ptr duplicate (CORBA_IDLType_ptr);
-  static void release (CORBA_IDLType_ptr);
-  static CORBA_IDLType_ptr nil (void);
-  static CORBA_IDLType_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
-
-private:
-  CORBA_IDLType_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_IDLType_var (const TAO_Base_var &rhs);
-  CORBA_IDLType_var &operator= (const TAO_Base_var &rhs);
-};
+    class TAO_IFR_Client_Export CORBA_IDLType_var : public TAO_Base_var
+    {
+    public:
+      CORBA_IDLType_var (void); // default constructor
+      CORBA_IDLType_var (CORBA_IDLType_ptr p) : ptr_ (p) {}
+      CORBA_IDLType_var (const CORBA_IDLType_var &); // copy constructor
+      ~CORBA_IDLType_var (void); // destructor
+
+      CORBA_IDLType_var &operator= (CORBA_IDLType_ptr);
+      CORBA_IDLType_var &operator= (const CORBA_IDLType_var &);
+      CORBA_IDLType_ptr operator-> (void) const;
+
+      operator const CORBA_IDLType_ptr &() const;
+      operator CORBA_IDLType_ptr &();
+      // in, inout, out, _retn
+      CORBA_IDLType_ptr in (void) const;
+      CORBA_IDLType_ptr &inout (void);
+      CORBA_IDLType_ptr &out (void);
+      CORBA_IDLType_ptr _retn (void);
+      CORBA_IDLType_ptr ptr (void) const;
+
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static CORBA_IDLType_ptr duplicate (CORBA_IDLType_ptr);
+      static void release (CORBA_IDLType_ptr);
+      static CORBA_IDLType_ptr nil (void);
+      static CORBA_IDLType_ptr narrow (
+          CORBA::Object *,
+          CORBA::Environment &
+        );
+      static CORBA::Object * upcast (void *);
+
+    private:
+      CORBA_IDLType_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      CORBA_IDLType_var (const TAO_Base_var &rhs);
+      CORBA_IDLType_var &operator= (const TAO_Base_var &rhs);
+    };
 
 
 #endif /* end #if !defined */
@@ -1467,32 +1509,32 @@ private:
 #if !defined (_CORBA_IDLTYPE___OUT_CH_)
 #define _CORBA_IDLTYPE___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_IDLType_out
-{
-public:
-  CORBA_IDLType_out (CORBA_IDLType_ptr &);
-  CORBA_IDLType_out (CORBA_IDLType_var &);
-  CORBA_IDLType_out (const CORBA_IDLType_out &);
-  CORBA_IDLType_out &operator= (const CORBA_IDLType_out &);
-  CORBA_IDLType_out &operator= (const CORBA_IDLType_var &);
-  CORBA_IDLType_out &operator= (CORBA_IDLType_ptr);
-  operator CORBA_IDLType_ptr &();
-  CORBA_IDLType_ptr &ptr (void);
-  CORBA_IDLType_ptr operator-> (void);
-
-private:
-  CORBA_IDLType_ptr &ptr_;
-};
+    class TAO_IFR_Client_Export CORBA_IDLType_out
+    {
+    public:
+      CORBA_IDLType_out (CORBA_IDLType_ptr &);
+      CORBA_IDLType_out (CORBA_IDLType_var &);
+      CORBA_IDLType_out (const CORBA_IDLType_out &);
+      CORBA_IDLType_out &operator= (const CORBA_IDLType_out &);
+      CORBA_IDLType_out &operator= (const CORBA_IDLType_var &);
+      CORBA_IDLType_out &operator= (CORBA_IDLType_ptr);
+      operator CORBA_IDLType_ptr &();
+      CORBA_IDLType_ptr &ptr (void);
+      CORBA_IDLType_ptr operator-> (void);
+
+    private:
+      CORBA_IDLType_ptr &ptr_;
+    };
 
 
 #endif /* end #if !defined */
 
-class CORBA_StructDef;
+    class CORBA_StructDef;
 
 #if !defined (_CORBA_STRUCTDEF___PTR_CH_)
 #define _CORBA_STRUCTDEF___PTR_CH_
 
-typedef CORBA_StructDef *CORBA_StructDef_ptr;
+    typedef CORBA_StructDef *CORBA_StructDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -1500,41 +1542,44 @@ typedef CORBA_StructDef *CORBA_StructDef_ptr;
 #if !defined (_CORBA_STRUCTDEF___VAR_CH_)
 #define _CORBA_STRUCTDEF___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_StructDef_var : public TAO_Base_var
-{
-public:
-  CORBA_StructDef_var (void); // default constructor
-  CORBA_StructDef_var (CORBA_StructDef_ptr p) : ptr_ (p) {} 
-  CORBA_StructDef_var (const CORBA_StructDef_var &); // copy constructor
-  ~CORBA_StructDef_var (void); // destructor
-  
-  CORBA_StructDef_var &operator= (CORBA_StructDef_ptr);
-  CORBA_StructDef_var &operator= (const CORBA_StructDef_var &);
-  CORBA_StructDef_ptr operator-> (void) const;
-  
-  operator const CORBA_StructDef_ptr &() const;
-  operator CORBA_StructDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_StructDef_ptr in (void) const;
-  CORBA_StructDef_ptr &inout (void);
-  CORBA_StructDef_ptr &out (void);
-  CORBA_StructDef_ptr _retn (void);
-  CORBA_StructDef_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_StructDef_ptr duplicate (CORBA_StructDef_ptr);
-  static void release (CORBA_StructDef_ptr);
-  static CORBA_StructDef_ptr nil (void);
-  static CORBA_StructDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
-
-private:
-  CORBA_StructDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_StructDef_var (const TAO_Base_var &rhs);
-  CORBA_StructDef_var &operator= (const TAO_Base_var &rhs);
-};
+    class TAO_IFR_Client_Export CORBA_StructDef_var : public TAO_Base_var
+    {
+    public:
+      CORBA_StructDef_var (void); // default constructor
+      CORBA_StructDef_var (CORBA_StructDef_ptr p) : ptr_ (p) {}
+      CORBA_StructDef_var (const CORBA_StructDef_var &); // copy constructor
+      ~CORBA_StructDef_var (void); // destructor
+
+      CORBA_StructDef_var &operator= (CORBA_StructDef_ptr);
+      CORBA_StructDef_var &operator= (const CORBA_StructDef_var &);
+      CORBA_StructDef_ptr operator-> (void) const;
+
+      operator const CORBA_StructDef_ptr &() const;
+      operator CORBA_StructDef_ptr &();
+      // in, inout, out, _retn
+      CORBA_StructDef_ptr in (void) const;
+      CORBA_StructDef_ptr &inout (void);
+      CORBA_StructDef_ptr &out (void);
+      CORBA_StructDef_ptr _retn (void);
+      CORBA_StructDef_ptr ptr (void) const;
+
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static CORBA_StructDef_ptr duplicate (CORBA_StructDef_ptr);
+      static void release (CORBA_StructDef_ptr);
+      static CORBA_StructDef_ptr nil (void);
+      static CORBA_StructDef_ptr narrow (
+          CORBA::Object *,
+          CORBA::Environment &
+        );
+      static CORBA::Object * upcast (void *);
+
+    private:
+      CORBA_StructDef_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      CORBA_StructDef_var (const TAO_Base_var &rhs);
+      CORBA_StructDef_var &operator= (const TAO_Base_var &rhs);
+    };
 
 
 #endif /* end #if !defined */
@@ -1543,32 +1588,32 @@ private:
 #if !defined (_CORBA_STRUCTDEF___OUT_CH_)
 #define _CORBA_STRUCTDEF___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_StructDef_out
-{
-public:
-  CORBA_StructDef_out (CORBA_StructDef_ptr &);
-  CORBA_StructDef_out (CORBA_StructDef_var &);
-  CORBA_StructDef_out (const CORBA_StructDef_out &);
-  CORBA_StructDef_out &operator= (const CORBA_StructDef_out &);
-  CORBA_StructDef_out &operator= (const CORBA_StructDef_var &);
-  CORBA_StructDef_out &operator= (CORBA_StructDef_ptr);
-  operator CORBA_StructDef_ptr &();
-  CORBA_StructDef_ptr &ptr (void);
-  CORBA_StructDef_ptr operator-> (void);
-
-private:
-  CORBA_StructDef_ptr &ptr_;
-};
+    class TAO_IFR_Client_Export CORBA_StructDef_out
+    {
+    public:
+      CORBA_StructDef_out (CORBA_StructDef_ptr &);
+      CORBA_StructDef_out (CORBA_StructDef_var &);
+      CORBA_StructDef_out (const CORBA_StructDef_out &);
+      CORBA_StructDef_out &operator= (const CORBA_StructDef_out &);
+      CORBA_StructDef_out &operator= (const CORBA_StructDef_var &);
+      CORBA_StructDef_out &operator= (CORBA_StructDef_ptr);
+      operator CORBA_StructDef_ptr &();
+      CORBA_StructDef_ptr &ptr (void);
+      CORBA_StructDef_ptr operator-> (void);
+
+    private:
+      CORBA_StructDef_ptr &ptr_;
+    };
 
 
 #endif /* end #if !defined */
 
-class CORBA_UnionDef;
+    class CORBA_UnionDef;
 
 #if !defined (_CORBA_UNIONDEF___PTR_CH_)
 #define _CORBA_UNIONDEF___PTR_CH_
 
-typedef CORBA_UnionDef *CORBA_UnionDef_ptr;
+    typedef CORBA_UnionDef *CORBA_UnionDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -1576,41 +1621,44 @@ typedef CORBA_UnionDef *CORBA_UnionDef_ptr;
 #if !defined (_CORBA_UNIONDEF___VAR_CH_)
 #define _CORBA_UNIONDEF___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_UnionDef_var : public TAO_Base_var
-{
-public:
-  CORBA_UnionDef_var (void); // default constructor
-  CORBA_UnionDef_var (CORBA_UnionDef_ptr p) : ptr_ (p) {} 
-  CORBA_UnionDef_var (const CORBA_UnionDef_var &); // copy constructor
-  ~CORBA_UnionDef_var (void); // destructor
-  
-  CORBA_UnionDef_var &operator= (CORBA_UnionDef_ptr);
-  CORBA_UnionDef_var &operator= (const CORBA_UnionDef_var &);
-  CORBA_UnionDef_ptr operator-> (void) const;
-  
-  operator const CORBA_UnionDef_ptr &() const;
-  operator CORBA_UnionDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_UnionDef_ptr in (void) const;
-  CORBA_UnionDef_ptr &inout (void);
-  CORBA_UnionDef_ptr &out (void);
-  CORBA_UnionDef_ptr _retn (void);
-  CORBA_UnionDef_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_UnionDef_ptr duplicate (CORBA_UnionDef_ptr);
-  static void release (CORBA_UnionDef_ptr);
-  static CORBA_UnionDef_ptr nil (void);
-  static CORBA_UnionDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
-
-private:
-  CORBA_UnionDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_UnionDef_var (const TAO_Base_var &rhs);
-  CORBA_UnionDef_var &operator= (const TAO_Base_var &rhs);
-};
+    class TAO_IFR_Client_Export CORBA_UnionDef_var : public TAO_Base_var
+    {
+    public:
+      CORBA_UnionDef_var (void); // default constructor
+      CORBA_UnionDef_var (CORBA_UnionDef_ptr p) : ptr_ (p) {}
+      CORBA_UnionDef_var (const CORBA_UnionDef_var &); // copy constructor
+      ~CORBA_UnionDef_var (void); // destructor
+
+      CORBA_UnionDef_var &operator= (CORBA_UnionDef_ptr);
+      CORBA_UnionDef_var &operator= (const CORBA_UnionDef_var &);
+      CORBA_UnionDef_ptr operator-> (void) const;
+
+      operator const CORBA_UnionDef_ptr &() const;
+      operator CORBA_UnionDef_ptr &();
+      // in, inout, out, _retn
+      CORBA_UnionDef_ptr in (void) const;
+      CORBA_UnionDef_ptr &inout (void);
+      CORBA_UnionDef_ptr &out (void);
+      CORBA_UnionDef_ptr _retn (void);
+      CORBA_UnionDef_ptr ptr (void) const;
+
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static CORBA_UnionDef_ptr duplicate (CORBA_UnionDef_ptr);
+      static void release (CORBA_UnionDef_ptr);
+      static CORBA_UnionDef_ptr nil (void);
+      static CORBA_UnionDef_ptr narrow (
+          CORBA::Object *,
+          CORBA::Environment &
+        );
+      static CORBA::Object * upcast (void *);
+
+    private:
+      CORBA_UnionDef_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      CORBA_UnionDef_var (const TAO_Base_var &rhs);
+      CORBA_UnionDef_var &operator= (const TAO_Base_var &rhs);
+    };
 
 
 #endif /* end #if !defined */
@@ -1619,32 +1667,32 @@ private:
 #if !defined (_CORBA_UNIONDEF___OUT_CH_)
 #define _CORBA_UNIONDEF___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_UnionDef_out
-{
-public:
-  CORBA_UnionDef_out (CORBA_UnionDef_ptr &);
-  CORBA_UnionDef_out (CORBA_UnionDef_var &);
-  CORBA_UnionDef_out (const CORBA_UnionDef_out &);
-  CORBA_UnionDef_out &operator= (const CORBA_UnionDef_out &);
-  CORBA_UnionDef_out &operator= (const CORBA_UnionDef_var &);
-  CORBA_UnionDef_out &operator= (CORBA_UnionDef_ptr);
-  operator CORBA_UnionDef_ptr &();
-  CORBA_UnionDef_ptr &ptr (void);
-  CORBA_UnionDef_ptr operator-> (void);
-
-private:
-  CORBA_UnionDef_ptr &ptr_;
-};
+    class TAO_IFR_Client_Export CORBA_UnionDef_out
+    {
+    public:
+      CORBA_UnionDef_out (CORBA_UnionDef_ptr &);
+      CORBA_UnionDef_out (CORBA_UnionDef_var &);
+      CORBA_UnionDef_out (const CORBA_UnionDef_out &);
+      CORBA_UnionDef_out &operator= (const CORBA_UnionDef_out &);
+      CORBA_UnionDef_out &operator= (const CORBA_UnionDef_var &);
+      CORBA_UnionDef_out &operator= (CORBA_UnionDef_ptr);
+      operator CORBA_UnionDef_ptr &();
+      CORBA_UnionDef_ptr &ptr (void);
+      CORBA_UnionDef_ptr operator-> (void);
+
+    private:
+      CORBA_UnionDef_ptr &ptr_;
+    };
 
 
 #endif /* end #if !defined */
 
-class CORBA_EnumDef;
+    class CORBA_EnumDef;
 
 #if !defined (_CORBA_ENUMDEF___PTR_CH_)
 #define _CORBA_ENUMDEF___PTR_CH_
 
-typedef CORBA_EnumDef *CORBA_EnumDef_ptr;
+    typedef CORBA_EnumDef *CORBA_EnumDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -1652,41 +1700,44 @@ typedef CORBA_EnumDef *CORBA_EnumDef_ptr;
 #if !defined (_CORBA_ENUMDEF___VAR_CH_)
 #define _CORBA_ENUMDEF___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_EnumDef_var : public TAO_Base_var
-{
-public:
-  CORBA_EnumDef_var (void); // default constructor
-  CORBA_EnumDef_var (CORBA_EnumDef_ptr p) : ptr_ (p) {} 
-  CORBA_EnumDef_var (const CORBA_EnumDef_var &); // copy constructor
-  ~CORBA_EnumDef_var (void); // destructor
-  
-  CORBA_EnumDef_var &operator= (CORBA_EnumDef_ptr);
-  CORBA_EnumDef_var &operator= (const CORBA_EnumDef_var &);
-  CORBA_EnumDef_ptr operator-> (void) const;
-  
-  operator const CORBA_EnumDef_ptr &() const;
-  operator CORBA_EnumDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_EnumDef_ptr in (void) const;
-  CORBA_EnumDef_ptr &inout (void);
-  CORBA_EnumDef_ptr &out (void);
-  CORBA_EnumDef_ptr _retn (void);
-  CORBA_EnumDef_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_EnumDef_ptr duplicate (CORBA_EnumDef_ptr);
-  static void release (CORBA_EnumDef_ptr);
-  static CORBA_EnumDef_ptr nil (void);
-  static CORBA_EnumDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
-
-private:
-  CORBA_EnumDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_EnumDef_var (const TAO_Base_var &rhs);
-  CORBA_EnumDef_var &operator= (const TAO_Base_var &rhs);
-};
+    class TAO_IFR_Client_Export CORBA_EnumDef_var : public TAO_Base_var
+    {
+    public:
+      CORBA_EnumDef_var (void); // default constructor
+      CORBA_EnumDef_var (CORBA_EnumDef_ptr p) : ptr_ (p) {}
+      CORBA_EnumDef_var (const CORBA_EnumDef_var &); // copy constructor
+      ~CORBA_EnumDef_var (void); // destructor
+
+      CORBA_EnumDef_var &operator= (CORBA_EnumDef_ptr);
+      CORBA_EnumDef_var &operator= (const CORBA_EnumDef_var &);
+      CORBA_EnumDef_ptr operator-> (void) const;
+
+      operator const CORBA_EnumDef_ptr &() const;
+      operator CORBA_EnumDef_ptr &();
+      // in, inout, out, _retn
+      CORBA_EnumDef_ptr in (void) const;
+      CORBA_EnumDef_ptr &inout (void);
+      CORBA_EnumDef_ptr &out (void);
+      CORBA_EnumDef_ptr _retn (void);
+      CORBA_EnumDef_ptr ptr (void) const;
+
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static CORBA_EnumDef_ptr duplicate (CORBA_EnumDef_ptr);
+      static void release (CORBA_EnumDef_ptr);
+      static CORBA_EnumDef_ptr nil (void);
+      static CORBA_EnumDef_ptr narrow (
+          CORBA::Object *,
+          CORBA::Environment &
+        );
+      static CORBA::Object * upcast (void *);
+
+    private:
+      CORBA_EnumDef_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      CORBA_EnumDef_var (const TAO_Base_var &rhs);
+      CORBA_EnumDef_var &operator= (const TAO_Base_var &rhs);
+    };
 
 
 #endif /* end #if !defined */
@@ -1695,32 +1746,32 @@ private:
 #if !defined (_CORBA_ENUMDEF___OUT_CH_)
 #define _CORBA_ENUMDEF___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_EnumDef_out
-{
-public:
-  CORBA_EnumDef_out (CORBA_EnumDef_ptr &);
-  CORBA_EnumDef_out (CORBA_EnumDef_var &);
-  CORBA_EnumDef_out (const CORBA_EnumDef_out &);
-  CORBA_EnumDef_out &operator= (const CORBA_EnumDef_out &);
-  CORBA_EnumDef_out &operator= (const CORBA_EnumDef_var &);
-  CORBA_EnumDef_out &operator= (CORBA_EnumDef_ptr);
-  operator CORBA_EnumDef_ptr &();
-  CORBA_EnumDef_ptr &ptr (void);
-  CORBA_EnumDef_ptr operator-> (void);
-
-private:
-  CORBA_EnumDef_ptr &ptr_;
-};
+    class TAO_IFR_Client_Export CORBA_EnumDef_out
+    {
+    public:
+      CORBA_EnumDef_out (CORBA_EnumDef_ptr &);
+      CORBA_EnumDef_out (CORBA_EnumDef_var &);
+      CORBA_EnumDef_out (const CORBA_EnumDef_out &);
+      CORBA_EnumDef_out &operator= (const CORBA_EnumDef_out &);
+      CORBA_EnumDef_out &operator= (const CORBA_EnumDef_var &);
+      CORBA_EnumDef_out &operator= (CORBA_EnumDef_ptr);
+      operator CORBA_EnumDef_ptr &();
+      CORBA_EnumDef_ptr &ptr (void);
+      CORBA_EnumDef_ptr operator-> (void);
+
+    private:
+      CORBA_EnumDef_ptr &ptr_;
+    };
 
 
 #endif /* end #if !defined */
 
-class CORBA_AliasDef;
+    class CORBA_AliasDef;
 
 #if !defined (_CORBA_ALIASDEF___PTR_CH_)
 #define _CORBA_ALIASDEF___PTR_CH_
 
-typedef CORBA_AliasDef *CORBA_AliasDef_ptr;
+    typedef CORBA_AliasDef *CORBA_AliasDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -1728,41 +1779,44 @@ typedef CORBA_AliasDef *CORBA_AliasDef_ptr;
 #if !defined (_CORBA_ALIASDEF___VAR_CH_)
 #define _CORBA_ALIASDEF___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_AliasDef_var : public TAO_Base_var
-{
-public:
-  CORBA_AliasDef_var (void); // default constructor
-  CORBA_AliasDef_var (CORBA_AliasDef_ptr p) : ptr_ (p) {} 
-  CORBA_AliasDef_var (const CORBA_AliasDef_var &); // copy constructor
-  ~CORBA_AliasDef_var (void); // destructor
-  
-  CORBA_AliasDef_var &operator= (CORBA_AliasDef_ptr);
-  CORBA_AliasDef_var &operator= (const CORBA_AliasDef_var &);
-  CORBA_AliasDef_ptr operator-> (void) const;
-  
-  operator const CORBA_AliasDef_ptr &() const;
-  operator CORBA_AliasDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_AliasDef_ptr in (void) const;
-  CORBA_AliasDef_ptr &inout (void);
-  CORBA_AliasDef_ptr &out (void);
-  CORBA_AliasDef_ptr _retn (void);
-  CORBA_AliasDef_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_AliasDef_ptr duplicate (CORBA_AliasDef_ptr);
-  static void release (CORBA_AliasDef_ptr);
-  static CORBA_AliasDef_ptr nil (void);
-  static CORBA_AliasDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
-
-private:
-  CORBA_AliasDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_AliasDef_var (const TAO_Base_var &rhs);
-  CORBA_AliasDef_var &operator= (const TAO_Base_var &rhs);
-};
+    class TAO_IFR_Client_Export CORBA_AliasDef_var : public TAO_Base_var
+    {
+    public:
+      CORBA_AliasDef_var (void); // default constructor
+      CORBA_AliasDef_var (CORBA_AliasDef_ptr p) : ptr_ (p) {}
+      CORBA_AliasDef_var (const CORBA_AliasDef_var &); // copy constructor
+      ~CORBA_AliasDef_var (void); // destructor
+
+      CORBA_AliasDef_var &operator= (CORBA_AliasDef_ptr);
+      CORBA_AliasDef_var &operator= (const CORBA_AliasDef_var &);
+      CORBA_AliasDef_ptr operator-> (void) const;
+
+      operator const CORBA_AliasDef_ptr &() const;
+      operator CORBA_AliasDef_ptr &();
+      // in, inout, out, _retn
+      CORBA_AliasDef_ptr in (void) const;
+      CORBA_AliasDef_ptr &inout (void);
+      CORBA_AliasDef_ptr &out (void);
+      CORBA_AliasDef_ptr _retn (void);
+      CORBA_AliasDef_ptr ptr (void) const;
+
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static CORBA_AliasDef_ptr duplicate (CORBA_AliasDef_ptr);
+      static void release (CORBA_AliasDef_ptr);
+      static CORBA_AliasDef_ptr nil (void);
+      static CORBA_AliasDef_ptr narrow (
+          CORBA::Object *,
+          CORBA::Environment &
+        );
+      static CORBA::Object * upcast (void *);
+
+    private:
+      CORBA_AliasDef_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      CORBA_AliasDef_var (const TAO_Base_var &rhs);
+      CORBA_AliasDef_var &operator= (const TAO_Base_var &rhs);
+    };
 
 
 #endif /* end #if !defined */
@@ -1771,32 +1825,32 @@ private:
 #if !defined (_CORBA_ALIASDEF___OUT_CH_)
 #define _CORBA_ALIASDEF___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_AliasDef_out
-{
-public:
-  CORBA_AliasDef_out (CORBA_AliasDef_ptr &);
-  CORBA_AliasDef_out (CORBA_AliasDef_var &);
-  CORBA_AliasDef_out (const CORBA_AliasDef_out &);
-  CORBA_AliasDef_out &operator= (const CORBA_AliasDef_out &);
-  CORBA_AliasDef_out &operator= (const CORBA_AliasDef_var &);
-  CORBA_AliasDef_out &operator= (CORBA_AliasDef_ptr);
-  operator CORBA_AliasDef_ptr &();
-  CORBA_AliasDef_ptr &ptr (void);
-  CORBA_AliasDef_ptr operator-> (void);
-
-private:
-  CORBA_AliasDef_ptr &ptr_;
-};
+    class TAO_IFR_Client_Export CORBA_AliasDef_out
+    {
+    public:
+      CORBA_AliasDef_out (CORBA_AliasDef_ptr &);
+      CORBA_AliasDef_out (CORBA_AliasDef_var &);
+      CORBA_AliasDef_out (const CORBA_AliasDef_out &);
+      CORBA_AliasDef_out &operator= (const CORBA_AliasDef_out &);
+      CORBA_AliasDef_out &operator= (const CORBA_AliasDef_var &);
+      CORBA_AliasDef_out &operator= (CORBA_AliasDef_ptr);
+      operator CORBA_AliasDef_ptr &();
+      CORBA_AliasDef_ptr &ptr (void);
+      CORBA_AliasDef_ptr operator-> (void);
+
+    private:
+      CORBA_AliasDef_ptr &ptr_;
+    };
 
 
 #endif /* end #if !defined */
 
-class CORBA_InterfaceDef;
+    class CORBA_InterfaceDef;
 
 #if !defined (_CORBA_INTERFACEDEF___PTR_CH_)
 #define _CORBA_INTERFACEDEF___PTR_CH_
 
-typedef CORBA_InterfaceDef *CORBA_InterfaceDef_ptr;
+    typedef CORBA_InterfaceDef *CORBA_InterfaceDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -1804,41 +1858,44 @@ typedef CORBA_InterfaceDef *CORBA_InterfaceDef_ptr;
 #if !defined (_CORBA_INTERFACEDEF___VAR_CH_)
 #define _CORBA_INTERFACEDEF___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_InterfaceDef_var : public TAO_Base_var
-{
-public:
-  CORBA_InterfaceDef_var (void); // default constructor
-  CORBA_InterfaceDef_var (CORBA_InterfaceDef_ptr p) : ptr_ (p) {} 
-  CORBA_InterfaceDef_var (const CORBA_InterfaceDef_var &); // copy constructor
-  ~CORBA_InterfaceDef_var (void); // destructor
-  
-  CORBA_InterfaceDef_var &operator= (CORBA_InterfaceDef_ptr);
-  CORBA_InterfaceDef_var &operator= (const CORBA_InterfaceDef_var &);
-  CORBA_InterfaceDef_ptr operator-> (void) const;
-  
-  operator const CORBA_InterfaceDef_ptr &() const;
-  operator CORBA_InterfaceDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_InterfaceDef_ptr in (void) const;
-  CORBA_InterfaceDef_ptr &inout (void);
-  CORBA_InterfaceDef_ptr &out (void);
-  CORBA_InterfaceDef_ptr _retn (void);
-  CORBA_InterfaceDef_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_InterfaceDef_ptr duplicate (CORBA_InterfaceDef_ptr);
-  static void release (CORBA_InterfaceDef_ptr);
-  static CORBA_InterfaceDef_ptr nil (void);
-  static CORBA_InterfaceDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
-
-private:
-  CORBA_InterfaceDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_InterfaceDef_var (const TAO_Base_var &rhs);
-  CORBA_InterfaceDef_var &operator= (const TAO_Base_var &rhs);
-};
+    class TAO_IFR_Client_Export CORBA_InterfaceDef_var : public TAO_Base_var
+    {
+    public:
+      CORBA_InterfaceDef_var (void); // default constructor
+      CORBA_InterfaceDef_var (CORBA_InterfaceDef_ptr p) : ptr_ (p) {}
+      CORBA_InterfaceDef_var (const CORBA_InterfaceDef_var &); // copy constructor
+      ~CORBA_InterfaceDef_var (void); // destructor
+
+      CORBA_InterfaceDef_var &operator= (CORBA_InterfaceDef_ptr);
+      CORBA_InterfaceDef_var &operator= (const CORBA_InterfaceDef_var &);
+      CORBA_InterfaceDef_ptr operator-> (void) const;
+
+      operator const CORBA_InterfaceDef_ptr &() const;
+      operator CORBA_InterfaceDef_ptr &();
+      // in, inout, out, _retn
+      CORBA_InterfaceDef_ptr in (void) const;
+      CORBA_InterfaceDef_ptr &inout (void);
+      CORBA_InterfaceDef_ptr &out (void);
+      CORBA_InterfaceDef_ptr _retn (void);
+      CORBA_InterfaceDef_ptr ptr (void) const;
+
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static CORBA_InterfaceDef_ptr duplicate (CORBA_InterfaceDef_ptr);
+      static void release (CORBA_InterfaceDef_ptr);
+      static CORBA_InterfaceDef_ptr nil (void);
+      static CORBA_InterfaceDef_ptr narrow (
+          CORBA::Object *,
+          CORBA::Environment &
+        );
+      static CORBA::Object * upcast (void *);
+
+    private:
+      CORBA_InterfaceDef_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      CORBA_InterfaceDef_var (const TAO_Base_var &rhs);
+      CORBA_InterfaceDef_var &operator= (const TAO_Base_var &rhs);
+    };
 
 
 #endif /* end #if !defined */
@@ -1847,105 +1904,120 @@ private:
 #if !defined (_CORBA_INTERFACEDEF___OUT_CH_)
 #define _CORBA_INTERFACEDEF___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_InterfaceDef_out
-{
-public:
-  CORBA_InterfaceDef_out (CORBA_InterfaceDef_ptr &);
-  CORBA_InterfaceDef_out (CORBA_InterfaceDef_var &);
-  CORBA_InterfaceDef_out (const CORBA_InterfaceDef_out &);
-  CORBA_InterfaceDef_out &operator= (const CORBA_InterfaceDef_out &);
-  CORBA_InterfaceDef_out &operator= (const CORBA_InterfaceDef_var &);
-  CORBA_InterfaceDef_out &operator= (CORBA_InterfaceDef_ptr);
-  operator CORBA_InterfaceDef_ptr &();
-  CORBA_InterfaceDef_ptr &ptr (void);
-  CORBA_InterfaceDef_ptr operator-> (void);
-
-private:
-  CORBA_InterfaceDef_ptr &ptr_;
-};
+    class TAO_IFR_Client_Export CORBA_InterfaceDef_out
+    {
+    public:
+      CORBA_InterfaceDef_out (CORBA_InterfaceDef_ptr &);
+      CORBA_InterfaceDef_out (CORBA_InterfaceDef_var &);
+      CORBA_InterfaceDef_out (const CORBA_InterfaceDef_out &);
+      CORBA_InterfaceDef_out &operator= (const CORBA_InterfaceDef_out &);
+      CORBA_InterfaceDef_out &operator= (const CORBA_InterfaceDef_var &);
+      CORBA_InterfaceDef_out &operator= (CORBA_InterfaceDef_ptr);
+      operator CORBA_InterfaceDef_ptr &();
+      CORBA_InterfaceDef_ptr &ptr (void);
+      CORBA_InterfaceDef_ptr operator-> (void);
+
+    private:
+      CORBA_InterfaceDef_ptr &ptr_;
+    };
 
 
 #endif /* end #if !defined */
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_INTERFACEDEFSEQ_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_INTERFACEDEFSEQ_CH_
 
-  class _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    // = Initialization and termination methods.
-    
-    _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (CORBA::ULong maximum,
-      CORBA::ULong length,
-      CORBA_InterfaceDef* *value,
-      CORBA::Boolean release = 0);
-    _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &rhs);
-    virtual ~_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &rhs);
-    TAO_Object_Manager<CORBA_InterfaceDef,CORBA_InterfaceDef_var> operator[] (CORBA::ULong index) const;
-    static CORBA_InterfaceDef **allocbuf (CORBA::ULong nelems);
-    static void freebuf (CORBA_InterfaceDef **buffer);
-    // The Base_Sequence functions, please see tao/Sequence.h
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    CORBA_InterfaceDef* *get_buffer (CORBA::Boolean orphan = 0);
-    const CORBA_InterfaceDef* *get_buffer (void) const;
-    virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-    virtual void _downcast (
-        void* target,
-        CORBA_Object *src,
-        CORBA_Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    virtual CORBA_Object* _upcast (void *src) const;
-    
-  };
+    class _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq
+      : public TAO_Unbounded_Base_Sequence
+    {
+    public:
+      // = Initialization and termination methods.
+      _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (void);
+      _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (CORBA::ULong maximum);
+      _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (
+          CORBA::ULong maximum,
+          CORBA::ULong length,
+          CORBA_InterfaceDef* *value,
+          CORBA::Boolean release = 0
+        );
+      _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (
+          const _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &rhs
+        );
+      _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &operator= (
+          const _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &rhs
+        );
+      virtual ~_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (void);
+
+      // = Accessors.
+      TAO_Object_Manager<CORBA_InterfaceDef,CORBA_InterfaceDef_var> operator[] (CORBA::ULong index) const;
+
+      // = Static operations.
+      static CORBA_InterfaceDef **allocbuf (CORBA::ULong nelems);
+      static void freebuf (CORBA_InterfaceDef **buffer);
+
+      // Implement the TAO_Base_Sequence methods (see Sequence.h)
+      virtual void _allocate_buffer (CORBA::ULong length);
+      virtual void _deallocate_buffer (void);
+      CORBA_InterfaceDef* *get_buffer (CORBA::Boolean orphan = 0);
+      const CORBA_InterfaceDef* *get_buffer (void) const;
+      virtual void _shrink_buffer (
+          CORBA::ULong nl,
+          CORBA::ULong ol
+        );
+
+      virtual void _downcast (
+          void* target,
+          CORBA_Object *src,
+          CORBA_Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        );
+      virtual CORBA_Object* _upcast (void *src) const;
+    };
 
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_INTERFACEDEFSEQ_CH_)
 #define _CORBA_INTERFACEDEFSEQ_CH_
 
-class CORBA_InterfaceDefSeq;
-class CORBA_InterfaceDefSeq_var;
+    class CORBA_InterfaceDefSeq;
+    class CORBA_InterfaceDefSeq_var;
 
-// *************************************************************
-// CORBA_InterfaceDefSeq
-// *************************************************************
+    // *************************************************************
+    // CORBA_InterfaceDefSeq
+    // *************************************************************
 
-class TAO_IFR_Client_Export CORBA_InterfaceDefSeq : public 
+    class TAO_IFR_Client_Export CORBA_InterfaceDefSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq
+    _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA_InterfaceDef,CORBA_InterfaceDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-{
-public:
-  CORBA_InterfaceDefSeq (void); // default ctor
-  CORBA_InterfaceDefSeq (CORBA::ULong max); // uses max size
-  CORBA_InterfaceDefSeq (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    CORBA_InterfaceDef_ptr *buffer, 
-    CORBA::Boolean release = 0
-  );
-  CORBA_InterfaceDefSeq (const CORBA_InterfaceDefSeq &); // copy ctor
-  ~CORBA_InterfaceDefSeq (void);
-  static void _tao_any_destructor (void*);
+    TAO_Unbounded_Object_Sequence<CORBA_InterfaceDef,CORBA_InterfaceDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+    {
+    public:
+      CORBA_InterfaceDefSeq (void); // default ctor
+      CORBA_InterfaceDefSeq (CORBA::ULong max); // uses max size
+      CORBA_InterfaceDefSeq (
+          CORBA::ULong max,
+          CORBA::ULong length,
+          CORBA_InterfaceDef_ptr *buffer,
+          CORBA::Boolean release = 0
+        );
+      CORBA_InterfaceDefSeq (const CORBA_InterfaceDefSeq &); // copy ctor
+      ~CORBA_InterfaceDefSeq (void);
+      static void _tao_any_destructor (void*);
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_InterfaceDefSeq_var _var_type;
+      typedef CORBA_InterfaceDefSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-};
+
+    };
 
 #endif /* end #if !defined */
 
@@ -1953,40 +2025,40 @@ public:
 #if !defined (_CORBA_INTERFACEDEFSEQ___VAR_CH_)
 #define _CORBA_INTERFACEDEFSEQ___VAR_CH_
 
-// *************************************************************
-// class CORBA_InterfaceDefSeq_var
-// *************************************************************
-
-class TAO_IFR_Client_Export CORBA_InterfaceDefSeq_var
-{
-public:
-  CORBA_InterfaceDefSeq_var (void); // default constructor
-  CORBA_InterfaceDefSeq_var (CORBA_InterfaceDefSeq *);
-  CORBA_InterfaceDefSeq_var (const CORBA_InterfaceDefSeq_var &); // copy constructor
-  ~CORBA_InterfaceDefSeq_var (void); // destructor
-  
-  CORBA_InterfaceDefSeq_var &operator= (CORBA_InterfaceDefSeq *);
-  CORBA_InterfaceDefSeq_var &operator= (const CORBA_InterfaceDefSeq_var &);
-  CORBA_InterfaceDefSeq *operator-> (void);
-  const CORBA_InterfaceDefSeq *operator-> (void) const;
-  
-  operator const CORBA_InterfaceDefSeq &() const;
-  operator CORBA_InterfaceDefSeq &();
-  operator CORBA_InterfaceDefSeq &() const;
-  operator CORBA_InterfaceDefSeq *&(); // variable-size base types only
-  
-  TAO_Object_Manager<CORBA_InterfaceDef, CORBA_InterfaceDef_var> operator[] (CORBA::ULong index);
-  
-  // in, inout, out, _retn 
-  const CORBA_InterfaceDefSeq &in (void) const;
-  CORBA_InterfaceDefSeq &inout (void);
-  CORBA_InterfaceDefSeq *&out (void);
-  CORBA_InterfaceDefSeq *_retn (void);
-  CORBA_InterfaceDefSeq *ptr (void) const;
+    // *************************************************************
+    // class CORBA_InterfaceDefSeq_var
+    // *************************************************************
 
-private:
-  CORBA_InterfaceDefSeq *ptr_;
-};
+    class TAO_IFR_Client_Export CORBA_InterfaceDefSeq_var
+    {
+    public:
+      CORBA_InterfaceDefSeq_var (void);
+      CORBA_InterfaceDefSeq_var (CORBA_InterfaceDefSeq *);
+      CORBA_InterfaceDefSeq_var (const CORBA_InterfaceDefSeq_var &);
+      ~CORBA_InterfaceDefSeq_var (void);
+
+      CORBA_InterfaceDefSeq_var &operator= (CORBA_InterfaceDefSeq *);
+      CORBA_InterfaceDefSeq_var &operator= (const CORBA_InterfaceDefSeq_var &);
+      CORBA_InterfaceDefSeq *operator-> (void);
+      const CORBA_InterfaceDefSeq *operator-> (void) const;
+
+      operator const CORBA_InterfaceDefSeq &() const;
+      operator CORBA_InterfaceDefSeq &();
+      operator CORBA_InterfaceDefSeq &() const;
+      operator CORBA_InterfaceDefSeq *&(); // variable-size base types only
+
+      TAO_Object_Manager<CORBA_InterfaceDef, CORBA_InterfaceDef_var> operator[] (CORBA::ULong index);
+
+      // in, inout, out, _retn
+      const CORBA_InterfaceDefSeq &in (void) const;
+      CORBA_InterfaceDefSeq &inout (void);
+      CORBA_InterfaceDefSeq *&out (void);
+      CORBA_InterfaceDefSeq *_retn (void);
+      CORBA_InterfaceDefSeq *ptr (void) const;
+
+    private:
+      CORBA_InterfaceDefSeq *ptr_;
+    };
 
 
 #endif /* end #if !defined */
@@ -1995,34 +2067,34 @@ private:
 #if !defined (_CORBA_INTERFACEDEFSEQ___OUT_CH_)
 #define _CORBA_INTERFACEDEFSEQ___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_InterfaceDefSeq_out
-{
-public:
-  CORBA_InterfaceDefSeq_out (CORBA_InterfaceDefSeq *&);
-  CORBA_InterfaceDefSeq_out (CORBA_InterfaceDefSeq_var &);
-  CORBA_InterfaceDefSeq_out (const CORBA_InterfaceDefSeq_out &);
-  CORBA_InterfaceDefSeq_out &operator= (const CORBA_InterfaceDefSeq_out &);
-  CORBA_InterfaceDefSeq_out &operator= (CORBA_InterfaceDefSeq *);
-  operator CORBA_InterfaceDefSeq *&();
-  CORBA_InterfaceDefSeq *&ptr (void);
-  CORBA_InterfaceDefSeq *operator-> (void);
-  TAO_Object_Manager<CORBA_InterfaceDef, CORBA_InterfaceDef_var> operator[] (CORBA::ULong index);
-  
-private:
-  CORBA_InterfaceDefSeq *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_InterfaceDefSeq_var &);
-};
+    class TAO_IFR_Client_Export CORBA_InterfaceDefSeq_out
+    {
+    public:
+      CORBA_InterfaceDefSeq_out (CORBA_InterfaceDefSeq *&);
+      CORBA_InterfaceDefSeq_out (CORBA_InterfaceDefSeq_var &);
+      CORBA_InterfaceDefSeq_out (const CORBA_InterfaceDefSeq_out &);
+      CORBA_InterfaceDefSeq_out &operator= (const CORBA_InterfaceDefSeq_out &);
+      CORBA_InterfaceDefSeq_out &operator= (CORBA_InterfaceDefSeq *);
+      operator CORBA_InterfaceDefSeq *&();
+      CORBA_InterfaceDefSeq *&ptr (void);
+      CORBA_InterfaceDefSeq *operator-> (void);
+      TAO_Object_Manager<CORBA_InterfaceDef, CORBA_InterfaceDef_var> operator[] (CORBA::ULong index);
+
+    private:
+      CORBA_InterfaceDefSeq *&ptr_;
+      // Assignment from T_var not allowed.
+      void operator= (const CORBA_InterfaceDefSeq_var &);
+    };
 
 
 #endif /* end #if !defined */
 
-class CORBA_ExceptionDef;
+    class CORBA_ExceptionDef;
 
 #if !defined (_CORBA_EXCEPTIONDEF___PTR_CH_)
 #define _CORBA_EXCEPTIONDEF___PTR_CH_
 
-typedef CORBA_ExceptionDef *CORBA_ExceptionDef_ptr;
+    typedef CORBA_ExceptionDef *CORBA_ExceptionDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -2030,41 +2102,44 @@ typedef CORBA_ExceptionDef *CORBA_ExceptionDef_ptr;
 #if !defined (_CORBA_EXCEPTIONDEF___VAR_CH_)
 #define _CORBA_EXCEPTIONDEF___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_ExceptionDef_var : public TAO_Base_var
-{
-public:
-  CORBA_ExceptionDef_var (void); // default constructor
-  CORBA_ExceptionDef_var (CORBA_ExceptionDef_ptr p) : ptr_ (p) {} 
-  CORBA_ExceptionDef_var (const CORBA_ExceptionDef_var &); // copy constructor
-  ~CORBA_ExceptionDef_var (void); // destructor
-  
-  CORBA_ExceptionDef_var &operator= (CORBA_ExceptionDef_ptr);
-  CORBA_ExceptionDef_var &operator= (const CORBA_ExceptionDef_var &);
-  CORBA_ExceptionDef_ptr operator-> (void) const;
-  
-  operator const CORBA_ExceptionDef_ptr &() const;
-  operator CORBA_ExceptionDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_ExceptionDef_ptr in (void) const;
-  CORBA_ExceptionDef_ptr &inout (void);
-  CORBA_ExceptionDef_ptr &out (void);
-  CORBA_ExceptionDef_ptr _retn (void);
-  CORBA_ExceptionDef_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_ExceptionDef_ptr duplicate (CORBA_ExceptionDef_ptr);
-  static void release (CORBA_ExceptionDef_ptr);
-  static CORBA_ExceptionDef_ptr nil (void);
-  static CORBA_ExceptionDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
-
-private:
-  CORBA_ExceptionDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_ExceptionDef_var (const TAO_Base_var &rhs);
-  CORBA_ExceptionDef_var &operator= (const TAO_Base_var &rhs);
-};
+    class TAO_IFR_Client_Export CORBA_ExceptionDef_var : public TAO_Base_var
+    {
+    public:
+      CORBA_ExceptionDef_var (void); // default constructor
+      CORBA_ExceptionDef_var (CORBA_ExceptionDef_ptr p) : ptr_ (p) {}
+      CORBA_ExceptionDef_var (const CORBA_ExceptionDef_var &); // copy constructor
+      ~CORBA_ExceptionDef_var (void); // destructor
+
+      CORBA_ExceptionDef_var &operator= (CORBA_ExceptionDef_ptr);
+      CORBA_ExceptionDef_var &operator= (const CORBA_ExceptionDef_var &);
+      CORBA_ExceptionDef_ptr operator-> (void) const;
+
+      operator const CORBA_ExceptionDef_ptr &() const;
+      operator CORBA_ExceptionDef_ptr &();
+      // in, inout, out, _retn
+      CORBA_ExceptionDef_ptr in (void) const;
+      CORBA_ExceptionDef_ptr &inout (void);
+      CORBA_ExceptionDef_ptr &out (void);
+      CORBA_ExceptionDef_ptr _retn (void);
+      CORBA_ExceptionDef_ptr ptr (void) const;
+
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static CORBA_ExceptionDef_ptr duplicate (CORBA_ExceptionDef_ptr);
+      static void release (CORBA_ExceptionDef_ptr);
+      static CORBA_ExceptionDef_ptr nil (void);
+      static CORBA_ExceptionDef_ptr narrow (
+          CORBA::Object *,
+          CORBA::Environment &
+        );
+      static CORBA::Object * upcast (void *);
+
+    private:
+      CORBA_ExceptionDef_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      CORBA_ExceptionDef_var (const TAO_Base_var &rhs);
+      CORBA_ExceptionDef_var &operator= (const TAO_Base_var &rhs);
+    };
 
 
 #endif /* end #if !defined */
@@ -2073,32 +2148,32 @@ private:
 #if !defined (_CORBA_EXCEPTIONDEF___OUT_CH_)
 #define _CORBA_EXCEPTIONDEF___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_ExceptionDef_out
-{
-public:
-  CORBA_ExceptionDef_out (CORBA_ExceptionDef_ptr &);
-  CORBA_ExceptionDef_out (CORBA_ExceptionDef_var &);
-  CORBA_ExceptionDef_out (const CORBA_ExceptionDef_out &);
-  CORBA_ExceptionDef_out &operator= (const CORBA_ExceptionDef_out &);
-  CORBA_ExceptionDef_out &operator= (const CORBA_ExceptionDef_var &);
-  CORBA_ExceptionDef_out &operator= (CORBA_ExceptionDef_ptr);
-  operator CORBA_ExceptionDef_ptr &();
-  CORBA_ExceptionDef_ptr &ptr (void);
-  CORBA_ExceptionDef_ptr operator-> (void);
-
-private:
-  CORBA_ExceptionDef_ptr &ptr_;
-};
+    class TAO_IFR_Client_Export CORBA_ExceptionDef_out
+    {
+    public:
+      CORBA_ExceptionDef_out (CORBA_ExceptionDef_ptr &);
+      CORBA_ExceptionDef_out (CORBA_ExceptionDef_var &);
+      CORBA_ExceptionDef_out (const CORBA_ExceptionDef_out &);
+      CORBA_ExceptionDef_out &operator= (const CORBA_ExceptionDef_out &);
+      CORBA_ExceptionDef_out &operator= (const CORBA_ExceptionDef_var &);
+      CORBA_ExceptionDef_out &operator= (CORBA_ExceptionDef_ptr);
+      operator CORBA_ExceptionDef_ptr &();
+      CORBA_ExceptionDef_ptr &ptr (void);
+      CORBA_ExceptionDef_ptr operator-> (void);
+
+    private:
+      CORBA_ExceptionDef_ptr &ptr_;
+    };
 
 
 #endif /* end #if !defined */
 
-class CORBA_NativeDef;
+    class CORBA_NativeDef;
 
 #if !defined (_CORBA_NATIVEDEF___PTR_CH_)
 #define _CORBA_NATIVEDEF___PTR_CH_
 
-typedef CORBA_NativeDef *CORBA_NativeDef_ptr;
+    typedef CORBA_NativeDef *CORBA_NativeDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -2106,41 +2181,44 @@ typedef CORBA_NativeDef *CORBA_NativeDef_ptr;
 #if !defined (_CORBA_NATIVEDEF___VAR_CH_)
 #define _CORBA_NATIVEDEF___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_NativeDef_var : public TAO_Base_var
-{
-public:
-  CORBA_NativeDef_var (void); // default constructor
-  CORBA_NativeDef_var (CORBA_NativeDef_ptr p) : ptr_ (p) {} 
-  CORBA_NativeDef_var (const CORBA_NativeDef_var &); // copy constructor
-  ~CORBA_NativeDef_var (void); // destructor
-  
-  CORBA_NativeDef_var &operator= (CORBA_NativeDef_ptr);
-  CORBA_NativeDef_var &operator= (const CORBA_NativeDef_var &);
-  CORBA_NativeDef_ptr operator-> (void) const;
-  
-  operator const CORBA_NativeDef_ptr &() const;
-  operator CORBA_NativeDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_NativeDef_ptr in (void) const;
-  CORBA_NativeDef_ptr &inout (void);
-  CORBA_NativeDef_ptr &out (void);
-  CORBA_NativeDef_ptr _retn (void);
-  CORBA_NativeDef_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_NativeDef_ptr duplicate (CORBA_NativeDef_ptr);
-  static void release (CORBA_NativeDef_ptr);
-  static CORBA_NativeDef_ptr nil (void);
-  static CORBA_NativeDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
-
-private:
-  CORBA_NativeDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_NativeDef_var (const TAO_Base_var &rhs);
-  CORBA_NativeDef_var &operator= (const TAO_Base_var &rhs);
-};
+    class TAO_IFR_Client_Export CORBA_NativeDef_var : public TAO_Base_var
+    {
+    public:
+      CORBA_NativeDef_var (void); // default constructor
+      CORBA_NativeDef_var (CORBA_NativeDef_ptr p) : ptr_ (p) {}
+      CORBA_NativeDef_var (const CORBA_NativeDef_var &); // copy constructor
+      ~CORBA_NativeDef_var (void); // destructor
+
+      CORBA_NativeDef_var &operator= (CORBA_NativeDef_ptr);
+      CORBA_NativeDef_var &operator= (const CORBA_NativeDef_var &);
+      CORBA_NativeDef_ptr operator-> (void) const;
+
+      operator const CORBA_NativeDef_ptr &() const;
+      operator CORBA_NativeDef_ptr &();
+      // in, inout, out, _retn
+      CORBA_NativeDef_ptr in (void) const;
+      CORBA_NativeDef_ptr &inout (void);
+      CORBA_NativeDef_ptr &out (void);
+      CORBA_NativeDef_ptr _retn (void);
+      CORBA_NativeDef_ptr ptr (void) const;
+
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static CORBA_NativeDef_ptr duplicate (CORBA_NativeDef_ptr);
+      static void release (CORBA_NativeDef_ptr);
+      static CORBA_NativeDef_ptr nil (void);
+      static CORBA_NativeDef_ptr narrow (
+          CORBA::Object *,
+          CORBA::Environment &
+        );
+      static CORBA::Object * upcast (void *);
+
+    private:
+      CORBA_NativeDef_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      CORBA_NativeDef_var (const TAO_Base_var &rhs);
+      CORBA_NativeDef_var &operator= (const TAO_Base_var &rhs);
+    };
 
 
 #endif /* end #if !defined */
@@ -2149,32 +2227,32 @@ private:
 #if !defined (_CORBA_NATIVEDEF___OUT_CH_)
 #define _CORBA_NATIVEDEF___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_NativeDef_out
-{
-public:
-  CORBA_NativeDef_out (CORBA_NativeDef_ptr &);
-  CORBA_NativeDef_out (CORBA_NativeDef_var &);
-  CORBA_NativeDef_out (const CORBA_NativeDef_out &);
-  CORBA_NativeDef_out &operator= (const CORBA_NativeDef_out &);
-  CORBA_NativeDef_out &operator= (const CORBA_NativeDef_var &);
-  CORBA_NativeDef_out &operator= (CORBA_NativeDef_ptr);
-  operator CORBA_NativeDef_ptr &();
-  CORBA_NativeDef_ptr &ptr (void);
-  CORBA_NativeDef_ptr operator-> (void);
-
-private:
-  CORBA_NativeDef_ptr &ptr_;
-};
+    class TAO_IFR_Client_Export CORBA_NativeDef_out
+    {
+    public:
+      CORBA_NativeDef_out (CORBA_NativeDef_ptr &);
+      CORBA_NativeDef_out (CORBA_NativeDef_var &);
+      CORBA_NativeDef_out (const CORBA_NativeDef_out &);
+      CORBA_NativeDef_out &operator= (const CORBA_NativeDef_out &);
+      CORBA_NativeDef_out &operator= (const CORBA_NativeDef_var &);
+      CORBA_NativeDef_out &operator= (CORBA_NativeDef_ptr);
+      operator CORBA_NativeDef_ptr &();
+      CORBA_NativeDef_ptr &ptr (void);
+      CORBA_NativeDef_ptr operator-> (void);
+
+    private:
+      CORBA_NativeDef_ptr &ptr_;
+    };
 
 
 #endif /* end #if !defined */
 
-class CORBA_ValueDef;
+    class CORBA_ValueDef;
 
 #if !defined (_CORBA_VALUEDEF___PTR_CH_)
 #define _CORBA_VALUEDEF___PTR_CH_
 
-typedef CORBA_ValueDef *CORBA_ValueDef_ptr;
+    typedef CORBA_ValueDef *CORBA_ValueDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -2182,41 +2260,44 @@ typedef CORBA_ValueDef *CORBA_ValueDef_ptr;
 #if !defined (_CORBA_VALUEDEF___VAR_CH_)
 #define _CORBA_VALUEDEF___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_ValueDef_var : public TAO_Base_var
-{
-public:
-  CORBA_ValueDef_var (void); // default constructor
-  CORBA_ValueDef_var (CORBA_ValueDef_ptr p) : ptr_ (p) {} 
-  CORBA_ValueDef_var (const CORBA_ValueDef_var &); // copy constructor
-  ~CORBA_ValueDef_var (void); // destructor
-  
-  CORBA_ValueDef_var &operator= (CORBA_ValueDef_ptr);
-  CORBA_ValueDef_var &operator= (const CORBA_ValueDef_var &);
-  CORBA_ValueDef_ptr operator-> (void) const;
-  
-  operator const CORBA_ValueDef_ptr &() const;
-  operator CORBA_ValueDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_ValueDef_ptr in (void) const;
-  CORBA_ValueDef_ptr &inout (void);
-  CORBA_ValueDef_ptr &out (void);
-  CORBA_ValueDef_ptr _retn (void);
-  CORBA_ValueDef_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_ValueDef_ptr duplicate (CORBA_ValueDef_ptr);
-  static void release (CORBA_ValueDef_ptr);
-  static CORBA_ValueDef_ptr nil (void);
-  static CORBA_ValueDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
-
-private:
-  CORBA_ValueDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_ValueDef_var (const TAO_Base_var &rhs);
-  CORBA_ValueDef_var &operator= (const TAO_Base_var &rhs);
-};
+    class TAO_IFR_Client_Export CORBA_ValueDef_var : public TAO_Base_var
+    {
+    public:
+      CORBA_ValueDef_var (void); // default constructor
+      CORBA_ValueDef_var (CORBA_ValueDef_ptr p) : ptr_ (p) {}
+      CORBA_ValueDef_var (const CORBA_ValueDef_var &); // copy constructor
+      ~CORBA_ValueDef_var (void); // destructor
+
+      CORBA_ValueDef_var &operator= (CORBA_ValueDef_ptr);
+      CORBA_ValueDef_var &operator= (const CORBA_ValueDef_var &);
+      CORBA_ValueDef_ptr operator-> (void) const;
+
+      operator const CORBA_ValueDef_ptr &() const;
+      operator CORBA_ValueDef_ptr &();
+      // in, inout, out, _retn
+      CORBA_ValueDef_ptr in (void) const;
+      CORBA_ValueDef_ptr &inout (void);
+      CORBA_ValueDef_ptr &out (void);
+      CORBA_ValueDef_ptr _retn (void);
+      CORBA_ValueDef_ptr ptr (void) const;
+
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static CORBA_ValueDef_ptr duplicate (CORBA_ValueDef_ptr);
+      static void release (CORBA_ValueDef_ptr);
+      static CORBA_ValueDef_ptr nil (void);
+      static CORBA_ValueDef_ptr narrow (
+          CORBA::Object *,
+          CORBA::Environment &
+        );
+      static CORBA::Object * upcast (void *);
+
+    private:
+      CORBA_ValueDef_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      CORBA_ValueDef_var (const TAO_Base_var &rhs);
+      CORBA_ValueDef_var &operator= (const TAO_Base_var &rhs);
+    };
 
 
 #endif /* end #if !defined */
@@ -2225,105 +2306,120 @@ private:
 #if !defined (_CORBA_VALUEDEF___OUT_CH_)
 #define _CORBA_VALUEDEF___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_ValueDef_out
-{
-public:
-  CORBA_ValueDef_out (CORBA_ValueDef_ptr &);
-  CORBA_ValueDef_out (CORBA_ValueDef_var &);
-  CORBA_ValueDef_out (const CORBA_ValueDef_out &);
-  CORBA_ValueDef_out &operator= (const CORBA_ValueDef_out &);
-  CORBA_ValueDef_out &operator= (const CORBA_ValueDef_var &);
-  CORBA_ValueDef_out &operator= (CORBA_ValueDef_ptr);
-  operator CORBA_ValueDef_ptr &();
-  CORBA_ValueDef_ptr &ptr (void);
-  CORBA_ValueDef_ptr operator-> (void);
-
-private:
-  CORBA_ValueDef_ptr &ptr_;
-};
+    class TAO_IFR_Client_Export CORBA_ValueDef_out
+    {
+    public:
+      CORBA_ValueDef_out (CORBA_ValueDef_ptr &);
+      CORBA_ValueDef_out (CORBA_ValueDef_var &);
+      CORBA_ValueDef_out (const CORBA_ValueDef_out &);
+      CORBA_ValueDef_out &operator= (const CORBA_ValueDef_out &);
+      CORBA_ValueDef_out &operator= (const CORBA_ValueDef_var &);
+      CORBA_ValueDef_out &operator= (CORBA_ValueDef_ptr);
+      operator CORBA_ValueDef_ptr &();
+      CORBA_ValueDef_ptr &ptr (void);
+      CORBA_ValueDef_ptr operator-> (void);
+
+    private:
+      CORBA_ValueDef_ptr &ptr_;
+    };
 
 
 #endif /* end #if !defined */
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CH_
 
-  class _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    // = Initialization and termination methods.
-    
-    _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (CORBA::ULong maximum,
-      CORBA::ULong length,
-      CORBA_ValueDef* *value,
-      CORBA::Boolean release = 0);
-    _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &rhs);
-    virtual ~_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &rhs);
-    TAO_Object_Manager<CORBA_ValueDef,CORBA_ValueDef_var> operator[] (CORBA::ULong index) const;
-    static CORBA_ValueDef **allocbuf (CORBA::ULong nelems);
-    static void freebuf (CORBA_ValueDef **buffer);
-    // The Base_Sequence functions, please see tao/Sequence.h
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    CORBA_ValueDef* *get_buffer (CORBA::Boolean orphan = 0);
-    const CORBA_ValueDef* *get_buffer (void) const;
-    virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-    virtual void _downcast (
-        void* target,
-        CORBA_Object *src,
-        CORBA_Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    virtual CORBA_Object* _upcast (void *src) const;
-    
-  };
+    class _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq
+      : public TAO_Unbounded_Base_Sequence
+    {
+    public:
+      // = Initialization and termination methods.
+      _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (void);
+      _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (CORBA::ULong maximum);
+      _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (
+          CORBA::ULong maximum,
+          CORBA::ULong length,
+          CORBA_ValueDef* *value,
+          CORBA::Boolean release = 0
+        );
+      _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (
+          const _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &rhs
+        );
+      _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &operator= (
+          const _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &rhs
+        );
+      virtual ~_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (void);
+
+      // = Accessors.
+      TAO_Object_Manager<CORBA_ValueDef,CORBA_ValueDef_var> operator[] (CORBA::ULong index) const;
+
+      // = Static operations.
+      static CORBA_ValueDef **allocbuf (CORBA::ULong nelems);
+      static void freebuf (CORBA_ValueDef **buffer);
+
+      // Implement the TAO_Base_Sequence methods (see Sequence.h)
+      virtual void _allocate_buffer (CORBA::ULong length);
+      virtual void _deallocate_buffer (void);
+      CORBA_ValueDef* *get_buffer (CORBA::Boolean orphan = 0);
+      const CORBA_ValueDef* *get_buffer (void) const;
+      virtual void _shrink_buffer (
+          CORBA::ULong nl,
+          CORBA::ULong ol
+        );
+
+      virtual void _downcast (
+          void* target,
+          CORBA_Object *src,
+          CORBA_Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        );
+      virtual CORBA_Object* _upcast (void *src) const;
+    };
 
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_VALUEDEFSEQ_CH_)
 #define _CORBA_VALUEDEFSEQ_CH_
 
-class CORBA_ValueDefSeq;
-class CORBA_ValueDefSeq_var;
+    class CORBA_ValueDefSeq;
+    class CORBA_ValueDefSeq_var;
 
-// *************************************************************
-// CORBA_ValueDefSeq
-// *************************************************************
+    // *************************************************************
+    // CORBA_ValueDefSeq
+    // *************************************************************
 
-class TAO_IFR_Client_Export CORBA_ValueDefSeq : public 
+    class TAO_IFR_Client_Export CORBA_ValueDefSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq
+    _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA_ValueDef,CORBA_ValueDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-{
-public:
-  CORBA_ValueDefSeq (void); // default ctor
-  CORBA_ValueDefSeq (CORBA::ULong max); // uses max size
-  CORBA_ValueDefSeq (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    CORBA_ValueDef_ptr *buffer, 
-    CORBA::Boolean release = 0
-  );
-  CORBA_ValueDefSeq (const CORBA_ValueDefSeq &); // copy ctor
-  ~CORBA_ValueDefSeq (void);
-  static void _tao_any_destructor (void*);
+    TAO_Unbounded_Object_Sequence<CORBA_ValueDef,CORBA_ValueDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+    {
+    public:
+      CORBA_ValueDefSeq (void); // default ctor
+      CORBA_ValueDefSeq (CORBA::ULong max); // uses max size
+      CORBA_ValueDefSeq (
+          CORBA::ULong max,
+          CORBA::ULong length,
+          CORBA_ValueDef_ptr *buffer,
+          CORBA::Boolean release = 0
+        );
+      CORBA_ValueDefSeq (const CORBA_ValueDefSeq &); // copy ctor
+      ~CORBA_ValueDefSeq (void);
+      static void _tao_any_destructor (void*);
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_ValueDefSeq_var _var_type;
+      typedef CORBA_ValueDefSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-};
+
+    };
 
 #endif /* end #if !defined */
 
@@ -2331,40 +2427,40 @@ public:
 #if !defined (_CORBA_VALUEDEFSEQ___VAR_CH_)
 #define _CORBA_VALUEDEFSEQ___VAR_CH_
 
-// *************************************************************
-// class CORBA_ValueDefSeq_var
-// *************************************************************
+    // *************************************************************
+    // class CORBA_ValueDefSeq_var
+    // *************************************************************
 
-class TAO_IFR_Client_Export CORBA_ValueDefSeq_var
-{
-public:
-  CORBA_ValueDefSeq_var (void); // default constructor
-  CORBA_ValueDefSeq_var (CORBA_ValueDefSeq *);
-  CORBA_ValueDefSeq_var (const CORBA_ValueDefSeq_var &); // copy constructor
-  ~CORBA_ValueDefSeq_var (void); // destructor
-  
-  CORBA_ValueDefSeq_var &operator= (CORBA_ValueDefSeq *);
-  CORBA_ValueDefSeq_var &operator= (const CORBA_ValueDefSeq_var &);
-  CORBA_ValueDefSeq *operator-> (void);
-  const CORBA_ValueDefSeq *operator-> (void) const;
-  
-  operator const CORBA_ValueDefSeq &() const;
-  operator CORBA_ValueDefSeq &();
-  operator CORBA_ValueDefSeq &() const;
-  operator CORBA_ValueDefSeq *&(); // variable-size base types only
-  
-  TAO_Object_Manager<CORBA_ValueDef, CORBA_ValueDef_var> operator[] (CORBA::ULong index);
-  
-  // in, inout, out, _retn 
-  const CORBA_ValueDefSeq &in (void) const;
-  CORBA_ValueDefSeq &inout (void);
-  CORBA_ValueDefSeq *&out (void);
-  CORBA_ValueDefSeq *_retn (void);
-  CORBA_ValueDefSeq *ptr (void) const;
-
-private:
-  CORBA_ValueDefSeq *ptr_;
-};
+    class TAO_IFR_Client_Export CORBA_ValueDefSeq_var
+    {
+    public:
+      CORBA_ValueDefSeq_var (void);
+      CORBA_ValueDefSeq_var (CORBA_ValueDefSeq *);
+      CORBA_ValueDefSeq_var (const CORBA_ValueDefSeq_var &);
+      ~CORBA_ValueDefSeq_var (void);
+
+      CORBA_ValueDefSeq_var &operator= (CORBA_ValueDefSeq *);
+      CORBA_ValueDefSeq_var &operator= (const CORBA_ValueDefSeq_var &);
+      CORBA_ValueDefSeq *operator-> (void);
+      const CORBA_ValueDefSeq *operator-> (void) const;
+
+      operator const CORBA_ValueDefSeq &() const;
+      operator CORBA_ValueDefSeq &();
+      operator CORBA_ValueDefSeq &() const;
+      operator CORBA_ValueDefSeq *&(); // variable-size base types only
+
+      TAO_Object_Manager<CORBA_ValueDef, CORBA_ValueDef_var> operator[] (CORBA::ULong index);
+
+      // in, inout, out, _retn
+      const CORBA_ValueDefSeq &in (void) const;
+      CORBA_ValueDefSeq &inout (void);
+      CORBA_ValueDefSeq *&out (void);
+      CORBA_ValueDefSeq *_retn (void);
+      CORBA_ValueDefSeq *ptr (void) const;
+
+    private:
+      CORBA_ValueDefSeq *ptr_;
+    };
 
 
 #endif /* end #if !defined */
@@ -2373,34 +2469,34 @@ private:
 #if !defined (_CORBA_VALUEDEFSEQ___OUT_CH_)
 #define _CORBA_VALUEDEFSEQ___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_ValueDefSeq_out
-{
-public:
-  CORBA_ValueDefSeq_out (CORBA_ValueDefSeq *&);
-  CORBA_ValueDefSeq_out (CORBA_ValueDefSeq_var &);
-  CORBA_ValueDefSeq_out (const CORBA_ValueDefSeq_out &);
-  CORBA_ValueDefSeq_out &operator= (const CORBA_ValueDefSeq_out &);
-  CORBA_ValueDefSeq_out &operator= (CORBA_ValueDefSeq *);
-  operator CORBA_ValueDefSeq *&();
-  CORBA_ValueDefSeq *&ptr (void);
-  CORBA_ValueDefSeq *operator-> (void);
-  TAO_Object_Manager<CORBA_ValueDef, CORBA_ValueDef_var> operator[] (CORBA::ULong index);
-  
-private:
-  CORBA_ValueDefSeq *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_ValueDefSeq_var &);
-};
+    class TAO_IFR_Client_Export CORBA_ValueDefSeq_out
+    {
+    public:
+      CORBA_ValueDefSeq_out (CORBA_ValueDefSeq *&);
+      CORBA_ValueDefSeq_out (CORBA_ValueDefSeq_var &);
+      CORBA_ValueDefSeq_out (const CORBA_ValueDefSeq_out &);
+      CORBA_ValueDefSeq_out &operator= (const CORBA_ValueDefSeq_out &);
+      CORBA_ValueDefSeq_out &operator= (CORBA_ValueDefSeq *);
+      operator CORBA_ValueDefSeq *&();
+      CORBA_ValueDefSeq *&ptr (void);
+      CORBA_ValueDefSeq *operator-> (void);
+      TAO_Object_Manager<CORBA_ValueDef, CORBA_ValueDef_var> operator[] (CORBA::ULong index);
+
+    private:
+      CORBA_ValueDefSeq *&ptr_;
+      // Assignment from T_var not allowed.
+      void operator= (const CORBA_ValueDefSeq_var &);
+    };
 
 
 #endif /* end #if !defined */
 
-class CORBA_ValueBoxDef;
+    class CORBA_ValueBoxDef;
 
 #if !defined (_CORBA_VALUEBOXDEF___PTR_CH_)
 #define _CORBA_VALUEBOXDEF___PTR_CH_
 
-typedef CORBA_ValueBoxDef *CORBA_ValueBoxDef_ptr;
+    typedef CORBA_ValueBoxDef *CORBA_ValueBoxDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -2408,41 +2504,44 @@ typedef CORBA_ValueBoxDef *CORBA_ValueBoxDef_ptr;
 #if !defined (_CORBA_VALUEBOXDEF___VAR_CH_)
 #define _CORBA_VALUEBOXDEF___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_ValueBoxDef_var : public TAO_Base_var
-{
-public:
-  CORBA_ValueBoxDef_var (void); // default constructor
-  CORBA_ValueBoxDef_var (CORBA_ValueBoxDef_ptr p) : ptr_ (p) {} 
-  CORBA_ValueBoxDef_var (const CORBA_ValueBoxDef_var &); // copy constructor
-  ~CORBA_ValueBoxDef_var (void); // destructor
-  
-  CORBA_ValueBoxDef_var &operator= (CORBA_ValueBoxDef_ptr);
-  CORBA_ValueBoxDef_var &operator= (const CORBA_ValueBoxDef_var &);
-  CORBA_ValueBoxDef_ptr operator-> (void) const;
-  
-  operator const CORBA_ValueBoxDef_ptr &() const;
-  operator CORBA_ValueBoxDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_ValueBoxDef_ptr in (void) const;
-  CORBA_ValueBoxDef_ptr &inout (void);
-  CORBA_ValueBoxDef_ptr &out (void);
-  CORBA_ValueBoxDef_ptr _retn (void);
-  CORBA_ValueBoxDef_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_ValueBoxDef_ptr duplicate (CORBA_ValueBoxDef_ptr);
-  static void release (CORBA_ValueBoxDef_ptr);
-  static CORBA_ValueBoxDef_ptr nil (void);
-  static CORBA_ValueBoxDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
-
-private:
-  CORBA_ValueBoxDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_ValueBoxDef_var (const TAO_Base_var &rhs);
-  CORBA_ValueBoxDef_var &operator= (const TAO_Base_var &rhs);
-};
+    class TAO_IFR_Client_Export CORBA_ValueBoxDef_var : public TAO_Base_var
+    {
+    public:
+      CORBA_ValueBoxDef_var (void); // default constructor
+      CORBA_ValueBoxDef_var (CORBA_ValueBoxDef_ptr p) : ptr_ (p) {}
+      CORBA_ValueBoxDef_var (const CORBA_ValueBoxDef_var &); // copy constructor
+      ~CORBA_ValueBoxDef_var (void); // destructor
+
+      CORBA_ValueBoxDef_var &operator= (CORBA_ValueBoxDef_ptr);
+      CORBA_ValueBoxDef_var &operator= (const CORBA_ValueBoxDef_var &);
+      CORBA_ValueBoxDef_ptr operator-> (void) const;
+
+      operator const CORBA_ValueBoxDef_ptr &() const;
+      operator CORBA_ValueBoxDef_ptr &();
+      // in, inout, out, _retn
+      CORBA_ValueBoxDef_ptr in (void) const;
+      CORBA_ValueBoxDef_ptr &inout (void);
+      CORBA_ValueBoxDef_ptr &out (void);
+      CORBA_ValueBoxDef_ptr _retn (void);
+      CORBA_ValueBoxDef_ptr ptr (void) const;
+
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static CORBA_ValueBoxDef_ptr duplicate (CORBA_ValueBoxDef_ptr);
+      static void release (CORBA_ValueBoxDef_ptr);
+      static CORBA_ValueBoxDef_ptr nil (void);
+      static CORBA_ValueBoxDef_ptr narrow (
+          CORBA::Object *,
+          CORBA::Environment &
+        );
+      static CORBA::Object * upcast (void *);
+
+    private:
+      CORBA_ValueBoxDef_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      CORBA_ValueBoxDef_var (const TAO_Base_var &rhs);
+      CORBA_ValueBoxDef_var &operator= (const TAO_Base_var &rhs);
+    };
 
 
 #endif /* end #if !defined */
@@ -2451,32 +2550,32 @@ private:
 #if !defined (_CORBA_VALUEBOXDEF___OUT_CH_)
 #define _CORBA_VALUEBOXDEF___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_ValueBoxDef_out
-{
-public:
-  CORBA_ValueBoxDef_out (CORBA_ValueBoxDef_ptr &);
-  CORBA_ValueBoxDef_out (CORBA_ValueBoxDef_var &);
-  CORBA_ValueBoxDef_out (const CORBA_ValueBoxDef_out &);
-  CORBA_ValueBoxDef_out &operator= (const CORBA_ValueBoxDef_out &);
-  CORBA_ValueBoxDef_out &operator= (const CORBA_ValueBoxDef_var &);
-  CORBA_ValueBoxDef_out &operator= (CORBA_ValueBoxDef_ptr);
-  operator CORBA_ValueBoxDef_ptr &();
-  CORBA_ValueBoxDef_ptr &ptr (void);
-  CORBA_ValueBoxDef_ptr operator-> (void);
-
-private:
-  CORBA_ValueBoxDef_ptr &ptr_;
-};
+    class TAO_IFR_Client_Export CORBA_ValueBoxDef_out
+    {
+    public:
+      CORBA_ValueBoxDef_out (CORBA_ValueBoxDef_ptr &);
+      CORBA_ValueBoxDef_out (CORBA_ValueBoxDef_var &);
+      CORBA_ValueBoxDef_out (const CORBA_ValueBoxDef_out &);
+      CORBA_ValueBoxDef_out &operator= (const CORBA_ValueBoxDef_out &);
+      CORBA_ValueBoxDef_out &operator= (const CORBA_ValueBoxDef_var &);
+      CORBA_ValueBoxDef_out &operator= (CORBA_ValueBoxDef_ptr);
+      operator CORBA_ValueBoxDef_ptr &();
+      CORBA_ValueBoxDef_ptr &ptr (void);
+      CORBA_ValueBoxDef_ptr operator-> (void);
+
+    private:
+      CORBA_ValueBoxDef_ptr &ptr_;
+    };
 
 
 #endif /* end #if !defined */
 
-class CORBA_AbstractInterfaceDef;
+    class CORBA_AbstractInterfaceDef;
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEF___PTR_CH_)
 #define _CORBA_ABSTRACTINTERFACEDEF___PTR_CH_
 
-typedef CORBA_AbstractInterfaceDef *CORBA_AbstractInterfaceDef_ptr;
+    typedef CORBA_AbstractInterfaceDef *CORBA_AbstractInterfaceDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -2484,41 +2583,44 @@ typedef CORBA_AbstractInterfaceDef *CORBA_AbstractInterfaceDef_ptr;
 #if !defined (_CORBA_ABSTRACTINTERFACEDEF___VAR_CH_)
 #define _CORBA_ABSTRACTINTERFACEDEF___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_AbstractInterfaceDef_var : public TAO_Base_var
-{
-public:
-  CORBA_AbstractInterfaceDef_var (void); // default constructor
-  CORBA_AbstractInterfaceDef_var (CORBA_AbstractInterfaceDef_ptr p) : ptr_ (p) {} 
-  CORBA_AbstractInterfaceDef_var (const CORBA_AbstractInterfaceDef_var &); // copy constructor
-  ~CORBA_AbstractInterfaceDef_var (void); // destructor
-  
-  CORBA_AbstractInterfaceDef_var &operator= (CORBA_AbstractInterfaceDef_ptr);
-  CORBA_AbstractInterfaceDef_var &operator= (const CORBA_AbstractInterfaceDef_var &);
-  CORBA_AbstractInterfaceDef_ptr operator-> (void) const;
-  
-  operator const CORBA_AbstractInterfaceDef_ptr &() const;
-  operator CORBA_AbstractInterfaceDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_AbstractInterfaceDef_ptr in (void) const;
-  CORBA_AbstractInterfaceDef_ptr &inout (void);
-  CORBA_AbstractInterfaceDef_ptr &out (void);
-  CORBA_AbstractInterfaceDef_ptr _retn (void);
-  CORBA_AbstractInterfaceDef_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_AbstractInterfaceDef_ptr duplicate (CORBA_AbstractInterfaceDef_ptr);
-  static void release (CORBA_AbstractInterfaceDef_ptr);
-  static CORBA_AbstractInterfaceDef_ptr nil (void);
-  static CORBA_AbstractInterfaceDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
-
-private:
-  CORBA_AbstractInterfaceDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_AbstractInterfaceDef_var (const TAO_Base_var &rhs);
-  CORBA_AbstractInterfaceDef_var &operator= (const TAO_Base_var &rhs);
-};
+    class TAO_IFR_Client_Export CORBA_AbstractInterfaceDef_var : public TAO_Base_var
+    {
+    public:
+      CORBA_AbstractInterfaceDef_var (void); // default constructor
+      CORBA_AbstractInterfaceDef_var (CORBA_AbstractInterfaceDef_ptr p) : ptr_ (p) {}
+      CORBA_AbstractInterfaceDef_var (const CORBA_AbstractInterfaceDef_var &); // copy constructor
+      ~CORBA_AbstractInterfaceDef_var (void); // destructor
+
+      CORBA_AbstractInterfaceDef_var &operator= (CORBA_AbstractInterfaceDef_ptr);
+      CORBA_AbstractInterfaceDef_var &operator= (const CORBA_AbstractInterfaceDef_var &);
+      CORBA_AbstractInterfaceDef_ptr operator-> (void) const;
+
+      operator const CORBA_AbstractInterfaceDef_ptr &() const;
+      operator CORBA_AbstractInterfaceDef_ptr &();
+      // in, inout, out, _retn
+      CORBA_AbstractInterfaceDef_ptr in (void) const;
+      CORBA_AbstractInterfaceDef_ptr &inout (void);
+      CORBA_AbstractInterfaceDef_ptr &out (void);
+      CORBA_AbstractInterfaceDef_ptr _retn (void);
+      CORBA_AbstractInterfaceDef_ptr ptr (void) const;
+
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static CORBA_AbstractInterfaceDef_ptr duplicate (CORBA_AbstractInterfaceDef_ptr);
+      static void release (CORBA_AbstractInterfaceDef_ptr);
+      static CORBA_AbstractInterfaceDef_ptr nil (void);
+      static CORBA_AbstractInterfaceDef_ptr narrow (
+          CORBA::Object *,
+          CORBA::Environment &
+        );
+      static CORBA::Object * upcast (void *);
+
+    private:
+      CORBA_AbstractInterfaceDef_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      CORBA_AbstractInterfaceDef_var (const TAO_Base_var &rhs);
+      CORBA_AbstractInterfaceDef_var &operator= (const TAO_Base_var &rhs);
+    };
 
 
 #endif /* end #if !defined */
@@ -2527,105 +2629,120 @@ private:
 #if !defined (_CORBA_ABSTRACTINTERFACEDEF___OUT_CH_)
 #define _CORBA_ABSTRACTINTERFACEDEF___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_AbstractInterfaceDef_out
-{
-public:
-  CORBA_AbstractInterfaceDef_out (CORBA_AbstractInterfaceDef_ptr &);
-  CORBA_AbstractInterfaceDef_out (CORBA_AbstractInterfaceDef_var &);
-  CORBA_AbstractInterfaceDef_out (const CORBA_AbstractInterfaceDef_out &);
-  CORBA_AbstractInterfaceDef_out &operator= (const CORBA_AbstractInterfaceDef_out &);
-  CORBA_AbstractInterfaceDef_out &operator= (const CORBA_AbstractInterfaceDef_var &);
-  CORBA_AbstractInterfaceDef_out &operator= (CORBA_AbstractInterfaceDef_ptr);
-  operator CORBA_AbstractInterfaceDef_ptr &();
-  CORBA_AbstractInterfaceDef_ptr &ptr (void);
-  CORBA_AbstractInterfaceDef_ptr operator-> (void);
-
-private:
-  CORBA_AbstractInterfaceDef_ptr &ptr_;
-};
+    class TAO_IFR_Client_Export CORBA_AbstractInterfaceDef_out
+    {
+    public:
+      CORBA_AbstractInterfaceDef_out (CORBA_AbstractInterfaceDef_ptr &);
+      CORBA_AbstractInterfaceDef_out (CORBA_AbstractInterfaceDef_var &);
+      CORBA_AbstractInterfaceDef_out (const CORBA_AbstractInterfaceDef_out &);
+      CORBA_AbstractInterfaceDef_out &operator= (const CORBA_AbstractInterfaceDef_out &);
+      CORBA_AbstractInterfaceDef_out &operator= (const CORBA_AbstractInterfaceDef_var &);
+      CORBA_AbstractInterfaceDef_out &operator= (CORBA_AbstractInterfaceDef_ptr);
+      operator CORBA_AbstractInterfaceDef_ptr &();
+      CORBA_AbstractInterfaceDef_ptr &ptr (void);
+      CORBA_AbstractInterfaceDef_ptr operator-> (void);
+
+    private:
+      CORBA_AbstractInterfaceDef_ptr &ptr_;
+    };
 
 
 #endif /* end #if !defined */
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_ABSTRACTINTERFACEDEFSEQ_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_ABSTRACTINTERFACEDEFSEQ_CH_
 
-  class _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    // = Initialization and termination methods.
-    
-    _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (CORBA::ULong maximum,
-      CORBA::ULong length,
-      CORBA_AbstractInterfaceDef* *value,
-      CORBA::Boolean release = 0);
-    _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq &rhs);
-    virtual ~_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq &rhs);
-    TAO_Object_Manager<CORBA_AbstractInterfaceDef,CORBA_AbstractInterfaceDef_var> operator[] (CORBA::ULong index) const;
-    static CORBA_AbstractInterfaceDef **allocbuf (CORBA::ULong nelems);
-    static void freebuf (CORBA_AbstractInterfaceDef **buffer);
-    // The Base_Sequence functions, please see tao/Sequence.h
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    CORBA_AbstractInterfaceDef* *get_buffer (CORBA::Boolean orphan = 0);
-    const CORBA_AbstractInterfaceDef* *get_buffer (void) const;
-    virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-    virtual void _downcast (
-        void* target,
-        CORBA_Object *src,
-        CORBA_Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    virtual CORBA_Object* _upcast (void *src) const;
-    
-  };
+    class _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq
+      : public TAO_Unbounded_Base_Sequence
+    {
+    public:
+      // = Initialization and termination methods.
+      _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (void);
+      _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (CORBA::ULong maximum);
+      _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (
+          CORBA::ULong maximum,
+          CORBA::ULong length,
+          CORBA_AbstractInterfaceDef* *value,
+          CORBA::Boolean release = 0
+        );
+      _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (
+          const _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq &rhs
+        );
+      _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq &operator= (
+          const _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq &rhs
+        );
+      virtual ~_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (void);
+
+      // = Accessors.
+      TAO_Object_Manager<CORBA_AbstractInterfaceDef,CORBA_AbstractInterfaceDef_var> operator[] (CORBA::ULong index) const;
+
+      // = Static operations.
+      static CORBA_AbstractInterfaceDef **allocbuf (CORBA::ULong nelems);
+      static void freebuf (CORBA_AbstractInterfaceDef **buffer);
+
+      // Implement the TAO_Base_Sequence methods (see Sequence.h)
+      virtual void _allocate_buffer (CORBA::ULong length);
+      virtual void _deallocate_buffer (void);
+      CORBA_AbstractInterfaceDef* *get_buffer (CORBA::Boolean orphan = 0);
+      const CORBA_AbstractInterfaceDef* *get_buffer (void) const;
+      virtual void _shrink_buffer (
+          CORBA::ULong nl,
+          CORBA::ULong ol
+        );
+
+      virtual void _downcast (
+          void* target,
+          CORBA_Object *src,
+          CORBA_Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        );
+      virtual CORBA_Object* _upcast (void *src) const;
+    };
 
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ_CH_)
 #define _CORBA_ABSTRACTINTERFACEDEFSEQ_CH_
 
-class CORBA_AbstractInterfaceDefSeq;
-class CORBA_AbstractInterfaceDefSeq_var;
+    class CORBA_AbstractInterfaceDefSeq;
+    class CORBA_AbstractInterfaceDefSeq_var;
 
-// *************************************************************
-// CORBA_AbstractInterfaceDefSeq
-// *************************************************************
+    // *************************************************************
+    // CORBA_AbstractInterfaceDefSeq
+    // *************************************************************
 
-class TAO_IFR_Client_Export CORBA_AbstractInterfaceDefSeq : public 
+    class TAO_IFR_Client_Export CORBA_AbstractInterfaceDefSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq
+    _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA_AbstractInterfaceDef,CORBA_AbstractInterfaceDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-{
-public:
-  CORBA_AbstractInterfaceDefSeq (void); // default ctor
-  CORBA_AbstractInterfaceDefSeq (CORBA::ULong max); // uses max size
-  CORBA_AbstractInterfaceDefSeq (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    CORBA_AbstractInterfaceDef_ptr *buffer, 
-    CORBA::Boolean release = 0
-  );
-  CORBA_AbstractInterfaceDefSeq (const CORBA_AbstractInterfaceDefSeq &); // copy ctor
-  ~CORBA_AbstractInterfaceDefSeq (void);
-  static void _tao_any_destructor (void*);
+    TAO_Unbounded_Object_Sequence<CORBA_AbstractInterfaceDef,CORBA_AbstractInterfaceDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+    {
+    public:
+      CORBA_AbstractInterfaceDefSeq (void); // default ctor
+      CORBA_AbstractInterfaceDefSeq (CORBA::ULong max); // uses max size
+      CORBA_AbstractInterfaceDefSeq (
+          CORBA::ULong max,
+          CORBA::ULong length,
+          CORBA_AbstractInterfaceDef_ptr *buffer,
+          CORBA::Boolean release = 0
+        );
+      CORBA_AbstractInterfaceDefSeq (const CORBA_AbstractInterfaceDefSeq &); // copy ctor
+      ~CORBA_AbstractInterfaceDefSeq (void);
+      static void _tao_any_destructor (void*);
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_AbstractInterfaceDefSeq_var _var_type;
+      typedef CORBA_AbstractInterfaceDefSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-};
+
+    };
 
 #endif /* end #if !defined */
 
@@ -2633,40 +2750,40 @@ public:
 #if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ___VAR_CH_)
 #define _CORBA_ABSTRACTINTERFACEDEFSEQ___VAR_CH_
 
-// *************************************************************
-// class CORBA_AbstractInterfaceDefSeq_var
-// *************************************************************
-
-class TAO_IFR_Client_Export CORBA_AbstractInterfaceDefSeq_var
-{
-public:
-  CORBA_AbstractInterfaceDefSeq_var (void); // default constructor
-  CORBA_AbstractInterfaceDefSeq_var (CORBA_AbstractInterfaceDefSeq *);
-  CORBA_AbstractInterfaceDefSeq_var (const CORBA_AbstractInterfaceDefSeq_var &); // copy constructor
-  ~CORBA_AbstractInterfaceDefSeq_var (void); // destructor
-  
-  CORBA_AbstractInterfaceDefSeq_var &operator= (CORBA_AbstractInterfaceDefSeq *);
-  CORBA_AbstractInterfaceDefSeq_var &operator= (const CORBA_AbstractInterfaceDefSeq_var &);
-  CORBA_AbstractInterfaceDefSeq *operator-> (void);
-  const CORBA_AbstractInterfaceDefSeq *operator-> (void) const;
-  
-  operator const CORBA_AbstractInterfaceDefSeq &() const;
-  operator CORBA_AbstractInterfaceDefSeq &();
-  operator CORBA_AbstractInterfaceDefSeq &() const;
-  operator CORBA_AbstractInterfaceDefSeq *&(); // variable-size base types only
-  
-  TAO_Object_Manager<CORBA_AbstractInterfaceDef, CORBA_AbstractInterfaceDef_var> operator[] (CORBA::ULong index);
-  
-  // in, inout, out, _retn 
-  const CORBA_AbstractInterfaceDefSeq &in (void) const;
-  CORBA_AbstractInterfaceDefSeq &inout (void);
-  CORBA_AbstractInterfaceDefSeq *&out (void);
-  CORBA_AbstractInterfaceDefSeq *_retn (void);
-  CORBA_AbstractInterfaceDefSeq *ptr (void) const;
+    // *************************************************************
+    // class CORBA_AbstractInterfaceDefSeq_var
+    // *************************************************************
 
-private:
-  CORBA_AbstractInterfaceDefSeq *ptr_;
-};
+    class TAO_IFR_Client_Export CORBA_AbstractInterfaceDefSeq_var
+    {
+    public:
+      CORBA_AbstractInterfaceDefSeq_var (void);
+      CORBA_AbstractInterfaceDefSeq_var (CORBA_AbstractInterfaceDefSeq *);
+      CORBA_AbstractInterfaceDefSeq_var (const CORBA_AbstractInterfaceDefSeq_var &);
+      ~CORBA_AbstractInterfaceDefSeq_var (void);
+
+      CORBA_AbstractInterfaceDefSeq_var &operator= (CORBA_AbstractInterfaceDefSeq *);
+      CORBA_AbstractInterfaceDefSeq_var &operator= (const CORBA_AbstractInterfaceDefSeq_var &);
+      CORBA_AbstractInterfaceDefSeq *operator-> (void);
+      const CORBA_AbstractInterfaceDefSeq *operator-> (void) const;
+
+      operator const CORBA_AbstractInterfaceDefSeq &() const;
+      operator CORBA_AbstractInterfaceDefSeq &();
+      operator CORBA_AbstractInterfaceDefSeq &() const;
+      operator CORBA_AbstractInterfaceDefSeq *&(); // variable-size base types only
+
+      TAO_Object_Manager<CORBA_AbstractInterfaceDef, CORBA_AbstractInterfaceDef_var> operator[] (CORBA::ULong index);
+
+      // in, inout, out, _retn
+      const CORBA_AbstractInterfaceDefSeq &in (void) const;
+      CORBA_AbstractInterfaceDefSeq &inout (void);
+      CORBA_AbstractInterfaceDefSeq *&out (void);
+      CORBA_AbstractInterfaceDefSeq *_retn (void);
+      CORBA_AbstractInterfaceDefSeq *ptr (void) const;
+
+    private:
+      CORBA_AbstractInterfaceDefSeq *ptr_;
+    };
 
 
 #endif /* end #if !defined */
@@ -2675,34 +2792,34 @@ private:
 #if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ___OUT_CH_)
 #define _CORBA_ABSTRACTINTERFACEDEFSEQ___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_AbstractInterfaceDefSeq_out
-{
-public:
-  CORBA_AbstractInterfaceDefSeq_out (CORBA_AbstractInterfaceDefSeq *&);
-  CORBA_AbstractInterfaceDefSeq_out (CORBA_AbstractInterfaceDefSeq_var &);
-  CORBA_AbstractInterfaceDefSeq_out (const CORBA_AbstractInterfaceDefSeq_out &);
-  CORBA_AbstractInterfaceDefSeq_out &operator= (const CORBA_AbstractInterfaceDefSeq_out &);
-  CORBA_AbstractInterfaceDefSeq_out &operator= (CORBA_AbstractInterfaceDefSeq *);
-  operator CORBA_AbstractInterfaceDefSeq *&();
-  CORBA_AbstractInterfaceDefSeq *&ptr (void);
-  CORBA_AbstractInterfaceDefSeq *operator-> (void);
-  TAO_Object_Manager<CORBA_AbstractInterfaceDef, CORBA_AbstractInterfaceDef_var> operator[] (CORBA::ULong index);
-  
-private:
-  CORBA_AbstractInterfaceDefSeq *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_AbstractInterfaceDefSeq_var &);
-};
+    class TAO_IFR_Client_Export CORBA_AbstractInterfaceDefSeq_out
+    {
+    public:
+      CORBA_AbstractInterfaceDefSeq_out (CORBA_AbstractInterfaceDefSeq *&);
+      CORBA_AbstractInterfaceDefSeq_out (CORBA_AbstractInterfaceDefSeq_var &);
+      CORBA_AbstractInterfaceDefSeq_out (const CORBA_AbstractInterfaceDefSeq_out &);
+      CORBA_AbstractInterfaceDefSeq_out &operator= (const CORBA_AbstractInterfaceDefSeq_out &);
+      CORBA_AbstractInterfaceDefSeq_out &operator= (CORBA_AbstractInterfaceDefSeq *);
+      operator CORBA_AbstractInterfaceDefSeq *&();
+      CORBA_AbstractInterfaceDefSeq *&ptr (void);
+      CORBA_AbstractInterfaceDefSeq *operator-> (void);
+      TAO_Object_Manager<CORBA_AbstractInterfaceDef, CORBA_AbstractInterfaceDef_var> operator[] (CORBA::ULong index);
+
+    private:
+      CORBA_AbstractInterfaceDefSeq *&ptr_;
+      // Assignment from T_var not allowed.
+      void operator= (const CORBA_AbstractInterfaceDefSeq_var &);
+    };
 
 
 #endif /* end #if !defined */
 
-class CORBA_LocalInterfaceDef;
+    class CORBA_LocalInterfaceDef;
 
 #if !defined (_CORBA_LOCALINTERFACEDEF___PTR_CH_)
 #define _CORBA_LOCALINTERFACEDEF___PTR_CH_
 
-typedef CORBA_LocalInterfaceDef *CORBA_LocalInterfaceDef_ptr;
+    typedef CORBA_LocalInterfaceDef *CORBA_LocalInterfaceDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -2710,41 +2827,44 @@ typedef CORBA_LocalInterfaceDef *CORBA_LocalInterfaceDef_ptr;
 #if !defined (_CORBA_LOCALINTERFACEDEF___VAR_CH_)
 #define _CORBA_LOCALINTERFACEDEF___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_LocalInterfaceDef_var : public TAO_Base_var
-{
-public:
-  CORBA_LocalInterfaceDef_var (void); // default constructor
-  CORBA_LocalInterfaceDef_var (CORBA_LocalInterfaceDef_ptr p) : ptr_ (p) {} 
-  CORBA_LocalInterfaceDef_var (const CORBA_LocalInterfaceDef_var &); // copy constructor
-  ~CORBA_LocalInterfaceDef_var (void); // destructor
-  
-  CORBA_LocalInterfaceDef_var &operator= (CORBA_LocalInterfaceDef_ptr);
-  CORBA_LocalInterfaceDef_var &operator= (const CORBA_LocalInterfaceDef_var &);
-  CORBA_LocalInterfaceDef_ptr operator-> (void) const;
-  
-  operator const CORBA_LocalInterfaceDef_ptr &() const;
-  operator CORBA_LocalInterfaceDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_LocalInterfaceDef_ptr in (void) const;
-  CORBA_LocalInterfaceDef_ptr &inout (void);
-  CORBA_LocalInterfaceDef_ptr &out (void);
-  CORBA_LocalInterfaceDef_ptr _retn (void);
-  CORBA_LocalInterfaceDef_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_LocalInterfaceDef_ptr duplicate (CORBA_LocalInterfaceDef_ptr);
-  static void release (CORBA_LocalInterfaceDef_ptr);
-  static CORBA_LocalInterfaceDef_ptr nil (void);
-  static CORBA_LocalInterfaceDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
-
-private:
-  CORBA_LocalInterfaceDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_LocalInterfaceDef_var (const TAO_Base_var &rhs);
-  CORBA_LocalInterfaceDef_var &operator= (const TAO_Base_var &rhs);
-};
+    class TAO_IFR_Client_Export CORBA_LocalInterfaceDef_var : public TAO_Base_var
+    {
+    public:
+      CORBA_LocalInterfaceDef_var (void); // default constructor
+      CORBA_LocalInterfaceDef_var (CORBA_LocalInterfaceDef_ptr p) : ptr_ (p) {}
+      CORBA_LocalInterfaceDef_var (const CORBA_LocalInterfaceDef_var &); // copy constructor
+      ~CORBA_LocalInterfaceDef_var (void); // destructor
+
+      CORBA_LocalInterfaceDef_var &operator= (CORBA_LocalInterfaceDef_ptr);
+      CORBA_LocalInterfaceDef_var &operator= (const CORBA_LocalInterfaceDef_var &);
+      CORBA_LocalInterfaceDef_ptr operator-> (void) const;
+
+      operator const CORBA_LocalInterfaceDef_ptr &() const;
+      operator CORBA_LocalInterfaceDef_ptr &();
+      // in, inout, out, _retn
+      CORBA_LocalInterfaceDef_ptr in (void) const;
+      CORBA_LocalInterfaceDef_ptr &inout (void);
+      CORBA_LocalInterfaceDef_ptr &out (void);
+      CORBA_LocalInterfaceDef_ptr _retn (void);
+      CORBA_LocalInterfaceDef_ptr ptr (void) const;
+
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static CORBA_LocalInterfaceDef_ptr duplicate (CORBA_LocalInterfaceDef_ptr);
+      static void release (CORBA_LocalInterfaceDef_ptr);
+      static CORBA_LocalInterfaceDef_ptr nil (void);
+      static CORBA_LocalInterfaceDef_ptr narrow (
+          CORBA::Object *,
+          CORBA::Environment &
+        );
+      static CORBA::Object * upcast (void *);
+
+    private:
+      CORBA_LocalInterfaceDef_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      CORBA_LocalInterfaceDef_var (const TAO_Base_var &rhs);
+      CORBA_LocalInterfaceDef_var &operator= (const TAO_Base_var &rhs);
+    };
 
 
 #endif /* end #if !defined */
@@ -2753,105 +2873,120 @@ private:
 #if !defined (_CORBA_LOCALINTERFACEDEF___OUT_CH_)
 #define _CORBA_LOCALINTERFACEDEF___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_LocalInterfaceDef_out
-{
-public:
-  CORBA_LocalInterfaceDef_out (CORBA_LocalInterfaceDef_ptr &);
-  CORBA_LocalInterfaceDef_out (CORBA_LocalInterfaceDef_var &);
-  CORBA_LocalInterfaceDef_out (const CORBA_LocalInterfaceDef_out &);
-  CORBA_LocalInterfaceDef_out &operator= (const CORBA_LocalInterfaceDef_out &);
-  CORBA_LocalInterfaceDef_out &operator= (const CORBA_LocalInterfaceDef_var &);
-  CORBA_LocalInterfaceDef_out &operator= (CORBA_LocalInterfaceDef_ptr);
-  operator CORBA_LocalInterfaceDef_ptr &();
-  CORBA_LocalInterfaceDef_ptr &ptr (void);
-  CORBA_LocalInterfaceDef_ptr operator-> (void);
-
-private:
-  CORBA_LocalInterfaceDef_ptr &ptr_;
-};
+    class TAO_IFR_Client_Export CORBA_LocalInterfaceDef_out
+    {
+    public:
+      CORBA_LocalInterfaceDef_out (CORBA_LocalInterfaceDef_ptr &);
+      CORBA_LocalInterfaceDef_out (CORBA_LocalInterfaceDef_var &);
+      CORBA_LocalInterfaceDef_out (const CORBA_LocalInterfaceDef_out &);
+      CORBA_LocalInterfaceDef_out &operator= (const CORBA_LocalInterfaceDef_out &);
+      CORBA_LocalInterfaceDef_out &operator= (const CORBA_LocalInterfaceDef_var &);
+      CORBA_LocalInterfaceDef_out &operator= (CORBA_LocalInterfaceDef_ptr);
+      operator CORBA_LocalInterfaceDef_ptr &();
+      CORBA_LocalInterfaceDef_ptr &ptr (void);
+      CORBA_LocalInterfaceDef_ptr operator-> (void);
+
+    private:
+      CORBA_LocalInterfaceDef_ptr &ptr_;
+    };
 
 
 #endif /* end #if !defined */
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_LOCALINTERFACEDEFSEQ_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_LOCALINTERFACEDEFSEQ_CH_
 
-  class _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    // = Initialization and termination methods.
-    
-    _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (CORBA::ULong maximum,
-      CORBA::ULong length,
-      CORBA_LocalInterfaceDef* *value,
-      CORBA::Boolean release = 0);
-    _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq &rhs);
-    virtual ~_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq &rhs);
-    TAO_Object_Manager<CORBA_LocalInterfaceDef,CORBA_LocalInterfaceDef_var> operator[] (CORBA::ULong index) const;
-    static CORBA_LocalInterfaceDef **allocbuf (CORBA::ULong nelems);
-    static void freebuf (CORBA_LocalInterfaceDef **buffer);
-    // The Base_Sequence functions, please see tao/Sequence.h
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    CORBA_LocalInterfaceDef* *get_buffer (CORBA::Boolean orphan = 0);
-    const CORBA_LocalInterfaceDef* *get_buffer (void) const;
-    virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-    virtual void _downcast (
-        void* target,
-        CORBA_Object *src,
-        CORBA_Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    virtual CORBA_Object* _upcast (void *src) const;
-    
-  };
+    class _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq
+      : public TAO_Unbounded_Base_Sequence
+    {
+    public:
+      // = Initialization and termination methods.
+      _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (void);
+      _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (CORBA::ULong maximum);
+      _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (
+          CORBA::ULong maximum,
+          CORBA::ULong length,
+          CORBA_LocalInterfaceDef* *value,
+          CORBA::Boolean release = 0
+        );
+      _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (
+          const _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq &rhs
+        );
+      _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq &operator= (
+          const _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq &rhs
+        );
+      virtual ~_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (void);
+
+      // = Accessors.
+      TAO_Object_Manager<CORBA_LocalInterfaceDef,CORBA_LocalInterfaceDef_var> operator[] (CORBA::ULong index) const;
+
+      // = Static operations.
+      static CORBA_LocalInterfaceDef **allocbuf (CORBA::ULong nelems);
+      static void freebuf (CORBA_LocalInterfaceDef **buffer);
+
+      // Implement the TAO_Base_Sequence methods (see Sequence.h)
+      virtual void _allocate_buffer (CORBA::ULong length);
+      virtual void _deallocate_buffer (void);
+      CORBA_LocalInterfaceDef* *get_buffer (CORBA::Boolean orphan = 0);
+      const CORBA_LocalInterfaceDef* *get_buffer (void) const;
+      virtual void _shrink_buffer (
+          CORBA::ULong nl,
+          CORBA::ULong ol
+        );
+
+      virtual void _downcast (
+          void* target,
+          CORBA_Object *src,
+          CORBA_Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        );
+      virtual CORBA_Object* _upcast (void *src) const;
+    };
 
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_LOCALINTERFACEDEFSEQ_CH_)
 #define _CORBA_LOCALINTERFACEDEFSEQ_CH_
 
-class CORBA_LocalInterfaceDefSeq;
-class CORBA_LocalInterfaceDefSeq_var;
+    class CORBA_LocalInterfaceDefSeq;
+    class CORBA_LocalInterfaceDefSeq_var;
 
-// *************************************************************
-// CORBA_LocalInterfaceDefSeq
-// *************************************************************
+    // *************************************************************
+    // CORBA_LocalInterfaceDefSeq
+    // *************************************************************
 
-class TAO_IFR_Client_Export CORBA_LocalInterfaceDefSeq : public 
+    class TAO_IFR_Client_Export CORBA_LocalInterfaceDefSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq
+    _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA_LocalInterfaceDef,CORBA_LocalInterfaceDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-{
-public:
-  CORBA_LocalInterfaceDefSeq (void); // default ctor
-  CORBA_LocalInterfaceDefSeq (CORBA::ULong max); // uses max size
-  CORBA_LocalInterfaceDefSeq (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    CORBA_LocalInterfaceDef_ptr *buffer, 
-    CORBA::Boolean release = 0
-  );
-  CORBA_LocalInterfaceDefSeq (const CORBA_LocalInterfaceDefSeq &); // copy ctor
-  ~CORBA_LocalInterfaceDefSeq (void);
-  static void _tao_any_destructor (void*);
+    TAO_Unbounded_Object_Sequence<CORBA_LocalInterfaceDef,CORBA_LocalInterfaceDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+    {
+    public:
+      CORBA_LocalInterfaceDefSeq (void); // default ctor
+      CORBA_LocalInterfaceDefSeq (CORBA::ULong max); // uses max size
+      CORBA_LocalInterfaceDefSeq (
+          CORBA::ULong max,
+          CORBA::ULong length,
+          CORBA_LocalInterfaceDef_ptr *buffer,
+          CORBA::Boolean release = 0
+        );
+      CORBA_LocalInterfaceDefSeq (const CORBA_LocalInterfaceDefSeq &); // copy ctor
+      ~CORBA_LocalInterfaceDefSeq (void);
+      static void _tao_any_destructor (void*);
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_LocalInterfaceDefSeq_var _var_type;
+      typedef CORBA_LocalInterfaceDefSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-};
+
+    };
 
 #endif /* end #if !defined */
 
@@ -2859,40 +2994,40 @@ public:
 #if !defined (_CORBA_LOCALINTERFACEDEFSEQ___VAR_CH_)
 #define _CORBA_LOCALINTERFACEDEFSEQ___VAR_CH_
 
-// *************************************************************
-// class CORBA_LocalInterfaceDefSeq_var
-// *************************************************************
+    // *************************************************************
+    // class CORBA_LocalInterfaceDefSeq_var
+    // *************************************************************
 
-class TAO_IFR_Client_Export CORBA_LocalInterfaceDefSeq_var
-{
-public:
-  CORBA_LocalInterfaceDefSeq_var (void); // default constructor
-  CORBA_LocalInterfaceDefSeq_var (CORBA_LocalInterfaceDefSeq *);
-  CORBA_LocalInterfaceDefSeq_var (const CORBA_LocalInterfaceDefSeq_var &); // copy constructor
-  ~CORBA_LocalInterfaceDefSeq_var (void); // destructor
-  
-  CORBA_LocalInterfaceDefSeq_var &operator= (CORBA_LocalInterfaceDefSeq *);
-  CORBA_LocalInterfaceDefSeq_var &operator= (const CORBA_LocalInterfaceDefSeq_var &);
-  CORBA_LocalInterfaceDefSeq *operator-> (void);
-  const CORBA_LocalInterfaceDefSeq *operator-> (void) const;
-  
-  operator const CORBA_LocalInterfaceDefSeq &() const;
-  operator CORBA_LocalInterfaceDefSeq &();
-  operator CORBA_LocalInterfaceDefSeq &() const;
-  operator CORBA_LocalInterfaceDefSeq *&(); // variable-size base types only
-  
-  TAO_Object_Manager<CORBA_LocalInterfaceDef, CORBA_LocalInterfaceDef_var> operator[] (CORBA::ULong index);
-  
-  // in, inout, out, _retn 
-  const CORBA_LocalInterfaceDefSeq &in (void) const;
-  CORBA_LocalInterfaceDefSeq &inout (void);
-  CORBA_LocalInterfaceDefSeq *&out (void);
-  CORBA_LocalInterfaceDefSeq *_retn (void);
-  CORBA_LocalInterfaceDefSeq *ptr (void) const;
-
-private:
-  CORBA_LocalInterfaceDefSeq *ptr_;
-};
+    class TAO_IFR_Client_Export CORBA_LocalInterfaceDefSeq_var
+    {
+    public:
+      CORBA_LocalInterfaceDefSeq_var (void);
+      CORBA_LocalInterfaceDefSeq_var (CORBA_LocalInterfaceDefSeq *);
+      CORBA_LocalInterfaceDefSeq_var (const CORBA_LocalInterfaceDefSeq_var &);
+      ~CORBA_LocalInterfaceDefSeq_var (void);
+
+      CORBA_LocalInterfaceDefSeq_var &operator= (CORBA_LocalInterfaceDefSeq *);
+      CORBA_LocalInterfaceDefSeq_var &operator= (const CORBA_LocalInterfaceDefSeq_var &);
+      CORBA_LocalInterfaceDefSeq *operator-> (void);
+      const CORBA_LocalInterfaceDefSeq *operator-> (void) const;
+
+      operator const CORBA_LocalInterfaceDefSeq &() const;
+      operator CORBA_LocalInterfaceDefSeq &();
+      operator CORBA_LocalInterfaceDefSeq &() const;
+      operator CORBA_LocalInterfaceDefSeq *&(); // variable-size base types only
+
+      TAO_Object_Manager<CORBA_LocalInterfaceDef, CORBA_LocalInterfaceDef_var> operator[] (CORBA::ULong index);
+
+      // in, inout, out, _retn
+      const CORBA_LocalInterfaceDefSeq &in (void) const;
+      CORBA_LocalInterfaceDefSeq &inout (void);
+      CORBA_LocalInterfaceDefSeq *&out (void);
+      CORBA_LocalInterfaceDefSeq *_retn (void);
+      CORBA_LocalInterfaceDefSeq *ptr (void) const;
+
+    private:
+      CORBA_LocalInterfaceDefSeq *ptr_;
+    };
 
 
 #endif /* end #if !defined */
@@ -2901,170 +3036,183 @@ private:
 #if !defined (_CORBA_LOCALINTERFACEDEFSEQ___OUT_CH_)
 #define _CORBA_LOCALINTERFACEDEFSEQ___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_LocalInterfaceDefSeq_out
-{
-public:
-  CORBA_LocalInterfaceDefSeq_out (CORBA_LocalInterfaceDefSeq *&);
-  CORBA_LocalInterfaceDefSeq_out (CORBA_LocalInterfaceDefSeq_var &);
-  CORBA_LocalInterfaceDefSeq_out (const CORBA_LocalInterfaceDefSeq_out &);
-  CORBA_LocalInterfaceDefSeq_out &operator= (const CORBA_LocalInterfaceDefSeq_out &);
-  CORBA_LocalInterfaceDefSeq_out &operator= (CORBA_LocalInterfaceDefSeq *);
-  operator CORBA_LocalInterfaceDefSeq *&();
-  CORBA_LocalInterfaceDefSeq *&ptr (void);
-  CORBA_LocalInterfaceDefSeq *operator-> (void);
-  TAO_Object_Manager<CORBA_LocalInterfaceDef, CORBA_LocalInterfaceDef_var> operator[] (CORBA::ULong index);
-  
-private:
-  CORBA_LocalInterfaceDefSeq *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_LocalInterfaceDefSeq_var &);
-};
+    class TAO_IFR_Client_Export CORBA_LocalInterfaceDefSeq_out
+    {
+    public:
+      CORBA_LocalInterfaceDefSeq_out (CORBA_LocalInterfaceDefSeq *&);
+      CORBA_LocalInterfaceDefSeq_out (CORBA_LocalInterfaceDefSeq_var &);
+      CORBA_LocalInterfaceDefSeq_out (const CORBA_LocalInterfaceDefSeq_out &);
+      CORBA_LocalInterfaceDefSeq_out &operator= (const CORBA_LocalInterfaceDefSeq_out &);
+      CORBA_LocalInterfaceDefSeq_out &operator= (CORBA_LocalInterfaceDefSeq *);
+      operator CORBA_LocalInterfaceDefSeq *&();
+      CORBA_LocalInterfaceDefSeq *&ptr (void);
+      CORBA_LocalInterfaceDefSeq *operator-> (void);
+      TAO_Object_Manager<CORBA_LocalInterfaceDef, CORBA_LocalInterfaceDef_var> operator[] (CORBA::ULong index);
+
+    private:
+      CORBA_LocalInterfaceDefSeq *&ptr_;
+      // Assignment from T_var not allowed.
+      void operator= (const CORBA_LocalInterfaceDefSeq_var &);
+    };
 
 
 #endif /* end #if !defined */
 
-struct CORBA_StructMember;
-class CORBA_StructMember_var;
+    struct CORBA_StructMember;
+    class CORBA_StructMember_var;
 
-struct TAO_IFR_Client_Export CORBA_StructMember
-{
+    struct TAO_IFR_Client_Export CORBA_StructMember
+    {
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_StructMember_var _var_type;
+      typedef CORBA_StructMember_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-  static void _tao_any_destructor (void*);
+      static void _tao_any_destructor (void*);
 
-  TAO_String_Manager name;
-  CORBA::TypeCode_var type;
-  CORBA_IDLType_var type_def;
-};
+      TAO_String_Manager name;
+      CORBA::TypeCode_var type;
+      CORBA_IDLType_var type_def;
 
-class TAO_IFR_Client_Export CORBA_StructMember_var
-{
-public:
-  CORBA_StructMember_var (void); // default constructor
-  CORBA_StructMember_var (CORBA_StructMember *);
-  CORBA_StructMember_var (const CORBA_StructMember_var &); // copy constructor
-  ~CORBA_StructMember_var (void); // destructor
-  
-  CORBA_StructMember_var &operator= (CORBA_StructMember *);
-  CORBA_StructMember_var &operator= (const CORBA_StructMember_var &);
-  CORBA_StructMember *operator-> (void);
-  const CORBA_StructMember *operator-> (void) const;
-  
-  operator const CORBA_StructMember &() const;
-  operator CORBA_StructMember &();
-  operator CORBA_StructMember &() const;
-  operator CORBA_StructMember *&(); // variable-size types only
-  
-  // in, inout, out, _retn 
-  const CORBA_StructMember &in (void) const;
-  CORBA_StructMember &inout (void);
-  CORBA_StructMember *&out (void);
-  CORBA_StructMember *_retn (void);
-  CORBA_StructMember *ptr (void) const;
+    };
 
-private:
-  CORBA_StructMember *ptr_;
-};
+    class TAO_IFR_Client_Export CORBA_StructMember_var
+    {
+    public:
+      CORBA_StructMember_var (void);
+      CORBA_StructMember_var (CORBA_StructMember *);
+      CORBA_StructMember_var (const CORBA_StructMember_var &);
+      ~CORBA_StructMember_var (void);
+
+      CORBA_StructMember_var &operator= (CORBA_StructMember *);
+      CORBA_StructMember_var &operator= (const CORBA_StructMember_var &);
+      CORBA_StructMember *operator-> (void);
+      const CORBA_StructMember *operator-> (void) const;
+
+      operator const CORBA_StructMember &() const;
+      operator CORBA_StructMember &();
+      operator CORBA_StructMember &() const;
+      // Variable-size types only.
+      operator CORBA_StructMember *&();
+
+      // in, inout, out, _retn
+      const CORBA_StructMember &in (void) const;
+      CORBA_StructMember &inout (void);
+      CORBA_StructMember *&out (void);
+      CORBA_StructMember *_retn (void);
+      CORBA_StructMember *ptr (void) const;
+
+    private:
+      CORBA_StructMember *ptr_;
+    };
 
-class TAO_IFR_Client_Export CORBA_StructMember_out
-{
-public:
-  CORBA_StructMember_out (CORBA_StructMember *&);
-  CORBA_StructMember_out (CORBA_StructMember_var &);
-  CORBA_StructMember_out (const CORBA_StructMember_out &);
-  CORBA_StructMember_out &operator= (const CORBA_StructMember_out &);
-  CORBA_StructMember_out &operator= (CORBA_StructMember *);
-  operator CORBA_StructMember *&();
-  CORBA_StructMember *&ptr (void);
-  CORBA_StructMember *operator-> (void);
-  
-private:
-  CORBA_StructMember *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_StructMember_var &);
-};
+    class TAO_IFR_Client_Export CORBA_StructMember_out
+    {
+    public:
+      CORBA_StructMember_out (CORBA_StructMember *&);
+      CORBA_StructMember_out (CORBA_StructMember_var &);
+      CORBA_StructMember_out (const CORBA_StructMember_out &);
+      CORBA_StructMember_out &operator= (const CORBA_StructMember_out &);
+      CORBA_StructMember_out &operator= (CORBA_StructMember *);
+      operator CORBA_StructMember *&();
+      CORBA_StructMember *&ptr (void);
+      CORBA_StructMember *operator-> (void);
+
+    private:
+      CORBA_StructMember *&ptr_;
+      // Assignment from T_var not allowed.
+      void operator= (const CORBA_StructMember_var &);
+    };
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_STRUCTMEMBERSEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_STRUCTMEMBERSEQ_CH_
 
-  class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_StructMemberSeq : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    // = Initialization and termination methods.
-    
-    _TAO_Unbounded_Sequence_CORBA_StructMemberSeq (void); // Default constructor.
-    _TAO_Unbounded_Sequence_CORBA_StructMemberSeq (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_CORBA_StructMemberSeq (CORBA::ULong maximum,
-      CORBA::ULong length,
-      CORBA_StructMember *data,
-      CORBA::Boolean release = 0);
-    _TAO_Unbounded_Sequence_CORBA_StructMemberSeq (const _TAO_Unbounded_Sequence_CORBA_StructMemberSeq &rhs);
-    _TAO_Unbounded_Sequence_CORBA_StructMemberSeq &operator= (const _TAO_Unbounded_Sequence_CORBA_StructMemberSeq &rhs);
-    virtual ~_TAO_Unbounded_Sequence_CORBA_StructMemberSeq (void); // Dtor.
-    // = Accessors.
-    CORBA_StructMember &operator[] (CORBA::ULong i);
-    const CORBA_StructMember &operator[] (CORBA::ULong i) const;
-    // = Static operations.
-    static CORBA_StructMember *allocbuf (CORBA::ULong size);
-    static void freebuf (CORBA_StructMember *buffer);
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    
-    CORBA_StructMember *get_buffer (CORBA::Boolean orphan = 0);
-    const CORBA_StructMember *get_buffer (void) const;
-    void replace (CORBA::ULong max,
-      CORBA::ULong length,
-      CORBA_StructMember *data,
-      CORBA::Boolean release);
-  };
+    class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_StructMemberSeq
+      : public TAO_Unbounded_Base_Sequence
+    {
+    public:
+      // = Initialization and termination methods.
+      _TAO_Unbounded_Sequence_CORBA_StructMemberSeq (void);
+      _TAO_Unbounded_Sequence_CORBA_StructMemberSeq (CORBA::ULong maximum);
+      _TAO_Unbounded_Sequence_CORBA_StructMemberSeq (
+          CORBA::ULong maximum,
+          CORBA::ULong length,
+          CORBA_StructMember *data,
+          CORBA::Boolean release = 0
+        );
+      _TAO_Unbounded_Sequence_CORBA_StructMemberSeq (
+          const _TAO_Unbounded_Sequence_CORBA_StructMemberSeq &rhs
+        );
+      _TAO_Unbounded_Sequence_CORBA_StructMemberSeq &operator= (
+          const _TAO_Unbounded_Sequence_CORBA_StructMemberSeq &rhs
+        );
+      virtual ~_TAO_Unbounded_Sequence_CORBA_StructMemberSeq (void);
+
+      // = Accessors.
+      CORBA_StructMember &operator[] (CORBA::ULong i);
+      const CORBA_StructMember &operator[] (CORBA::ULong i) const;
+
+      // = Static operations.
+      static CORBA_StructMember *allocbuf (CORBA::ULong size);
+      static void freebuf (CORBA_StructMember *buffer);
+
+      // Implement the TAO_Base_Sequence methods (see Sequence.h)
+      virtual void _allocate_buffer (CORBA::ULong length);
+      virtual void _deallocate_buffer (void);
+      CORBA_StructMember *get_buffer (CORBA::Boolean orphan = 0);
+      const CORBA_StructMember *get_buffer (void) const;
+      void replace (
+          CORBA::ULong max,
+          CORBA::ULong length,
+          CORBA_StructMember *data,
+          CORBA::Boolean release
+        );
+    };
 
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_STRUCTMEMBERSEQ_CH_)
 #define _CORBA_STRUCTMEMBERSEQ_CH_
 
-class CORBA_StructMemberSeq;
-class CORBA_StructMemberSeq_var;
+    class CORBA_StructMemberSeq;
+    class CORBA_StructMemberSeq_var;
 
-// *************************************************************
-// CORBA_StructMemberSeq
-// *************************************************************
+    // *************************************************************
+    // CORBA_StructMemberSeq
+    // *************************************************************
 
-class TAO_IFR_Client_Export CORBA_StructMemberSeq : public 
+    class TAO_IFR_Client_Export CORBA_StructMemberSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq
+    _TAO_Unbounded_Sequence_CORBA_StructMemberSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_StructMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-{
-public:
-  CORBA_StructMemberSeq (void); // default ctor
-  CORBA_StructMemberSeq (CORBA::ULong max); // uses max size
-  CORBA_StructMemberSeq (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    CORBA_StructMember *buffer, 
-    CORBA::Boolean release = 0
-  );
-  CORBA_StructMemberSeq (const CORBA_StructMemberSeq &); // copy ctor
-  ~CORBA_StructMemberSeq (void);
-  static void _tao_any_destructor (void*);
+    TAO_Unbounded_Sequence<CORBA_StructMember>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+    {
+    public:
+      CORBA_StructMemberSeq (void); // default ctor
+      CORBA_StructMemberSeq (CORBA::ULong max); // uses max size
+      CORBA_StructMemberSeq (
+          CORBA::ULong max,
+          CORBA::ULong length,
+          CORBA_StructMember *buffer,
+          CORBA::Boolean release = 0
+        );
+      CORBA_StructMemberSeq (const CORBA_StructMemberSeq &); // copy ctor
+      ~CORBA_StructMemberSeq (void);
+      static void _tao_any_destructor (void*);
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_StructMemberSeq_var _var_type;
+      typedef CORBA_StructMemberSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-};
+
+    };
 
 #endif /* end #if !defined */
 
@@ -3072,41 +3220,41 @@ public:
 #if !defined (_CORBA_STRUCTMEMBERSEQ___VAR_CH_)
 #define _CORBA_STRUCTMEMBERSEQ___VAR_CH_
 
-// *************************************************************
-// class CORBA_StructMemberSeq_var
-// *************************************************************
-
-class TAO_IFR_Client_Export CORBA_StructMemberSeq_var
-{
-public:
-  CORBA_StructMemberSeq_var (void); // default constructor
-  CORBA_StructMemberSeq_var (CORBA_StructMemberSeq *);
-  CORBA_StructMemberSeq_var (const CORBA_StructMemberSeq_var &); // copy constructor
-  ~CORBA_StructMemberSeq_var (void); // destructor
-  
-  CORBA_StructMemberSeq_var &operator= (CORBA_StructMemberSeq *);
-  CORBA_StructMemberSeq_var &operator= (const CORBA_StructMemberSeq_var &);
-  CORBA_StructMemberSeq *operator-> (void);
-  const CORBA_StructMemberSeq *operator-> (void) const;
-  
-  operator const CORBA_StructMemberSeq &() const;
-  operator CORBA_StructMemberSeq &();
-  operator CORBA_StructMemberSeq &() const;
-  operator CORBA_StructMemberSeq *&(); // variable-size base types only
-  
-  CORBA_StructMember & operator[] (CORBA::ULong index);
-  const CORBA_StructMember & operator[] (CORBA::ULong index) const;
-  
-  // in, inout, out, _retn 
-  const CORBA_StructMemberSeq &in (void) const;
-  CORBA_StructMemberSeq &inout (void);
-  CORBA_StructMemberSeq *&out (void);
-  CORBA_StructMemberSeq *_retn (void);
-  CORBA_StructMemberSeq *ptr (void) const;
+    // *************************************************************
+    // class CORBA_StructMemberSeq_var
+    // *************************************************************
 
-private:
-  CORBA_StructMemberSeq *ptr_;
-};
+    class TAO_IFR_Client_Export CORBA_StructMemberSeq_var
+    {
+    public:
+      CORBA_StructMemberSeq_var (void);
+      CORBA_StructMemberSeq_var (CORBA_StructMemberSeq *);
+      CORBA_StructMemberSeq_var (const CORBA_StructMemberSeq_var &);
+      ~CORBA_StructMemberSeq_var (void);
+
+      CORBA_StructMemberSeq_var &operator= (CORBA_StructMemberSeq *);
+      CORBA_StructMemberSeq_var &operator= (const CORBA_StructMemberSeq_var &);
+      CORBA_StructMemberSeq *operator-> (void);
+      const CORBA_StructMemberSeq *operator-> (void) const;
+
+      operator const CORBA_StructMemberSeq &() const;
+      operator CORBA_StructMemberSeq &();
+      operator CORBA_StructMemberSeq &() const;
+      operator CORBA_StructMemberSeq *&(); // variable-size base types only
+
+      CORBA_StructMember & operator[] (CORBA::ULong index);
+      const CORBA_StructMember & operator[] (CORBA::ULong index) const;
+
+      // in, inout, out, _retn
+      const CORBA_StructMemberSeq &in (void) const;
+      CORBA_StructMemberSeq &inout (void);
+      CORBA_StructMemberSeq *&out (void);
+      CORBA_StructMemberSeq *_retn (void);
+      CORBA_StructMemberSeq *ptr (void) const;
+
+    private:
+      CORBA_StructMemberSeq *ptr_;
+    };
 
 
 #endif /* end #if !defined */
@@ -3115,169 +3263,182 @@ private:
 #if !defined (_CORBA_STRUCTMEMBERSEQ___OUT_CH_)
 #define _CORBA_STRUCTMEMBERSEQ___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_StructMemberSeq_out
-{
-public:
-  CORBA_StructMemberSeq_out (CORBA_StructMemberSeq *&);
-  CORBA_StructMemberSeq_out (CORBA_StructMemberSeq_var &);
-  CORBA_StructMemberSeq_out (const CORBA_StructMemberSeq_out &);
-  CORBA_StructMemberSeq_out &operator= (const CORBA_StructMemberSeq_out &);
-  CORBA_StructMemberSeq_out &operator= (CORBA_StructMemberSeq *);
-  operator CORBA_StructMemberSeq *&();
-  CORBA_StructMemberSeq *&ptr (void);
-  CORBA_StructMemberSeq *operator-> (void);
-  CORBA_StructMember & operator[] (CORBA::ULong index);
-  
-private:
-  CORBA_StructMemberSeq *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_StructMemberSeq_var &);
-};
+    class TAO_IFR_Client_Export CORBA_StructMemberSeq_out
+    {
+    public:
+      CORBA_StructMemberSeq_out (CORBA_StructMemberSeq *&);
+      CORBA_StructMemberSeq_out (CORBA_StructMemberSeq_var &);
+      CORBA_StructMemberSeq_out (const CORBA_StructMemberSeq_out &);
+      CORBA_StructMemberSeq_out &operator= (const CORBA_StructMemberSeq_out &);
+      CORBA_StructMemberSeq_out &operator= (CORBA_StructMemberSeq *);
+      operator CORBA_StructMemberSeq *&();
+      CORBA_StructMemberSeq *&ptr (void);
+      CORBA_StructMemberSeq *operator-> (void);
+      CORBA_StructMember & operator[] (CORBA::ULong index);
+
+    private:
+      CORBA_StructMemberSeq *&ptr_;
+      // Assignment from T_var not allowed.
+      void operator= (const CORBA_StructMemberSeq_var &);
+    };
 
 
 #endif /* end #if !defined */
 
-struct CORBA_Initializer;
-class CORBA_Initializer_var;
+    struct CORBA_Initializer;
+    class CORBA_Initializer_var;
 
-struct TAO_IFR_Client_Export CORBA_Initializer
-{
+    struct TAO_IFR_Client_Export CORBA_Initializer
+    {
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_Initializer_var _var_type;
+      typedef CORBA_Initializer_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-  static void _tao_any_destructor (void*);
+      static void _tao_any_destructor (void*);
 
-  CORBA_StructMemberSeq members;
-  TAO_String_Manager name;
-};
+      CORBA_StructMemberSeq members;
+      TAO_String_Manager name;
 
-class TAO_IFR_Client_Export CORBA_Initializer_var
-{
-public:
-  CORBA_Initializer_var (void); // default constructor
-  CORBA_Initializer_var (CORBA_Initializer *);
-  CORBA_Initializer_var (const CORBA_Initializer_var &); // copy constructor
-  ~CORBA_Initializer_var (void); // destructor
-  
-  CORBA_Initializer_var &operator= (CORBA_Initializer *);
-  CORBA_Initializer_var &operator= (const CORBA_Initializer_var &);
-  CORBA_Initializer *operator-> (void);
-  const CORBA_Initializer *operator-> (void) const;
-  
-  operator const CORBA_Initializer &() const;
-  operator CORBA_Initializer &();
-  operator CORBA_Initializer &() const;
-  operator CORBA_Initializer *&(); // variable-size types only
-  
-  // in, inout, out, _retn 
-  const CORBA_Initializer &in (void) const;
-  CORBA_Initializer &inout (void);
-  CORBA_Initializer *&out (void);
-  CORBA_Initializer *_retn (void);
-  CORBA_Initializer *ptr (void) const;
+    };
 
-private:
-  CORBA_Initializer *ptr_;
-};
+    class TAO_IFR_Client_Export CORBA_Initializer_var
+    {
+    public:
+      CORBA_Initializer_var (void);
+      CORBA_Initializer_var (CORBA_Initializer *);
+      CORBA_Initializer_var (const CORBA_Initializer_var &);
+      ~CORBA_Initializer_var (void);
+
+      CORBA_Initializer_var &operator= (CORBA_Initializer *);
+      CORBA_Initializer_var &operator= (const CORBA_Initializer_var &);
+      CORBA_Initializer *operator-> (void);
+      const CORBA_Initializer *operator-> (void) const;
+
+      operator const CORBA_Initializer &() const;
+      operator CORBA_Initializer &();
+      operator CORBA_Initializer &() const;
+      // Variable-size types only.
+      operator CORBA_Initializer *&();
+
+      // in, inout, out, _retn
+      const CORBA_Initializer &in (void) const;
+      CORBA_Initializer &inout (void);
+      CORBA_Initializer *&out (void);
+      CORBA_Initializer *_retn (void);
+      CORBA_Initializer *ptr (void) const;
+
+    private:
+      CORBA_Initializer *ptr_;
+    };
 
-class TAO_IFR_Client_Export CORBA_Initializer_out
-{
-public:
-  CORBA_Initializer_out (CORBA_Initializer *&);
-  CORBA_Initializer_out (CORBA_Initializer_var &);
-  CORBA_Initializer_out (const CORBA_Initializer_out &);
-  CORBA_Initializer_out &operator= (const CORBA_Initializer_out &);
-  CORBA_Initializer_out &operator= (CORBA_Initializer *);
-  operator CORBA_Initializer *&();
-  CORBA_Initializer *&ptr (void);
-  CORBA_Initializer *operator-> (void);
-  
-private:
-  CORBA_Initializer *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_Initializer_var &);
-};
+    class TAO_IFR_Client_Export CORBA_Initializer_out
+    {
+    public:
+      CORBA_Initializer_out (CORBA_Initializer *&);
+      CORBA_Initializer_out (CORBA_Initializer_var &);
+      CORBA_Initializer_out (const CORBA_Initializer_out &);
+      CORBA_Initializer_out &operator= (const CORBA_Initializer_out &);
+      CORBA_Initializer_out &operator= (CORBA_Initializer *);
+      operator CORBA_Initializer *&();
+      CORBA_Initializer *&ptr (void);
+      CORBA_Initializer *operator-> (void);
+
+    private:
+      CORBA_Initializer *&ptr_;
+      // Assignment from T_var not allowed.
+      void operator= (const CORBA_Initializer_var &);
+    };
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_INITIALIZERSEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_INITIALIZERSEQ_CH_
 
-  class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_InitializerSeq : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    // = Initialization and termination methods.
-    
-    _TAO_Unbounded_Sequence_CORBA_InitializerSeq (void); // Default constructor.
-    _TAO_Unbounded_Sequence_CORBA_InitializerSeq (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_CORBA_InitializerSeq (CORBA::ULong maximum,
-      CORBA::ULong length,
-      CORBA_Initializer *data,
-      CORBA::Boolean release = 0);
-    _TAO_Unbounded_Sequence_CORBA_InitializerSeq (const _TAO_Unbounded_Sequence_CORBA_InitializerSeq &rhs);
-    _TAO_Unbounded_Sequence_CORBA_InitializerSeq &operator= (const _TAO_Unbounded_Sequence_CORBA_InitializerSeq &rhs);
-    virtual ~_TAO_Unbounded_Sequence_CORBA_InitializerSeq (void); // Dtor.
-    // = Accessors.
-    CORBA_Initializer &operator[] (CORBA::ULong i);
-    const CORBA_Initializer &operator[] (CORBA::ULong i) const;
-    // = Static operations.
-    static CORBA_Initializer *allocbuf (CORBA::ULong size);
-    static void freebuf (CORBA_Initializer *buffer);
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    
-    CORBA_Initializer *get_buffer (CORBA::Boolean orphan = 0);
-    const CORBA_Initializer *get_buffer (void) const;
-    void replace (CORBA::ULong max,
-      CORBA::ULong length,
-      CORBA_Initializer *data,
-      CORBA::Boolean release);
-  };
+    class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_InitializerSeq
+      : public TAO_Unbounded_Base_Sequence
+    {
+    public:
+      // = Initialization and termination methods.
+      _TAO_Unbounded_Sequence_CORBA_InitializerSeq (void);
+      _TAO_Unbounded_Sequence_CORBA_InitializerSeq (CORBA::ULong maximum);
+      _TAO_Unbounded_Sequence_CORBA_InitializerSeq (
+          CORBA::ULong maximum,
+          CORBA::ULong length,
+          CORBA_Initializer *data,
+          CORBA::Boolean release = 0
+        );
+      _TAO_Unbounded_Sequence_CORBA_InitializerSeq (
+          const _TAO_Unbounded_Sequence_CORBA_InitializerSeq &rhs
+        );
+      _TAO_Unbounded_Sequence_CORBA_InitializerSeq &operator= (
+          const _TAO_Unbounded_Sequence_CORBA_InitializerSeq &rhs
+        );
+      virtual ~_TAO_Unbounded_Sequence_CORBA_InitializerSeq (void);
+
+      // = Accessors.
+      CORBA_Initializer &operator[] (CORBA::ULong i);
+      const CORBA_Initializer &operator[] (CORBA::ULong i) const;
+
+      // = Static operations.
+      static CORBA_Initializer *allocbuf (CORBA::ULong size);
+      static void freebuf (CORBA_Initializer *buffer);
+
+      // Implement the TAO_Base_Sequence methods (see Sequence.h)
+      virtual void _allocate_buffer (CORBA::ULong length);
+      virtual void _deallocate_buffer (void);
+      CORBA_Initializer *get_buffer (CORBA::Boolean orphan = 0);
+      const CORBA_Initializer *get_buffer (void) const;
+      void replace (
+          CORBA::ULong max,
+          CORBA::ULong length,
+          CORBA_Initializer *data,
+          CORBA::Boolean release
+        );
+    };
 
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_INITIALIZERSEQ_CH_)
 #define _CORBA_INITIALIZERSEQ_CH_
 
-class CORBA_InitializerSeq;
-class CORBA_InitializerSeq_var;
+    class CORBA_InitializerSeq;
+    class CORBA_InitializerSeq_var;
 
-// *************************************************************
-// CORBA_InitializerSeq
-// *************************************************************
+    // *************************************************************
+    // CORBA_InitializerSeq
+    // *************************************************************
 
-class TAO_IFR_Client_Export CORBA_InitializerSeq : public 
+    class TAO_IFR_Client_Export CORBA_InitializerSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq
+    _TAO_Unbounded_Sequence_CORBA_InitializerSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_Initializer>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-{
-public:
-  CORBA_InitializerSeq (void); // default ctor
-  CORBA_InitializerSeq (CORBA::ULong max); // uses max size
-  CORBA_InitializerSeq (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    CORBA_Initializer *buffer, 
-    CORBA::Boolean release = 0
-  );
-  CORBA_InitializerSeq (const CORBA_InitializerSeq &); // copy ctor
-  ~CORBA_InitializerSeq (void);
-  static void _tao_any_destructor (void*);
+    TAO_Unbounded_Sequence<CORBA_Initializer>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+    {
+    public:
+      CORBA_InitializerSeq (void); // default ctor
+      CORBA_InitializerSeq (CORBA::ULong max); // uses max size
+      CORBA_InitializerSeq (
+          CORBA::ULong max,
+          CORBA::ULong length,
+          CORBA_Initializer *buffer,
+          CORBA::Boolean release = 0
+        );
+      CORBA_InitializerSeq (const CORBA_InitializerSeq &); // copy ctor
+      ~CORBA_InitializerSeq (void);
+      static void _tao_any_destructor (void*);
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_InitializerSeq_var _var_type;
+      typedef CORBA_InitializerSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-};
+
+    };
 
 #endif /* end #if !defined */
 
@@ -3285,41 +3446,41 @@ public:
 #if !defined (_CORBA_INITIALIZERSEQ___VAR_CH_)
 #define _CORBA_INITIALIZERSEQ___VAR_CH_
 
-// *************************************************************
-// class CORBA_InitializerSeq_var
-// *************************************************************
+    // *************************************************************
+    // class CORBA_InitializerSeq_var
+    // *************************************************************
 
-class TAO_IFR_Client_Export CORBA_InitializerSeq_var
-{
-public:
-  CORBA_InitializerSeq_var (void); // default constructor
-  CORBA_InitializerSeq_var (CORBA_InitializerSeq *);
-  CORBA_InitializerSeq_var (const CORBA_InitializerSeq_var &); // copy constructor
-  ~CORBA_InitializerSeq_var (void); // destructor
-  
-  CORBA_InitializerSeq_var &operator= (CORBA_InitializerSeq *);
-  CORBA_InitializerSeq_var &operator= (const CORBA_InitializerSeq_var &);
-  CORBA_InitializerSeq *operator-> (void);
-  const CORBA_InitializerSeq *operator-> (void) const;
-  
-  operator const CORBA_InitializerSeq &() const;
-  operator CORBA_InitializerSeq &();
-  operator CORBA_InitializerSeq &() const;
-  operator CORBA_InitializerSeq *&(); // variable-size base types only
-  
-  CORBA_Initializer & operator[] (CORBA::ULong index);
-  const CORBA_Initializer & operator[] (CORBA::ULong index) const;
-  
-  // in, inout, out, _retn 
-  const CORBA_InitializerSeq &in (void) const;
-  CORBA_InitializerSeq &inout (void);
-  CORBA_InitializerSeq *&out (void);
-  CORBA_InitializerSeq *_retn (void);
-  CORBA_InitializerSeq *ptr (void) const;
-
-private:
-  CORBA_InitializerSeq *ptr_;
-};
+    class TAO_IFR_Client_Export CORBA_InitializerSeq_var
+    {
+    public:
+      CORBA_InitializerSeq_var (void);
+      CORBA_InitializerSeq_var (CORBA_InitializerSeq *);
+      CORBA_InitializerSeq_var (const CORBA_InitializerSeq_var &);
+      ~CORBA_InitializerSeq_var (void);
+
+      CORBA_InitializerSeq_var &operator= (CORBA_InitializerSeq *);
+      CORBA_InitializerSeq_var &operator= (const CORBA_InitializerSeq_var &);
+      CORBA_InitializerSeq *operator-> (void);
+      const CORBA_InitializerSeq *operator-> (void) const;
+
+      operator const CORBA_InitializerSeq &() const;
+      operator CORBA_InitializerSeq &();
+      operator CORBA_InitializerSeq &() const;
+      operator CORBA_InitializerSeq *&(); // variable-size base types only
+
+      CORBA_Initializer & operator[] (CORBA::ULong index);
+      const CORBA_Initializer & operator[] (CORBA::ULong index) const;
+
+      // in, inout, out, _retn
+      const CORBA_InitializerSeq &in (void) const;
+      CORBA_InitializerSeq &inout (void);
+      CORBA_InitializerSeq *&out (void);
+      CORBA_InitializerSeq *_retn (void);
+      CORBA_InitializerSeq *ptr (void) const;
+
+    private:
+      CORBA_InitializerSeq *ptr_;
+    };
 
 
 #endif /* end #if !defined */
@@ -3328,171 +3489,184 @@ private:
 #if !defined (_CORBA_INITIALIZERSEQ___OUT_CH_)
 #define _CORBA_INITIALIZERSEQ___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_InitializerSeq_out
-{
-public:
-  CORBA_InitializerSeq_out (CORBA_InitializerSeq *&);
-  CORBA_InitializerSeq_out (CORBA_InitializerSeq_var &);
-  CORBA_InitializerSeq_out (const CORBA_InitializerSeq_out &);
-  CORBA_InitializerSeq_out &operator= (const CORBA_InitializerSeq_out &);
-  CORBA_InitializerSeq_out &operator= (CORBA_InitializerSeq *);
-  operator CORBA_InitializerSeq *&();
-  CORBA_InitializerSeq *&ptr (void);
-  CORBA_InitializerSeq *operator-> (void);
-  CORBA_Initializer & operator[] (CORBA::ULong index);
-  
-private:
-  CORBA_InitializerSeq *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_InitializerSeq_var &);
-};
+    class TAO_IFR_Client_Export CORBA_InitializerSeq_out
+    {
+    public:
+      CORBA_InitializerSeq_out (CORBA_InitializerSeq *&);
+      CORBA_InitializerSeq_out (CORBA_InitializerSeq_var &);
+      CORBA_InitializerSeq_out (const CORBA_InitializerSeq_out &);
+      CORBA_InitializerSeq_out &operator= (const CORBA_InitializerSeq_out &);
+      CORBA_InitializerSeq_out &operator= (CORBA_InitializerSeq *);
+      operator CORBA_InitializerSeq *&();
+      CORBA_InitializerSeq *&ptr (void);
+      CORBA_InitializerSeq *operator-> (void);
+      CORBA_Initializer & operator[] (CORBA::ULong index);
+
+    private:
+      CORBA_InitializerSeq *&ptr_;
+      // Assignment from T_var not allowed.
+      void operator= (const CORBA_InitializerSeq_var &);
+    };
 
 
 #endif /* end #if !defined */
 
-struct CORBA_UnionMember;
-class CORBA_UnionMember_var;
+    struct CORBA_UnionMember;
+    class CORBA_UnionMember_var;
 
-struct TAO_IFR_Client_Export CORBA_UnionMember
-{
+    struct TAO_IFR_Client_Export CORBA_UnionMember
+    {
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_UnionMember_var _var_type;
+      typedef CORBA_UnionMember_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-  static void _tao_any_destructor (void*);
+      static void _tao_any_destructor (void*);
 
-  TAO_String_Manager name;
-  CORBA::Any label;
-  CORBA::TypeCode_var type;
-  CORBA_IDLType_var type_def;
-};
+      TAO_String_Manager name;
+      CORBA::Any label;
+      CORBA::TypeCode_var type;
+      CORBA_IDLType_var type_def;
 
-class TAO_IFR_Client_Export CORBA_UnionMember_var
-{
-public:
-  CORBA_UnionMember_var (void); // default constructor
-  CORBA_UnionMember_var (CORBA_UnionMember *);
-  CORBA_UnionMember_var (const CORBA_UnionMember_var &); // copy constructor
-  ~CORBA_UnionMember_var (void); // destructor
-  
-  CORBA_UnionMember_var &operator= (CORBA_UnionMember *);
-  CORBA_UnionMember_var &operator= (const CORBA_UnionMember_var &);
-  CORBA_UnionMember *operator-> (void);
-  const CORBA_UnionMember *operator-> (void) const;
-  
-  operator const CORBA_UnionMember &() const;
-  operator CORBA_UnionMember &();
-  operator CORBA_UnionMember &() const;
-  operator CORBA_UnionMember *&(); // variable-size types only
-  
-  // in, inout, out, _retn 
-  const CORBA_UnionMember &in (void) const;
-  CORBA_UnionMember &inout (void);
-  CORBA_UnionMember *&out (void);
-  CORBA_UnionMember *_retn (void);
-  CORBA_UnionMember *ptr (void) const;
+    };
 
-private:
-  CORBA_UnionMember *ptr_;
-};
+    class TAO_IFR_Client_Export CORBA_UnionMember_var
+    {
+    public:
+      CORBA_UnionMember_var (void);
+      CORBA_UnionMember_var (CORBA_UnionMember *);
+      CORBA_UnionMember_var (const CORBA_UnionMember_var &);
+      ~CORBA_UnionMember_var (void);
+
+      CORBA_UnionMember_var &operator= (CORBA_UnionMember *);
+      CORBA_UnionMember_var &operator= (const CORBA_UnionMember_var &);
+      CORBA_UnionMember *operator-> (void);
+      const CORBA_UnionMember *operator-> (void) const;
+
+      operator const CORBA_UnionMember &() const;
+      operator CORBA_UnionMember &();
+      operator CORBA_UnionMember &() const;
+      // Variable-size types only.
+      operator CORBA_UnionMember *&();
+
+      // in, inout, out, _retn
+      const CORBA_UnionMember &in (void) const;
+      CORBA_UnionMember &inout (void);
+      CORBA_UnionMember *&out (void);
+      CORBA_UnionMember *_retn (void);
+      CORBA_UnionMember *ptr (void) const;
+
+    private:
+      CORBA_UnionMember *ptr_;
+    };
 
-class TAO_IFR_Client_Export CORBA_UnionMember_out
-{
-public:
-  CORBA_UnionMember_out (CORBA_UnionMember *&);
-  CORBA_UnionMember_out (CORBA_UnionMember_var &);
-  CORBA_UnionMember_out (const CORBA_UnionMember_out &);
-  CORBA_UnionMember_out &operator= (const CORBA_UnionMember_out &);
-  CORBA_UnionMember_out &operator= (CORBA_UnionMember *);
-  operator CORBA_UnionMember *&();
-  CORBA_UnionMember *&ptr (void);
-  CORBA_UnionMember *operator-> (void);
-  
-private:
-  CORBA_UnionMember *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_UnionMember_var &);
-};
+    class TAO_IFR_Client_Export CORBA_UnionMember_out
+    {
+    public:
+      CORBA_UnionMember_out (CORBA_UnionMember *&);
+      CORBA_UnionMember_out (CORBA_UnionMember_var &);
+      CORBA_UnionMember_out (const CORBA_UnionMember_out &);
+      CORBA_UnionMember_out &operator= (const CORBA_UnionMember_out &);
+      CORBA_UnionMember_out &operator= (CORBA_UnionMember *);
+      operator CORBA_UnionMember *&();
+      CORBA_UnionMember *&ptr (void);
+      CORBA_UnionMember *operator-> (void);
+
+    private:
+      CORBA_UnionMember *&ptr_;
+      // Assignment from T_var not allowed.
+      void operator= (const CORBA_UnionMember_var &);
+    };
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_UNIONMEMBERSEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_UNIONMEMBERSEQ_CH_
 
-  class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    // = Initialization and termination methods.
-    
-    _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (void); // Default constructor.
-    _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (CORBA::ULong maximum,
-      CORBA::ULong length,
-      CORBA_UnionMember *data,
-      CORBA::Boolean release = 0);
-    _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (const _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq &rhs);
-    _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq &operator= (const _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq &rhs);
-    virtual ~_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (void); // Dtor.
-    // = Accessors.
-    CORBA_UnionMember &operator[] (CORBA::ULong i);
-    const CORBA_UnionMember &operator[] (CORBA::ULong i) const;
-    // = Static operations.
-    static CORBA_UnionMember *allocbuf (CORBA::ULong size);
-    static void freebuf (CORBA_UnionMember *buffer);
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    
-    CORBA_UnionMember *get_buffer (CORBA::Boolean orphan = 0);
-    const CORBA_UnionMember *get_buffer (void) const;
-    void replace (CORBA::ULong max,
-      CORBA::ULong length,
-      CORBA_UnionMember *data,
-      CORBA::Boolean release);
-  };
+    class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq
+      : public TAO_Unbounded_Base_Sequence
+    {
+    public:
+      // = Initialization and termination methods.
+      _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (void);
+      _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (CORBA::ULong maximum);
+      _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (
+          CORBA::ULong maximum,
+          CORBA::ULong length,
+          CORBA_UnionMember *data,
+          CORBA::Boolean release = 0
+        );
+      _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (
+          const _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq &rhs
+        );
+      _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq &operator= (
+          const _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq &rhs
+        );
+      virtual ~_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (void);
+
+      // = Accessors.
+      CORBA_UnionMember &operator[] (CORBA::ULong i);
+      const CORBA_UnionMember &operator[] (CORBA::ULong i) const;
+
+      // = Static operations.
+      static CORBA_UnionMember *allocbuf (CORBA::ULong size);
+      static void freebuf (CORBA_UnionMember *buffer);
+
+      // Implement the TAO_Base_Sequence methods (see Sequence.h)
+      virtual void _allocate_buffer (CORBA::ULong length);
+      virtual void _deallocate_buffer (void);
+      CORBA_UnionMember *get_buffer (CORBA::Boolean orphan = 0);
+      const CORBA_UnionMember *get_buffer (void) const;
+      void replace (
+          CORBA::ULong max,
+          CORBA::ULong length,
+          CORBA_UnionMember *data,
+          CORBA::Boolean release
+        );
+    };
 
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_UNIONMEMBERSEQ_CH_)
 #define _CORBA_UNIONMEMBERSEQ_CH_
 
-class CORBA_UnionMemberSeq;
-class CORBA_UnionMemberSeq_var;
+    class CORBA_UnionMemberSeq;
+    class CORBA_UnionMemberSeq_var;
 
-// *************************************************************
-// CORBA_UnionMemberSeq
-// *************************************************************
+    // *************************************************************
+    // CORBA_UnionMemberSeq
+    // *************************************************************
 
-class TAO_IFR_Client_Export CORBA_UnionMemberSeq : public 
+    class TAO_IFR_Client_Export CORBA_UnionMemberSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq
+    _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_UnionMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-{
-public:
-  CORBA_UnionMemberSeq (void); // default ctor
-  CORBA_UnionMemberSeq (CORBA::ULong max); // uses max size
-  CORBA_UnionMemberSeq (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    CORBA_UnionMember *buffer, 
-    CORBA::Boolean release = 0
-  );
-  CORBA_UnionMemberSeq (const CORBA_UnionMemberSeq &); // copy ctor
-  ~CORBA_UnionMemberSeq (void);
-  static void _tao_any_destructor (void*);
+    TAO_Unbounded_Sequence<CORBA_UnionMember>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+    {
+    public:
+      CORBA_UnionMemberSeq (void); // default ctor
+      CORBA_UnionMemberSeq (CORBA::ULong max); // uses max size
+      CORBA_UnionMemberSeq (
+          CORBA::ULong max,
+          CORBA::ULong length,
+          CORBA_UnionMember *buffer,
+          CORBA::Boolean release = 0
+        );
+      CORBA_UnionMemberSeq (const CORBA_UnionMemberSeq &); // copy ctor
+      ~CORBA_UnionMemberSeq (void);
+      static void _tao_any_destructor (void*);
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_UnionMemberSeq_var _var_type;
+      typedef CORBA_UnionMemberSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-};
+
+    };
 
 #endif /* end #if !defined */
 
@@ -3500,41 +3674,41 @@ public:
 #if !defined (_CORBA_UNIONMEMBERSEQ___VAR_CH_)
 #define _CORBA_UNIONMEMBERSEQ___VAR_CH_
 
-// *************************************************************
-// class CORBA_UnionMemberSeq_var
-// *************************************************************
+    // *************************************************************
+    // class CORBA_UnionMemberSeq_var
+    // *************************************************************
 
-class TAO_IFR_Client_Export CORBA_UnionMemberSeq_var
-{
-public:
-  CORBA_UnionMemberSeq_var (void); // default constructor
-  CORBA_UnionMemberSeq_var (CORBA_UnionMemberSeq *);
-  CORBA_UnionMemberSeq_var (const CORBA_UnionMemberSeq_var &); // copy constructor
-  ~CORBA_UnionMemberSeq_var (void); // destructor
-  
-  CORBA_UnionMemberSeq_var &operator= (CORBA_UnionMemberSeq *);
-  CORBA_UnionMemberSeq_var &operator= (const CORBA_UnionMemberSeq_var &);
-  CORBA_UnionMemberSeq *operator-> (void);
-  const CORBA_UnionMemberSeq *operator-> (void) const;
-  
-  operator const CORBA_UnionMemberSeq &() const;
-  operator CORBA_UnionMemberSeq &();
-  operator CORBA_UnionMemberSeq &() const;
-  operator CORBA_UnionMemberSeq *&(); // variable-size base types only
-  
-  CORBA_UnionMember & operator[] (CORBA::ULong index);
-  const CORBA_UnionMember & operator[] (CORBA::ULong index) const;
-  
-  // in, inout, out, _retn 
-  const CORBA_UnionMemberSeq &in (void) const;
-  CORBA_UnionMemberSeq &inout (void);
-  CORBA_UnionMemberSeq *&out (void);
-  CORBA_UnionMemberSeq *_retn (void);
-  CORBA_UnionMemberSeq *ptr (void) const;
-
-private:
-  CORBA_UnionMemberSeq *ptr_;
-};
+    class TAO_IFR_Client_Export CORBA_UnionMemberSeq_var
+    {
+    public:
+      CORBA_UnionMemberSeq_var (void);
+      CORBA_UnionMemberSeq_var (CORBA_UnionMemberSeq *);
+      CORBA_UnionMemberSeq_var (const CORBA_UnionMemberSeq_var &);
+      ~CORBA_UnionMemberSeq_var (void);
+
+      CORBA_UnionMemberSeq_var &operator= (CORBA_UnionMemberSeq *);
+      CORBA_UnionMemberSeq_var &operator= (const CORBA_UnionMemberSeq_var &);
+      CORBA_UnionMemberSeq *operator-> (void);
+      const CORBA_UnionMemberSeq *operator-> (void) const;
+
+      operator const CORBA_UnionMemberSeq &() const;
+      operator CORBA_UnionMemberSeq &();
+      operator CORBA_UnionMemberSeq &() const;
+      operator CORBA_UnionMemberSeq *&(); // variable-size base types only
+
+      CORBA_UnionMember & operator[] (CORBA::ULong index);
+      const CORBA_UnionMember & operator[] (CORBA::ULong index) const;
+
+      // in, inout, out, _retn
+      const CORBA_UnionMemberSeq &in (void) const;
+      CORBA_UnionMemberSeq &inout (void);
+      CORBA_UnionMemberSeq *&out (void);
+      CORBA_UnionMemberSeq *_retn (void);
+      CORBA_UnionMemberSeq *ptr (void) const;
+
+    private:
+      CORBA_UnionMemberSeq *ptr_;
+    };
 
 
 #endif /* end #if !defined */
@@ -3543,24 +3717,24 @@ private:
 #if !defined (_CORBA_UNIONMEMBERSEQ___OUT_CH_)
 #define _CORBA_UNIONMEMBERSEQ___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_UnionMemberSeq_out
-{
-public:
-  CORBA_UnionMemberSeq_out (CORBA_UnionMemberSeq *&);
-  CORBA_UnionMemberSeq_out (CORBA_UnionMemberSeq_var &);
-  CORBA_UnionMemberSeq_out (const CORBA_UnionMemberSeq_out &);
-  CORBA_UnionMemberSeq_out &operator= (const CORBA_UnionMemberSeq_out &);
-  CORBA_UnionMemberSeq_out &operator= (CORBA_UnionMemberSeq *);
-  operator CORBA_UnionMemberSeq *&();
-  CORBA_UnionMemberSeq *&ptr (void);
-  CORBA_UnionMemberSeq *operator-> (void);
-  CORBA_UnionMember & operator[] (CORBA::ULong index);
-  
-private:
-  CORBA_UnionMemberSeq *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_UnionMemberSeq_var &);
-};
+    class TAO_IFR_Client_Export CORBA_UnionMemberSeq_out
+    {
+    public:
+      CORBA_UnionMemberSeq_out (CORBA_UnionMemberSeq *&);
+      CORBA_UnionMemberSeq_out (CORBA_UnionMemberSeq_var &);
+      CORBA_UnionMemberSeq_out (const CORBA_UnionMemberSeq_out &);
+      CORBA_UnionMemberSeq_out &operator= (const CORBA_UnionMemberSeq_out &);
+      CORBA_UnionMemberSeq_out &operator= (CORBA_UnionMemberSeq *);
+      operator CORBA_UnionMemberSeq *&();
+      CORBA_UnionMemberSeq *&ptr (void);
+      CORBA_UnionMemberSeq *operator-> (void);
+      CORBA_UnionMember & operator[] (CORBA::ULong index);
+
+    private:
+      CORBA_UnionMemberSeq *&ptr_;
+      // Assignment from T_var not allowed.
+      void operator= (const CORBA_UnionMemberSeq_var &);
+    };
 
 
 #endif /* end #if !defined */
@@ -3569,38 +3743,39 @@ private:
 #if !defined (_CORBA_ENUMMEMBERSEQ_CH_)
 #define _CORBA_ENUMMEMBERSEQ_CH_
 
-class CORBA_EnumMemberSeq;
-class CORBA_EnumMemberSeq_var;
+    class CORBA_EnumMemberSeq;
+    class CORBA_EnumMemberSeq_var;
 
-// *************************************************************
-// CORBA_EnumMemberSeq
-// *************************************************************
+    // *************************************************************
+    // CORBA_EnumMemberSeq
+    // *************************************************************
 
-class TAO_IFR_Client_Export CORBA_EnumMemberSeq : public 
+    class TAO_IFR_Client_Export CORBA_EnumMemberSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
+    TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-{
-public:
-  CORBA_EnumMemberSeq (void); // default ctor
-  CORBA_EnumMemberSeq (CORBA::ULong max); // uses max size
-  CORBA_EnumMemberSeq (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    char * *buffer, 
-    CORBA::Boolean release = 0
-  );
-  CORBA_EnumMemberSeq (const CORBA_EnumMemberSeq &); // copy ctor
-  ~CORBA_EnumMemberSeq (void);
-  static void _tao_any_destructor (void*);
+    TAO_Unbounded_String_Sequence
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+    {
+    public:
+      CORBA_EnumMemberSeq (void); // default ctor
+      CORBA_EnumMemberSeq (CORBA::ULong max); // uses max size
+      CORBA_EnumMemberSeq (
+          CORBA::ULong max,
+          CORBA::ULong length,
+          char * *buffer,
+          CORBA::Boolean release = 0
+        );
+      CORBA_EnumMemberSeq (const CORBA_EnumMemberSeq &); // copy ctor
+      ~CORBA_EnumMemberSeq (void);
+      static void _tao_any_destructor (void*);
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_EnumMemberSeq_var _var_type;
+      typedef CORBA_EnumMemberSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-};
+
+    };
 
 #endif /* end #if !defined */
 
@@ -3608,40 +3783,40 @@ public:
 #if !defined (_CORBA_ENUMMEMBERSEQ___VAR_CH_)
 #define _CORBA_ENUMMEMBERSEQ___VAR_CH_
 
-// *************************************************************
-// class CORBA_EnumMemberSeq_var
-// *************************************************************
-
-class TAO_IFR_Client_Export CORBA_EnumMemberSeq_var
-{
-public:
-  CORBA_EnumMemberSeq_var (void); // default constructor
-  CORBA_EnumMemberSeq_var (CORBA_EnumMemberSeq *);
-  CORBA_EnumMemberSeq_var (const CORBA_EnumMemberSeq_var &); // copy constructor
-  ~CORBA_EnumMemberSeq_var (void); // destructor
-  
-  CORBA_EnumMemberSeq_var &operator= (CORBA_EnumMemberSeq *);
-  CORBA_EnumMemberSeq_var &operator= (const CORBA_EnumMemberSeq_var &);
-  CORBA_EnumMemberSeq *operator-> (void);
-  const CORBA_EnumMemberSeq *operator-> (void) const;
-  
-  operator const CORBA_EnumMemberSeq &() const;
-  operator CORBA_EnumMemberSeq &();
-  operator CORBA_EnumMemberSeq &() const;
-  operator CORBA_EnumMemberSeq *&(); // variable-size base types only
-  
-  TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-  
-  // in, inout, out, _retn 
-  const CORBA_EnumMemberSeq &in (void) const;
-  CORBA_EnumMemberSeq &inout (void);
-  CORBA_EnumMemberSeq *&out (void);
-  CORBA_EnumMemberSeq *_retn (void);
-  CORBA_EnumMemberSeq *ptr (void) const;
+    // *************************************************************
+    // class CORBA_EnumMemberSeq_var
+    // *************************************************************
 
-private:
-  CORBA_EnumMemberSeq *ptr_;
-};
+    class TAO_IFR_Client_Export CORBA_EnumMemberSeq_var
+    {
+    public:
+      CORBA_EnumMemberSeq_var (void);
+      CORBA_EnumMemberSeq_var (CORBA_EnumMemberSeq *);
+      CORBA_EnumMemberSeq_var (const CORBA_EnumMemberSeq_var &);
+      ~CORBA_EnumMemberSeq_var (void);
+
+      CORBA_EnumMemberSeq_var &operator= (CORBA_EnumMemberSeq *);
+      CORBA_EnumMemberSeq_var &operator= (const CORBA_EnumMemberSeq_var &);
+      CORBA_EnumMemberSeq *operator-> (void);
+      const CORBA_EnumMemberSeq *operator-> (void) const;
+
+      operator const CORBA_EnumMemberSeq &() const;
+      operator CORBA_EnumMemberSeq &();
+      operator CORBA_EnumMemberSeq &() const;
+      operator CORBA_EnumMemberSeq *&(); // variable-size base types only
+
+      TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
+
+      // in, inout, out, _retn
+      const CORBA_EnumMemberSeq &in (void) const;
+      CORBA_EnumMemberSeq &inout (void);
+      CORBA_EnumMemberSeq *&out (void);
+      CORBA_EnumMemberSeq *_retn (void);
+      CORBA_EnumMemberSeq *ptr (void) const;
+
+    private:
+      CORBA_EnumMemberSeq *ptr_;
+    };
 
 
 #endif /* end #if !defined */
@@ -3650,24 +3825,24 @@ private:
 #if !defined (_CORBA_ENUMMEMBERSEQ___OUT_CH_)
 #define _CORBA_ENUMMEMBERSEQ___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_EnumMemberSeq_out
-{
-public:
-  CORBA_EnumMemberSeq_out (CORBA_EnumMemberSeq *&);
-  CORBA_EnumMemberSeq_out (CORBA_EnumMemberSeq_var &);
-  CORBA_EnumMemberSeq_out (const CORBA_EnumMemberSeq_out &);
-  CORBA_EnumMemberSeq_out &operator= (const CORBA_EnumMemberSeq_out &);
-  CORBA_EnumMemberSeq_out &operator= (CORBA_EnumMemberSeq *);
-  operator CORBA_EnumMemberSeq *&();
-  CORBA_EnumMemberSeq *&ptr (void);
-  CORBA_EnumMemberSeq *operator-> (void);
-  TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-  
-private:
-  CORBA_EnumMemberSeq *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_EnumMemberSeq_var &);
-};
+    class TAO_IFR_Client_Export CORBA_EnumMemberSeq_out
+    {
+    public:
+      CORBA_EnumMemberSeq_out (CORBA_EnumMemberSeq *&);
+      CORBA_EnumMemberSeq_out (CORBA_EnumMemberSeq_var &);
+      CORBA_EnumMemberSeq_out (const CORBA_EnumMemberSeq_out &);
+      CORBA_EnumMemberSeq_out &operator= (const CORBA_EnumMemberSeq_out &);
+      CORBA_EnumMemberSeq_out &operator= (CORBA_EnumMemberSeq *);
+      operator CORBA_EnumMemberSeq *&();
+      CORBA_EnumMemberSeq *&ptr (void);
+      CORBA_EnumMemberSeq *operator-> (void);
+      TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
+
+    private:
+      CORBA_EnumMemberSeq *&ptr_;
+      // Assignment from T_var not allowed.
+      void operator= (const CORBA_EnumMemberSeq_var &);
+    };
 
 
 #endif /* end #if !defined */
@@ -3676,1220 +3851,1234 @@ private:
 #if !defined (_CORBA_CONTAINER_CH_)
 #define _CORBA_CONTAINER_CH_
 
-// Forward Classes Declaration
-class _TAO_CORBA_Container_Proxy_Impl;
-class _TAO_CORBA_Container_Remote_Proxy_Impl;
-class _TAO_CORBA_Container_Proxy_Broker;
-class _TAO_CORBA_Container_Remote_Proxy_Broker;
-
-class TAO_IFR_Client_Export CORBA_Container: public virtual CORBA_IRObject
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_Container_ptr _ptr_type;
-  typedef CORBA_Container_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
+    // Forward Classes Declaration
+    class _TAO_CORBA_Container_Proxy_Impl;
+    class _TAO_CORBA_Container_Remote_Proxy_Impl;
+    class _TAO_CORBA_Container_Proxy_Broker;
+    class _TAO_CORBA_Container_Remote_Proxy_Broker;
 
-  // the static operations
-  static CORBA_Container_ptr _duplicate (CORBA_Container_ptr obj);
-  static CORBA_Container_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_Container_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_Container_ptr _nil (void)
+    class TAO_IFR_Client_Export CORBA_Container
+      : public virtual CORBA_IRObject
     {
-      return (CORBA_Container_ptr)0;
-    }
-
-  static void _tao_any_destructor (void*);
-
-  virtual CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_ContainedSeq * contents (
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_ContainedSeq * lookup_name (
-      const char * search_name,
-      CORBA::Long levels_to_search,
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  struct Description;
-  class Description_var;
-  
-  struct TAO_IFR_Client_Export Description
-  {
+    public:
+    #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+      typedef CORBA_Container_ptr _ptr_type;
+      typedef CORBA_Container_var _var_type;
+    #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+      // the static operations
+      static CORBA_Container_ptr _duplicate (CORBA_Container_ptr obj);
+
+      static CORBA_Container_ptr _narrow (
+          CORBA::Object_ptr obj,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        );
+
+      static CORBA_Container_ptr _unchecked_narrow (
+          CORBA::Object_ptr obj,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        );
+
+      static CORBA_Container_ptr _nil (void)
+        {
+          return (CORBA_Container_ptr)0;
+        }
+
+      static void _tao_any_destructor (void*);
+
+      virtual CORBA_Contained_ptr lookup (
+          const char * search_name,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_ContainedSeq * contents (
+          CORBA::DefinitionKind limit_type,
+          CORBA::Boolean exclude_inherited,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_ContainedSeq * lookup_name (
+          const char * search_name,
+          CORBA::Long levels_to_search,
+          CORBA::DefinitionKind limit_type,
+          CORBA::Boolean exclude_inherited,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      struct Description;
+      class Description_var;
+
+      struct TAO_IFR_Client_Export Description
+      {
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef Description_var _var_type;
+        typedef Description_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-    static void _tao_any_destructor (void*);
-
-    CORBA_Contained_var contained_object;
-    CORBA::DefinitionKind kind;
-    CORBA::Any value;
-  };
-
-  class TAO_IFR_Client_Export Description_var
-  {
-  public:
-    Description_var (void); // default constructor
-    Description_var (Description *);
-    Description_var (const Description_var &); // copy constructor
-    ~Description_var (void); // destructor
-    
-    Description_var &operator= (Description *);
-    Description_var &operator= (const Description_var &);
-    Description *operator-> (void);
-    const Description *operator-> (void) const;
-    
-    operator const Description &() const;
-    operator Description &();
-    operator Description &() const;
-    operator Description *&(); // variable-size types only
-    
-    // in, inout, out, _retn 
-    const Description &in (void) const;
-    Description &inout (void);
-    Description *&out (void);
-    Description *_retn (void);
-    Description *ptr (void) const;
-
-  private:
-    Description *ptr_;
-  };
-
-  class TAO_IFR_Client_Export Description_out
-  {
-  public:
-    Description_out (Description *&);
-    Description_out (Description_var &);
-    Description_out (const Description_out &);
-    Description_out &operator= (const Description_out &);
-    Description_out &operator= (Description *);
-    operator Description *&();
-    Description *&ptr (void);
-    Description *operator-> (void);
-    
-  private:
-    Description *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const Description_var &);
-  };
-
-  static CORBA::TypeCode_ptr _tc_Description;
+        static void _tao_any_destructor (void*);
+
+        CORBA_Contained_var contained_object;
+        CORBA::DefinitionKind kind;
+        CORBA::Any value;
+
+      };
+
+      class TAO_IFR_Client_Export Description_var
+      {
+      public:
+        Description_var (void);
+        Description_var (Description *);
+        Description_var (const Description_var &);
+        ~Description_var (void);
+
+        Description_var &operator= (Description *);
+        Description_var &operator= (const Description_var &);
+        Description *operator-> (void);
+        const Description *operator-> (void) const;
+
+        operator const Description &() const;
+        operator Description &();
+        operator Description &() const;
+        // Variable-size types only.
+        operator Description *&();
+
+        // in, inout, out, _retn
+        const Description &in (void) const;
+        Description &inout (void);
+        Description *&out (void);
+        Description *_retn (void);
+        Description *ptr (void) const;
+
+      private:
+        Description *ptr_;
+      };
+
+      class TAO_IFR_Client_Export Description_out
+      {
+      public:
+        Description_out (Description *&);
+        Description_out (Description_var &);
+        Description_out (const Description_out &);
+        Description_out &operator= (const Description_out &);
+        Description_out &operator= (Description *);
+        operator Description *&();
+        Description *&ptr (void);
+        Description *operator-> (void);
+
+      private:
+        Description *&ptr_;
+        // Assignment from T_var not allowed.
+        void operator= (const Description_var &);
+      };
+
+      static CORBA::TypeCode_ptr _tc_Description;
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_CONTAINER_DESCRIPTIONSEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_CONTAINER_DESCRIPTIONSEQ_CH_
 
-    class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-      
-      _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (void); // Default constructor.
-      _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (CORBA::ULong maximum); 
-      _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (CORBA::ULong maximum,
-        CORBA::ULong length,
-        Description *data,
-        CORBA::Boolean release = 0);
-      _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (const _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq &rhs);
-      _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq &operator= (const _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq &rhs);
-      virtual ~_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (void); // Dtor.
-      // = Accessors.
-      Description &operator[] (CORBA::ULong i);
-      const Description &operator[] (CORBA::ULong i) const;
-      // = Static operations.
-      static Description *allocbuf (CORBA::ULong size);
-      static void freebuf (Description *buffer);
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      // Implement the TAO_Base_Sequence methods (see Sequence.h)
-      
-      Description *get_buffer (CORBA::Boolean orphan = 0);
-      const Description *get_buffer (void) const;
-      void replace (CORBA::ULong max,
-        CORBA::ULong length,
-        Description *data,
-        CORBA::Boolean release);
-    };
+      class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq
+        : public TAO_Unbounded_Base_Sequence
+      {
+      public:
+        // = Initialization and termination methods.
+        _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (void);
+        _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (CORBA::ULong maximum);
+        _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (
+            CORBA::ULong maximum,
+            CORBA::ULong length,
+            Description *data,
+            CORBA::Boolean release = 0
+          );
+        _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (
+            const _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq &rhs
+          );
+        _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq &operator= (
+            const _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq &rhs
+          );
+        virtual ~_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (void);
+
+        // = Accessors.
+        Description &operator[] (CORBA::ULong i);
+        const Description &operator[] (CORBA::ULong i) const;
+
+        // = Static operations.
+        static Description *allocbuf (CORBA::ULong size);
+        static void freebuf (Description *buffer);
+
+        // Implement the TAO_Base_Sequence methods (see Sequence.h)
+        virtual void _allocate_buffer (CORBA::ULong length);
+        virtual void _deallocate_buffer (void);
+        Description *get_buffer (CORBA::Boolean orphan = 0);
+        const Description *get_buffer (void) const;
+        void replace (
+            CORBA::ULong max,
+            CORBA::ULong length,
+            Description *data,
+            CORBA::Boolean release
+          );
+      };
 
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
 #if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ_CH_)
 #define _CORBA_CONTAINER_DESCRIPTIONSEQ_CH_
 
-  class DescriptionSeq;
-  class DescriptionSeq_var;
-  
-  // *************************************************************
-  // DescriptionSeq
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export DescriptionSeq : public 
+      class DescriptionSeq;
+      class DescriptionSeq_var;
+
+      // *************************************************************
+      // DescriptionSeq
+      // *************************************************************
+
+      class TAO_IFR_Client_Export DescriptionSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq
+      _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Sequence<Description>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  {
-  public:
-    DescriptionSeq (void); // default ctor
-    DescriptionSeq (CORBA::ULong max); // uses max size
-    DescriptionSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      Description *buffer, 
-      CORBA::Boolean release = 0
-    );
-    DescriptionSeq (const DescriptionSeq &); // copy ctor
-    ~DescriptionSeq (void);
-    static void _tao_any_destructor (void*);
+      TAO_Unbounded_Sequence<Description>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+      {
+      public:
+        DescriptionSeq (void); // default ctor
+        DescriptionSeq (CORBA::ULong max); // uses max size
+        DescriptionSeq (
+            CORBA::ULong max,
+            CORBA::ULong length,
+            Description *buffer,
+            CORBA::Boolean release = 0
+          );
+        DescriptionSeq (const DescriptionSeq &); // copy ctor
+        ~DescriptionSeq (void);
+        static void _tao_any_destructor (void*);
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef DescriptionSeq_var _var_type;
+        typedef DescriptionSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-  };
-  
+
+      };
+
 #endif /* end #if !defined */
 
 
 #if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ___VAR_CH_)
 #define _CORBA_CONTAINER_DESCRIPTIONSEQ___VAR_CH_
 
-  // *************************************************************
-  // class CORBA_Container::DescriptionSeq_var
-  // *************************************************************
+      // *************************************************************
+      // class CORBA_Container::DescriptionSeq_var
+      // *************************************************************
 
-  class TAO_IFR_Client_Export DescriptionSeq_var
-  {
-  public:
-    DescriptionSeq_var (void); // default constructor
-    DescriptionSeq_var (DescriptionSeq *);
-    DescriptionSeq_var (const DescriptionSeq_var &); // copy constructor
-    ~DescriptionSeq_var (void); // destructor
-    
-    DescriptionSeq_var &operator= (DescriptionSeq *);
-    DescriptionSeq_var &operator= (const DescriptionSeq_var &);
-    DescriptionSeq *operator-> (void);
-    const DescriptionSeq *operator-> (void) const;
-    
-    operator const DescriptionSeq &() const;
-    operator DescriptionSeq &();
-    operator DescriptionSeq &() const;
-    operator DescriptionSeq *&(); // variable-size base types only
-    
-    Description & operator[] (CORBA::ULong index);
-    const Description & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
-    const DescriptionSeq &in (void) const;
-    DescriptionSeq &inout (void);
-    DescriptionSeq *&out (void);
-    DescriptionSeq *_retn (void);
-    DescriptionSeq *ptr (void) const;
-
-  private:
-    DescriptionSeq *ptr_;
-  };
+      class TAO_IFR_Client_Export DescriptionSeq_var
+      {
+      public:
+        DescriptionSeq_var (void);
+        DescriptionSeq_var (DescriptionSeq *);
+        DescriptionSeq_var (const DescriptionSeq_var &);
+        ~DescriptionSeq_var (void);
 
+        DescriptionSeq_var &operator= (DescriptionSeq *);
+        DescriptionSeq_var &operator= (const DescriptionSeq_var &);
+        DescriptionSeq *operator-> (void);
+        const DescriptionSeq *operator-> (void) const;
 
-#endif /* end #if !defined */
+        operator const DescriptionSeq &() const;
+        operator DescriptionSeq &();
+        operator DescriptionSeq &() const;
+        operator DescriptionSeq *&(); // variable-size base types only
 
+        Description & operator[] (CORBA::ULong index);
+        const Description & operator[] (CORBA::ULong index) const;
 
-#if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ___OUT_CH_)
-#define _CORBA_CONTAINER_DESCRIPTIONSEQ___OUT_CH_
+        // in, inout, out, _retn
+        const DescriptionSeq &in (void) const;
+        DescriptionSeq &inout (void);
+        DescriptionSeq *&out (void);
+        DescriptionSeq *_retn (void);
+        DescriptionSeq *ptr (void) const;
 
-  class TAO_IFR_Client_Export DescriptionSeq_out
-  {
-  public:
-    DescriptionSeq_out (DescriptionSeq *&);
-    DescriptionSeq_out (DescriptionSeq_var &);
-    DescriptionSeq_out (const DescriptionSeq_out &);
-    DescriptionSeq_out &operator= (const DescriptionSeq_out &);
-    DescriptionSeq_out &operator= (DescriptionSeq *);
-    operator DescriptionSeq *&();
-    DescriptionSeq *&ptr (void);
-    DescriptionSeq *operator-> (void);
-    Description & operator[] (CORBA::ULong index);
-    
-  private:
-    DescriptionSeq *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const DescriptionSeq_var &);
-  };
+      private:
+        DescriptionSeq *ptr_;
+      };
 
 
 #endif /* end #if !defined */
 
-  static CORBA::TypeCode_ptr _tc_DescriptionSeq;
-
-  virtual CORBA_Container::DescriptionSeq * describe_contents (
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_ModuleDef_ptr create_module (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_ConstantDef_ptr create_constant (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_StructDef_ptr create_struct (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_UnionDef_ptr create_union (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_EnumDef_ptr create_enum (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_AliasDef_ptr create_alias (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_InterfaceDef_ptr create_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_ValueDef_ptr create_value (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Boolean is_custom,
-      CORBA::Boolean is_abstract,
-      CORBA_ValueDef_ptr base_value,
-      CORBA::Boolean is_truncatable,
-      const CORBA_ValueDefSeq & abstract_base_values,
-      const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_ValueBoxDef_ptr create_value_box (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_ExceptionDef_ptr create_exception (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_NativeDef_ptr create_native (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_LocalInterfaceDef_ptr create_local_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
-
-private:
-  _TAO_CORBA_Container_Proxy_Broker *the_TAO_CORBA_Container_Proxy_Broker_;
-  
-protected:
-  CORBA_Container (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void CORBA_Container_setup_collocation (int collocated);
-    
-    CORBA_Container (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_CORBA_Container_Remote_Proxy_Impl;
-    friend class _TAO_CORBA_Container_ThruPOA_Proxy_Impl;
-    friend class _TAO_CORBA_Container_Direct_Proxy_Impl;
-  
-  virtual ~CORBA_Container (void);
-private:
-  CORBA_Container (const CORBA_Container &);
-  void operator= (const CORBA_Container &);
-};
-
-
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_Container_Proxy_Impl : 
-  public virtual _TAO_CORBA_IRObject_Proxy_Impl
-{
-public:
-  virtual ~_TAO_CORBA_Container_Proxy_Impl (void) { }
-  
-    virtual CORBA_Contained_ptr lookup (
-      CORBA_Object *_collocated_tao_target_,
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_ContainedSeq * contents (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_ContainedSeq * lookup_name (
-      CORBA_Object *_collocated_tao_target_,
-      const char * search_name,
-      CORBA::Long levels_to_search,
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
 
-  virtual CORBA_Container::DescriptionSeq * describe_contents (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_ModuleDef_ptr create_module (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_ConstantDef_ptr create_constant (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_StructDef_ptr create_struct (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_UnionDef_ptr create_union (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_EnumDef_ptr create_enum (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_AliasDef_ptr create_alias (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_InterfaceDef_ptr create_interface (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_ValueDef_ptr create_value (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Boolean is_custom,
-      CORBA::Boolean is_abstract,
-      CORBA_ValueDef_ptr base_value,
-      CORBA::Boolean is_truncatable,
-      const CORBA_ValueDefSeq & abstract_base_values,
-      const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_ValueBoxDef_ptr create_value_box (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_ExceptionDef_ptr create_exception (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_NativeDef_ptr create_native (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_LocalInterfaceDef_ptr create_local_interface (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-protected:
-  _TAO_CORBA_Container_Proxy_Impl (void);
-
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_Container_Remote_Proxy_Impl : 
-  public virtual _TAO_CORBA_Container_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_IRObject_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_CORBA_Container_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_CORBA_Container_Remote_Proxy_Impl (void) { }
-  
-    virtual CORBA_Contained_ptr lookup (
-      CORBA_Object *_collocated_tao_target_,
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+#if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ___OUT_CH_)
+#define _CORBA_CONTAINER_DESCRIPTIONSEQ___OUT_CH_
 
-  virtual CORBA_ContainedSeq * contents (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+      class TAO_IFR_Client_Export DescriptionSeq_out
+      {
+      public:
+        DescriptionSeq_out (DescriptionSeq *&);
+        DescriptionSeq_out (DescriptionSeq_var &);
+        DescriptionSeq_out (const DescriptionSeq_out &);
+        DescriptionSeq_out &operator= (const DescriptionSeq_out &);
+        DescriptionSeq_out &operator= (DescriptionSeq *);
+        operator DescriptionSeq *&();
+        DescriptionSeq *&ptr (void);
+        DescriptionSeq *operator-> (void);
+        Description & operator[] (CORBA::ULong index);
+
+      private:
+        DescriptionSeq *&ptr_;
+        // Assignment from T_var not allowed.
+        void operator= (const DescriptionSeq_var &);
+      };
 
-  virtual CORBA_ContainedSeq * lookup_name (
-      CORBA_Object *_collocated_tao_target_,
-      const char * search_name,
-      CORBA::Long levels_to_search,
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
 
-  virtual CORBA_Container::DescriptionSeq * describe_contents (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+#endif /* end #if !defined */
 
-  virtual CORBA_ModuleDef_ptr create_module (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+      static CORBA::TypeCode_ptr _tc_DescriptionSeq;
+
+      virtual CORBA_Container::DescriptionSeq * describe_contents (
+          CORBA::DefinitionKind limit_type,
+          CORBA::Boolean exclude_inherited,
+          CORBA::Long max_returned_objs,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_ModuleDef_ptr create_module (
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_ConstantDef_ptr create_constant (
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA_IDLType_ptr type,
+          const CORBA::Any & value,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_StructDef_ptr create_struct (
+          const char * id,
+          const char * name,
+          const char * version,
+          const CORBA_StructMemberSeq & members,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_UnionDef_ptr create_union (
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA_IDLType_ptr discriminator_type,
+          const CORBA_UnionMemberSeq & members,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_EnumDef_ptr create_enum (
+          const char * id,
+          const char * name,
+          const char * version,
+          const CORBA_EnumMemberSeq & members,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_AliasDef_ptr create_alias (
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA_IDLType_ptr original_type,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_InterfaceDef_ptr create_interface (
+          const char * id,
+          const char * name,
+          const char * version,
+          const CORBA_InterfaceDefSeq & base_interfaces,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_ValueDef_ptr create_value (
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA::Boolean is_custom,
+          CORBA::Boolean is_abstract,
+          CORBA_ValueDef_ptr base_value,
+          CORBA::Boolean is_truncatable,
+          const CORBA_ValueDefSeq & abstract_base_values,
+          const CORBA_InterfaceDefSeq & supported_interfaces,
+          const CORBA_InitializerSeq & initializers,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_ValueBoxDef_ptr create_value_box (
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA_IDLType_ptr original_type_def,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_ExceptionDef_ptr create_exception (
+          const char * id,
+          const char * name,
+          const char * version,
+          const CORBA_StructMemberSeq & members,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_NativeDef_ptr create_native (
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
+          const char * id,
+          const char * name,
+          const char * version,
+          const CORBA_AbstractInterfaceDefSeq & base_interfaces,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_LocalInterfaceDef_ptr create_local_interface (
+          const char * id,
+          const char * name,
+          const char * version,
+          const CORBA_InterfaceDefSeq & base_interfaces,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA::Boolean _is_a (
+          const CORBA::Char *type_id,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        );
+
+      virtual void *_tao_QueryInterface (ptr_arith_t type);
+
+      virtual const char* _interface_repository_id (void) const;
+
+    private:
+      _TAO_CORBA_Container_Proxy_Broker *the_TAO_CORBA_Container_Proxy_Broker_;
+
+    protected:
+      CORBA_Container (int collocated = 0);
+
+      // This methods travese the inheritance tree and set the
+      // parents piece of the given class in the right mode
+      virtual void CORBA_Container_setup_collocation (int collocated);
+
+      CORBA_Container (
+          TAO_Stub *objref,
+          CORBA::Boolean _tao_collocated = 0,
+          TAO_Abstract_ServantBase *servant = 0
+        );
+
+      friend class _TAO_CORBA_Container_Remote_Proxy_Impl;
+      friend class _TAO_CORBA_Container_ThruPOA_Proxy_Impl;
+      friend class _TAO_CORBA_Container_Direct_Proxy_Impl;
+
+      virtual ~CORBA_Container (void);
+
+    private:
+      CORBA_Container (const CORBA_Container &);
+      void operator= (const CORBA_Container &);
+    };
 
-  virtual CORBA_ConstantDef_ptr create_constant (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    // The Proxy Implementations are used by each interface to
+    // perform a call. Each different implementation encapsulate
+    // an invocation logics.
 
-  virtual CORBA_StructDef_ptr create_struct (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
 
-  virtual CORBA_UnionDef_ptr create_union (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    ///////////////////////////////////////////////////////////////////////
+    //                    Base Proxy Impl. Declaration
+    //
 
-  virtual CORBA_EnumDef_ptr create_enum (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_AliasDef_ptr create_alias (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    class TAO_IFR_Client_Export _TAO_CORBA_Container_Proxy_Impl
+      : public virtual _TAO_CORBA_IRObject_Proxy_Impl
+    {
+    public:
+      virtual ~_TAO_CORBA_Container_Proxy_Impl (void) { }
+      virtual CORBA_Contained_ptr lookup (
+          CORBA_Object *_collocated_tao_target_,
+          const char * search_name,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual CORBA_ContainedSeq * contents (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::DefinitionKind limit_type,
+          CORBA::Boolean exclude_inherited,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual CORBA_ContainedSeq * lookup_name (
+          CORBA_Object *_collocated_tao_target_,
+          const char * search_name,
+          CORBA::Long levels_to_search,
+          CORBA::DefinitionKind limit_type,
+          CORBA::Boolean exclude_inherited,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual CORBA_Container::DescriptionSeq * describe_contents (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::DefinitionKind limit_type,
+          CORBA::Boolean exclude_inherited,
+          CORBA::Long max_returned_objs,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual CORBA_ModuleDef_ptr create_module (
+          CORBA_Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual CORBA_ConstantDef_ptr create_constant (
+          CORBA_Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA_IDLType_ptr type,
+          const CORBA::Any & value,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual CORBA_StructDef_ptr create_struct (
+          CORBA_Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          const CORBA_StructMemberSeq & members,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual CORBA_UnionDef_ptr create_union (
+          CORBA_Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA_IDLType_ptr discriminator_type,
+          const CORBA_UnionMemberSeq & members,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual CORBA_EnumDef_ptr create_enum (
+          CORBA_Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          const CORBA_EnumMemberSeq & members,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual CORBA_AliasDef_ptr create_alias (
+          CORBA_Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA_IDLType_ptr original_type,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual CORBA_InterfaceDef_ptr create_interface (
+          CORBA_Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          const CORBA_InterfaceDefSeq & base_interfaces,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual CORBA_ValueDef_ptr create_value (
+          CORBA_Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA::Boolean is_custom,
+          CORBA::Boolean is_abstract,
+          CORBA_ValueDef_ptr base_value,
+          CORBA::Boolean is_truncatable,
+          const CORBA_ValueDefSeq & abstract_base_values,
+          const CORBA_InterfaceDefSeq & supported_interfaces,
+          const CORBA_InitializerSeq & initializers,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual CORBA_ValueBoxDef_ptr create_value_box (
+          CORBA_Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA_IDLType_ptr original_type_def,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual CORBA_ExceptionDef_ptr create_exception (
+          CORBA_Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          const CORBA_StructMemberSeq & members,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual CORBA_NativeDef_ptr create_native (
+          CORBA_Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
+          CORBA_Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          const CORBA_AbstractInterfaceDefSeq & base_interfaces,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual CORBA_LocalInterfaceDef_ptr create_local_interface (
+          CORBA_Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          const CORBA_InterfaceDefSeq & base_interfaces,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+
+    protected:
+      _TAO_CORBA_Container_Proxy_Impl (void);
+    };
 
-  virtual CORBA_InterfaceDef_ptr create_interface (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    //
+    //               End Base Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
 
-  virtual CORBA_ValueDef_ptr create_value (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Boolean is_custom,
-      CORBA::Boolean is_abstract,
-      CORBA_ValueDef_ptr base_value,
-      CORBA::Boolean is_truncatable,
-      const CORBA_ValueDefSeq & abstract_base_values,
-      const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
 
-  virtual CORBA_ValueBoxDef_ptr create_value_box (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    ///////////////////////////////////////////////////////////////////////
+    //                Remote Proxy Impl. Declaration
+    //
 
-  virtual CORBA_ExceptionDef_ptr create_exception (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_NativeDef_ptr create_native (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    class TAO_IFR_Client_Export _TAO_CORBA_Container_Remote_Proxy_Impl
+      : public virtual _TAO_CORBA_Container_Proxy_Impl,
+        public virtual TAO_Remote_Object_Proxy_Impl,
+        public virtual _TAO_CORBA_IRObject_Remote_Proxy_Impl
+    {
+    public:
+      _TAO_CORBA_Container_Remote_Proxy_Impl (void);
+
+      virtual ~_TAO_CORBA_Container_Remote_Proxy_Impl (void) { }
+      virtual CORBA_Contained_ptr lookup (
+          CORBA_Object *_collocated_tao_target_,
+          const char * search_name,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_ContainedSeq * contents (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::DefinitionKind limit_type,
+          CORBA::Boolean exclude_inherited,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_ContainedSeq * lookup_name (
+          CORBA_Object *_collocated_tao_target_,
+          const char * search_name,
+          CORBA::Long levels_to_search,
+          CORBA::DefinitionKind limit_type,
+          CORBA::Boolean exclude_inherited,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_Container::DescriptionSeq * describe_contents (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::DefinitionKind limit_type,
+          CORBA::Boolean exclude_inherited,
+          CORBA::Long max_returned_objs,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_ModuleDef_ptr create_module (
+          CORBA_Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_ConstantDef_ptr create_constant (
+          CORBA_Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA_IDLType_ptr type,
+          const CORBA::Any & value,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_StructDef_ptr create_struct (
+          CORBA_Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          const CORBA_StructMemberSeq & members,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_UnionDef_ptr create_union (
+          CORBA_Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA_IDLType_ptr discriminator_type,
+          const CORBA_UnionMemberSeq & members,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_EnumDef_ptr create_enum (
+          CORBA_Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          const CORBA_EnumMemberSeq & members,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_AliasDef_ptr create_alias (
+          CORBA_Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA_IDLType_ptr original_type,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_InterfaceDef_ptr create_interface (
+          CORBA_Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          const CORBA_InterfaceDefSeq & base_interfaces,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_ValueDef_ptr create_value (
+          CORBA_Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA::Boolean is_custom,
+          CORBA::Boolean is_abstract,
+          CORBA_ValueDef_ptr base_value,
+          CORBA::Boolean is_truncatable,
+          const CORBA_ValueDefSeq & abstract_base_values,
+          const CORBA_InterfaceDefSeq & supported_interfaces,
+          const CORBA_InitializerSeq & initializers,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_ValueBoxDef_ptr create_value_box (
+          CORBA_Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA_IDLType_ptr original_type_def,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_ExceptionDef_ptr create_exception (
+          CORBA_Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          const CORBA_StructMemberSeq & members,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_NativeDef_ptr create_native (
+          CORBA_Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
+          CORBA_Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          const CORBA_AbstractInterfaceDefSeq & base_interfaces,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_LocalInterfaceDef_ptr create_local_interface (
+          CORBA_Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          const CORBA_InterfaceDefSeq & base_interfaces,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
 
-  virtual CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
 
-  virtual CORBA_LocalInterfaceDef_ptr create_local_interface (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    };
 
-};
+    //
+    //             End Remote Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
 
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
+    // The Proxy Brokers are used by each interface to get
+    // the right proxy for performing a call. In the new
+    // collocation scheme, the proxy to be used can vary on
+    // a call by call basis.
 
 
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
-
+    ///////////////////////////////////////////////////////////////////////
+    //                 Base Proxy Broker Declaration
+    //
 
+        class TAO_IFR_Client_Export _TAO_CORBA_Container_Proxy_Broker
+    {
+    public:
+      virtual ~_TAO_CORBA_Container_Proxy_Broker (void);
+      virtual _TAO_CORBA_Container_Proxy_Impl &select_proxy (
+          CORBA_Container *object,
+          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+        ) = 0;
 
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
+    protected:
+      _TAO_CORBA_Container_Proxy_Broker (void);
 
-class TAO_IFR_Client_Export _TAO_CORBA_Container_Proxy_Broker
-{
-public:
-  virtual ~_TAO_CORBA_Container_Proxy_Broker (void);
-  virtual _TAO_CORBA_Container_Proxy_Impl &select_proxy (
-    CORBA_Container *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
+    };
 
-protected:
-  _TAO_CORBA_Container_Proxy_Broker (void);
-  
-};
+    //
+    //              End Base Proxy Broker Declaration
+    ///////////////////////////////////////////////////////////////////////
 
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
 
+    ///////////////////////////////////////////////////////////////////////
+    //                 Remote Proxy Broker Declaration
+    //
 
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
+    class TAO_IFR_Client_Export _TAO_CORBA_Container_Remote_Proxy_Broker
+      : public virtual _TAO_CORBA_Container_Proxy_Broker
+    {
+    public:
+      _TAO_CORBA_Container_Remote_Proxy_Broker (void);
 
-class TAO_IFR_Client_Export _TAO_CORBA_Container_Remote_Proxy_Broker : public virtual _TAO_CORBA_Container_Proxy_Broker
-{
-public: 
-  _TAO_CORBA_Container_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_CORBA_Container_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_CORBA_Container_Proxy_Impl &select_proxy (
-    CORBA_Container *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
+      virtual ~_TAO_CORBA_Container_Remote_Proxy_Broker (void);
 
-private:
-  _TAO_CORBA_Container_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
+      virtual _TAO_CORBA_Container_Proxy_Impl &select_proxy (
+          CORBA_Container *object,
+          CORBA_Environment &ACE_TRY_ENV
+        );
 
-public:
-  static _TAO_CORBA_Container_Remote_Proxy_Broker *the_TAO_CORBA_Container_Remote_Proxy_Broker (void);
-};
+      private:
+        _TAO_CORBA_Container_Remote_Proxy_Impl remote_proxy_impl_;
 
+      public:
+        // This member function is used to get an handle to the unique instance
+        // of the Remote Proxy Broker that is available for a given
+        // interface.
+        static _TAO_CORBA_Container_Remote_Proxy_Broker *the_TAO_CORBA_Container_Remote_Proxy_Broker (void);
+      };
 
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+      //
+      //              End Remote Proxy Broker Declaration
+      ///////////////////////////////////////////////////////////////////////
 
 
 #endif /* end #if !defined */
 
-
 #if !defined (_CORBA_IDLTYPE_CH_)
 #define _CORBA_IDLTYPE_CH_
 
-// Forward Classes Declaration
-class _TAO_CORBA_IDLType_Proxy_Impl;
-class _TAO_CORBA_IDLType_Remote_Proxy_Impl;
-class _TAO_CORBA_IDLType_Proxy_Broker;
-class _TAO_CORBA_IDLType_Remote_Proxy_Broker;
+      // Forward Classes Declaration
+      class _TAO_CORBA_IDLType_Proxy_Impl;
+      class _TAO_CORBA_IDLType_Remote_Proxy_Impl;
+      class _TAO_CORBA_IDLType_Proxy_Broker;
+      class _TAO_CORBA_IDLType_Remote_Proxy_Broker;
+
+      class TAO_IFR_Client_Export CORBA_IDLType
+        : public virtual CORBA_IRObject
+      {
+      public:
+      #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+        typedef CORBA_IDLType_ptr _ptr_type;
+        typedef CORBA_IDLType_var _var_type;
+      #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+        // the static operations
+        static CORBA_IDLType_ptr _duplicate (CORBA_IDLType_ptr obj);
+
+        static CORBA_IDLType_ptr _narrow (
+            CORBA::Object_ptr obj,
+            CORBA::Environment &ACE_TRY_ENV =
+              TAO_default_environment ()
+          );
+
+        static CORBA_IDLType_ptr _unchecked_narrow (
+            CORBA::Object_ptr obj,
+            CORBA::Environment &ACE_TRY_ENV =
+              TAO_default_environment ()
+          );
+
+        static CORBA_IDLType_ptr _nil (void)
+          {
+            return (CORBA_IDLType_ptr)0;
+          }
+
+        static void _tao_any_destructor (void*);
+
+        virtual CORBA::TypeCode_ptr type (
+            CORBA::Environment &ACE_TRY_ENV =
+              TAO_default_environment ()
+          )
+          ACE_THROW_SPEC ((
+            CORBA::SystemException
+          ));
+
+        virtual CORBA::Boolean _is_a (
+            const CORBA::Char *type_id,
+            CORBA::Environment &ACE_TRY_ENV =
+              TAO_default_environment ()
+          );
+
+        virtual void *_tao_QueryInterface (ptr_arith_t type);
+
+        virtual const char* _interface_repository_id (void) const;
+
+      private:
+        _TAO_CORBA_IDLType_Proxy_Broker *the_TAO_CORBA_IDLType_Proxy_Broker_;
+
+      protected:
+        CORBA_IDLType (int collocated = 0);
+
+        // This methods travese the inheritance tree and set the
+        // parents piece of the given class in the right mode
+        virtual void CORBA_IDLType_setup_collocation (int collocated);
+
+        CORBA_IDLType (
+            TAO_Stub *objref,
+            CORBA::Boolean _tao_collocated = 0,
+            TAO_Abstract_ServantBase *servant = 0
+          );
+
+        friend class _TAO_CORBA_IDLType_Remote_Proxy_Impl;
+        friend class _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl;
+        friend class _TAO_CORBA_IDLType_Direct_Proxy_Impl;
+
+        virtual ~CORBA_IDLType (void);
+
+      private:
+        CORBA_IDLType (const CORBA_IDLType &);
+        void operator= (const CORBA_IDLType &);
+      };
+
+      // The Proxy Implementations are used by each interface to
+      // perform a call. Each different implementation encapsulate
+      // an invocation logics.
+
+
+      ///////////////////////////////////////////////////////////////////////
+      //                    Base Proxy Impl. Declaration
+      //
+
+      class TAO_IFR_Client_Export _TAO_CORBA_IDLType_Proxy_Impl
+        : public virtual _TAO_CORBA_IRObject_Proxy_Impl
+      {
+      public:
+        virtual ~_TAO_CORBA_IDLType_Proxy_Impl (void) { }
+        virtual CORBA::TypeCode_ptr type (
+            CORBA_Object *_collocated_tao_target_,
+            CORBA::Environment &ACE_TRY_ENV
+          )
+          ACE_THROW_SPEC ((
+            CORBA::SystemException
+          )) = 0;
+
+
+      protected:
+        _TAO_CORBA_IDLType_Proxy_Impl (void);
+      };
+
+      //
+      //               End Base Proxy Impl. Declaration
+      ///////////////////////////////////////////////////////////////////////
 
-class TAO_IFR_Client_Export CORBA_IDLType: public virtual CORBA_IRObject
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_IDLType_ptr _ptr_type;
-  typedef CORBA_IDLType_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
 
-  // the static operations
-  static CORBA_IDLType_ptr _duplicate (CORBA_IDLType_ptr obj);
-  static CORBA_IDLType_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_IDLType_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_IDLType_ptr _nil (void)
-    {
-      return (CORBA_IDLType_ptr)0;
-    }
+      ///////////////////////////////////////////////////////////////////////
+      //                Remote Proxy Impl. Declaration
+      //
 
-  static void _tao_any_destructor (void*);
+      class TAO_IFR_Client_Export _TAO_CORBA_IDLType_Remote_Proxy_Impl
+        : public virtual _TAO_CORBA_IDLType_Proxy_Impl,
+          public virtual TAO_Remote_Object_Proxy_Impl,
+          public virtual _TAO_CORBA_IRObject_Remote_Proxy_Impl
+      {
+      public:
+        _TAO_CORBA_IDLType_Remote_Proxy_Impl (void);
 
-  virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+        virtual ~_TAO_CORBA_IDLType_Remote_Proxy_Impl (void) { }
+        virtual CORBA::TypeCode_ptr type (
+            CORBA_Object *_collocated_tao_target_,
+            CORBA::Environment &ACE_TRY_ENV
+          )
+          ACE_THROW_SPEC ((
+            CORBA::SystemException
+          ));
 
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
-
-private:
-  _TAO_CORBA_IDLType_Proxy_Broker *the_TAO_CORBA_IDLType_Proxy_Broker_;
-  
-protected:
-  CORBA_IDLType (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void CORBA_IDLType_setup_collocation (int collocated);
-    
-    CORBA_IDLType (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_CORBA_IDLType_Remote_Proxy_Impl;
-    friend class _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl;
-    friend class _TAO_CORBA_IDLType_Direct_Proxy_Impl;
-  
-  virtual ~CORBA_IDLType (void);
-private:
-  CORBA_IDLType (const CORBA_IDLType &);
-  void operator= (const CORBA_IDLType &);
-};
-
-
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
 
+      };
 
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
+      //
+      //             End Remote Proxy Impl. Declaration
+      ///////////////////////////////////////////////////////////////////////
 
-class TAO_IFR_Client_Export _TAO_CORBA_IDLType_Proxy_Impl : 
-  public virtual _TAO_CORBA_IRObject_Proxy_Impl
-{
-public:
-  virtual ~_TAO_CORBA_IDLType_Proxy_Impl (void) { }
-  
-    virtual CORBA::TypeCode_ptr type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
+      // The Proxy Brokers are used by each interface to get
+      // the right proxy for performing a call. In the new
+      // collocation scheme, the proxy to be used can vary on
+      // a call by call basis.
 
-protected:
-  _TAO_CORBA_IDLType_Proxy_Impl (void);
 
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
+      ///////////////////////////////////////////////////////////////////////
+      //                 Base Proxy Broker Declaration
+      //
 
+            class TAO_IFR_Client_Export _TAO_CORBA_IDLType_Proxy_Broker
+      {
+      public:
+        virtual ~_TAO_CORBA_IDLType_Proxy_Broker (void);
+        virtual _TAO_CORBA_IDLType_Proxy_Impl &select_proxy (
+            CORBA_IDLType *object,
+            CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+          ) = 0;
 
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_IDLType_Remote_Proxy_Impl : 
-  public virtual _TAO_CORBA_IDLType_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_IRObject_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_CORBA_IDLType_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_CORBA_IDLType_Remote_Proxy_Impl (void) { }
-  
-    virtual CORBA::TypeCode_ptr type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-};
-
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
-
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_IDLType_Proxy_Broker
-{
-public:
-  virtual ~_TAO_CORBA_IDLType_Proxy_Broker (void);
-  virtual _TAO_CORBA_IDLType_Proxy_Impl &select_proxy (
-    CORBA_IDLType *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
+      protected:
+        _TAO_CORBA_IDLType_Proxy_Broker (void);
 
-protected:
-  _TAO_CORBA_IDLType_Proxy_Broker (void);
-  
-};
+      };
 
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+      //
+      //              End Base Proxy Broker Declaration
+      ///////////////////////////////////////////////////////////////////////
 
 
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
+      ///////////////////////////////////////////////////////////////////////
+      //                 Remote Proxy Broker Declaration
+      //
 
-class TAO_IFR_Client_Export _TAO_CORBA_IDLType_Remote_Proxy_Broker : public virtual _TAO_CORBA_IDLType_Proxy_Broker
-{
-public: 
-  _TAO_CORBA_IDLType_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_CORBA_IDLType_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_CORBA_IDLType_Proxy_Impl &select_proxy (
-    CORBA_IDLType *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
+      class TAO_IFR_Client_Export _TAO_CORBA_IDLType_Remote_Proxy_Broker
+        : public virtual _TAO_CORBA_IDLType_Proxy_Broker
+      {
+      public:
+        _TAO_CORBA_IDLType_Remote_Proxy_Broker (void);
 
-private:
-  _TAO_CORBA_IDLType_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
+        virtual ~_TAO_CORBA_IDLType_Remote_Proxy_Broker (void);
 
-public:
-  static _TAO_CORBA_IDLType_Remote_Proxy_Broker *the_TAO_CORBA_IDLType_Remote_Proxy_Broker (void);
-};
+        virtual _TAO_CORBA_IDLType_Proxy_Impl &select_proxy (
+            CORBA_IDLType *object,
+            CORBA_Environment &ACE_TRY_ENV
+          );
+
+        private:
+          _TAO_CORBA_IDLType_Remote_Proxy_Impl remote_proxy_impl_;
 
+        public:
+          // This member function is used to get an handle to the unique instance
+          // of the Remote Proxy Broker that is available for a given
+          // interface.
+          static _TAO_CORBA_IDLType_Remote_Proxy_Broker *the_TAO_CORBA_IDLType_Remote_Proxy_Broker (void);
+        };
 
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+        //
+        //              End Remote Proxy Broker Declaration
+        ///////////////////////////////////////////////////////////////////////
 
 
 #endif /* end #if !defined */
@@ -4898,8 +5087,8 @@ public:
 #if !defined (_CORBA_TYPEDEFDEF___PTR_CH_)
 #define _CORBA_TYPEDEFDEF___PTR_CH_
 
-class CORBA_TypedefDef;
-typedef CORBA_TypedefDef *CORBA_TypedefDef_ptr;
+        class CORBA_TypedefDef;
+        typedef CORBA_TypedefDef *CORBA_TypedefDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -4907,41 +5096,44 @@ typedef CORBA_TypedefDef *CORBA_TypedefDef_ptr;
 #if !defined (_CORBA_TYPEDEFDEF___VAR_CH_)
 #define _CORBA_TYPEDEFDEF___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_TypedefDef_var : public TAO_Base_var
-{
-public:
-  CORBA_TypedefDef_var (void); // default constructor
-  CORBA_TypedefDef_var (CORBA_TypedefDef_ptr p) : ptr_ (p) {} 
-  CORBA_TypedefDef_var (const CORBA_TypedefDef_var &); // copy constructor
-  ~CORBA_TypedefDef_var (void); // destructor
-  
-  CORBA_TypedefDef_var &operator= (CORBA_TypedefDef_ptr);
-  CORBA_TypedefDef_var &operator= (const CORBA_TypedefDef_var &);
-  CORBA_TypedefDef_ptr operator-> (void) const;
-  
-  operator const CORBA_TypedefDef_ptr &() const;
-  operator CORBA_TypedefDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_TypedefDef_ptr in (void) const;
-  CORBA_TypedefDef_ptr &inout (void);
-  CORBA_TypedefDef_ptr &out (void);
-  CORBA_TypedefDef_ptr _retn (void);
-  CORBA_TypedefDef_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_TypedefDef_ptr duplicate (CORBA_TypedefDef_ptr);
-  static void release (CORBA_TypedefDef_ptr);
-  static CORBA_TypedefDef_ptr nil (void);
-  static CORBA_TypedefDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
-
-private:
-  CORBA_TypedefDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_TypedefDef_var (const TAO_Base_var &rhs);
-  CORBA_TypedefDef_var &operator= (const TAO_Base_var &rhs);
-};
+        class TAO_IFR_Client_Export CORBA_TypedefDef_var : public TAO_Base_var
+        {
+        public:
+          CORBA_TypedefDef_var (void); // default constructor
+          CORBA_TypedefDef_var (CORBA_TypedefDef_ptr p) : ptr_ (p) {}
+          CORBA_TypedefDef_var (const CORBA_TypedefDef_var &); // copy constructor
+          ~CORBA_TypedefDef_var (void); // destructor
+
+          CORBA_TypedefDef_var &operator= (CORBA_TypedefDef_ptr);
+          CORBA_TypedefDef_var &operator= (const CORBA_TypedefDef_var &);
+          CORBA_TypedefDef_ptr operator-> (void) const;
+
+          operator const CORBA_TypedefDef_ptr &() const;
+          operator CORBA_TypedefDef_ptr &();
+          // in, inout, out, _retn
+          CORBA_TypedefDef_ptr in (void) const;
+          CORBA_TypedefDef_ptr &inout (void);
+          CORBA_TypedefDef_ptr &out (void);
+          CORBA_TypedefDef_ptr _retn (void);
+          CORBA_TypedefDef_ptr ptr (void) const;
+
+          // Hooks used by template sequence and object manager classes
+          // for non-defined forward declared interfaces.
+          static CORBA_TypedefDef_ptr duplicate (CORBA_TypedefDef_ptr);
+          static void release (CORBA_TypedefDef_ptr);
+          static CORBA_TypedefDef_ptr nil (void);
+          static CORBA_TypedefDef_ptr narrow (
+              CORBA::Object *,
+              CORBA::Environment &
+            );
+          static CORBA::Object * upcast (void *);
+
+        private:
+          CORBA_TypedefDef_ptr ptr_;
+          // Unimplemented - prevents widening assignment.
+          CORBA_TypedefDef_var (const TAO_Base_var &rhs);
+          CORBA_TypedefDef_var &operator= (const TAO_Base_var &rhs);
+        };
 
 
 #endif /* end #if !defined */
@@ -4950,22 +5142,22 @@ private:
 #if !defined (_CORBA_TYPEDEFDEF___OUT_CH_)
 #define _CORBA_TYPEDEFDEF___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_TypedefDef_out
-{
-public:
-  CORBA_TypedefDef_out (CORBA_TypedefDef_ptr &);
-  CORBA_TypedefDef_out (CORBA_TypedefDef_var &);
-  CORBA_TypedefDef_out (const CORBA_TypedefDef_out &);
-  CORBA_TypedefDef_out &operator= (const CORBA_TypedefDef_out &);
-  CORBA_TypedefDef_out &operator= (const CORBA_TypedefDef_var &);
-  CORBA_TypedefDef_out &operator= (CORBA_TypedefDef_ptr);
-  operator CORBA_TypedefDef_ptr &();
-  CORBA_TypedefDef_ptr &ptr (void);
-  CORBA_TypedefDef_ptr operator-> (void);
+        class TAO_IFR_Client_Export CORBA_TypedefDef_out
+        {
+        public:
+          CORBA_TypedefDef_out (CORBA_TypedefDef_ptr &);
+          CORBA_TypedefDef_out (CORBA_TypedefDef_var &);
+          CORBA_TypedefDef_out (const CORBA_TypedefDef_out &);
+          CORBA_TypedefDef_out &operator= (const CORBA_TypedefDef_out &);
+          CORBA_TypedefDef_out &operator= (const CORBA_TypedefDef_var &);
+          CORBA_TypedefDef_out &operator= (CORBA_TypedefDef_ptr);
+          operator CORBA_TypedefDef_ptr &();
+          CORBA_TypedefDef_ptr &ptr (void);
+          CORBA_TypedefDef_ptr operator-> (void);
 
-private:
-  CORBA_TypedefDef_ptr &ptr_;
-};
+        private:
+          CORBA_TypedefDef_ptr &ptr_;
+        };
 
 
 #endif /* end #if !defined */
@@ -4974,1022 +5166,1026 @@ private:
 #if !defined (_CORBA_TYPEDEFDEF_CH_)
 #define _CORBA_TYPEDEFDEF_CH_
 
-// Forward Classes Declaration
-class _TAO_CORBA_TypedefDef_Proxy_Impl;
-class _TAO_CORBA_TypedefDef_Remote_Proxy_Impl;
-class _TAO_CORBA_TypedefDef_Proxy_Broker;
-class _TAO_CORBA_TypedefDef_Remote_Proxy_Broker;
+        // Forward Classes Declaration
+        class _TAO_CORBA_TypedefDef_Proxy_Impl;
+        class _TAO_CORBA_TypedefDef_Remote_Proxy_Impl;
+        class _TAO_CORBA_TypedefDef_Proxy_Broker;
+        class _TAO_CORBA_TypedefDef_Remote_Proxy_Broker;
 
-class TAO_IFR_Client_Export CORBA_TypedefDef: public virtual CORBA_Contained, public virtual CORBA_IDLType
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_TypedefDef_ptr _ptr_type;
-  typedef CORBA_TypedefDef_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
+        class TAO_IFR_Client_Export CORBA_TypedefDef
+          : public virtual CORBA_Contained,
+            public virtual CORBA_IDLType
+        {
+        public:
+        #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+          typedef CORBA_TypedefDef_ptr _ptr_type;
+          typedef CORBA_TypedefDef_var _var_type;
+        #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+          // the static operations
+          static CORBA_TypedefDef_ptr _duplicate (CORBA_TypedefDef_ptr obj);
+
+          static CORBA_TypedefDef_ptr _narrow (
+              CORBA::Object_ptr obj,
+              CORBA::Environment &ACE_TRY_ENV =
+                TAO_default_environment ()
+            );
+
+          static CORBA_TypedefDef_ptr _unchecked_narrow (
+              CORBA::Object_ptr obj,
+              CORBA::Environment &ACE_TRY_ENV =
+                TAO_default_environment ()
+            );
 
-  // the static operations
-  static CORBA_TypedefDef_ptr _duplicate (CORBA_TypedefDef_ptr obj);
-  static CORBA_TypedefDef_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_TypedefDef_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_TypedefDef_ptr _nil (void)
-    {
-      return (CORBA_TypedefDef_ptr)0;
-    }
+          static CORBA_TypedefDef_ptr _nil (void)
+            {
+              return (CORBA_TypedefDef_ptr)0;
+            }
+
+          static void _tao_any_destructor (void*);
+
+          virtual CORBA::Boolean _is_a (
+              const CORBA::Char *type_id,
+              CORBA::Environment &ACE_TRY_ENV =
+                TAO_default_environment ()
+            );
+
+          virtual void *_tao_QueryInterface (ptr_arith_t type);
 
-  static void _tao_any_destructor (void*);
+          virtual const char* _interface_repository_id (void) const;
+
+        private:
+          _TAO_CORBA_TypedefDef_Proxy_Broker *the_TAO_CORBA_TypedefDef_Proxy_Broker_;
 
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
+        protected:
+          CORBA_TypedefDef (int collocated = 0);
 
-private:
-  _TAO_CORBA_TypedefDef_Proxy_Broker *the_TAO_CORBA_TypedefDef_Proxy_Broker_;
-  
-protected:
-  CORBA_TypedefDef (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void CORBA_TypedefDef_setup_collocation (int collocated);
-    
-    CORBA_TypedefDef (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_CORBA_TypedefDef_Remote_Proxy_Impl;
-    friend class _TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_CORBA_TypedefDef_Direct_Proxy_Impl;
-  
-  virtual ~CORBA_TypedefDef (void);
-private:
-  CORBA_TypedefDef (const CORBA_TypedefDef &);
-  void operator= (const CORBA_TypedefDef &);
-};
+          // This methods travese the inheritance tree and set the
+          // parents piece of the given class in the right mode
+          virtual void CORBA_TypedefDef_setup_collocation (int collocated);
 
+          CORBA_TypedefDef (
+              TAO_Stub *objref,
+              CORBA::Boolean _tao_collocated = 0,
+              TAO_Abstract_ServantBase *servant = 0
+            );
 
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
+          friend class _TAO_CORBA_TypedefDef_Remote_Proxy_Impl;
+          friend class _TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl;
+          friend class _TAO_CORBA_TypedefDef_Direct_Proxy_Impl;
 
+          virtual ~CORBA_TypedefDef (void);
 
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
+        private:
+          CORBA_TypedefDef (const CORBA_TypedefDef &);
+          void operator= (const CORBA_TypedefDef &);
+        };
+
+        // The Proxy Implementations are used by each interface to
+        // perform a call. Each different implementation encapsulate
+        // an invocation logics.
+
+
+        ///////////////////////////////////////////////////////////////////////
+        //                    Base Proxy Impl. Declaration
+        //
 
-class TAO_IFR_Client_Export _TAO_CORBA_TypedefDef_Proxy_Impl : 
-  public virtual _TAO_CORBA_Contained_Proxy_Impl, 
-  public virtual _TAO_CORBA_IDLType_Proxy_Impl
-{
-public:
-  virtual ~_TAO_CORBA_TypedefDef_Proxy_Impl (void) { }
-  
-  protected:
-  _TAO_CORBA_TypedefDef_Proxy_Impl (void);
+        class TAO_IFR_Client_Export _TAO_CORBA_TypedefDef_Proxy_Impl
+          : public virtual _TAO_CORBA_Contained_Proxy_Impl,
+            public virtual _TAO_CORBA_IDLType_Proxy_Impl
+        {
+        public:
+          virtual ~_TAO_CORBA_TypedefDef_Proxy_Impl (void) { }
 
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
+        protected:
+          _TAO_CORBA_TypedefDef_Proxy_Impl (void);
+        };
 
+        //
+        //               End Base Proxy Impl. Declaration
+        ///////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
 
-class TAO_IFR_Client_Export _TAO_CORBA_TypedefDef_Remote_Proxy_Impl : 
-  public virtual _TAO_CORBA_TypedefDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl, 
-  public virtual _TAO_CORBA_IDLType_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_CORBA_TypedefDef_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_CORBA_TypedefDef_Remote_Proxy_Impl (void) { }
-  
-  };
+        ///////////////////////////////////////////////////////////////////////
+        //                Remote Proxy Impl. Declaration
+        //
 
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
+        class TAO_IFR_Client_Export _TAO_CORBA_TypedefDef_Remote_Proxy_Impl
+          : public virtual _TAO_CORBA_TypedefDef_Proxy_Impl,
+            public virtual TAO_Remote_Object_Proxy_Impl,
+            public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl,
+            public virtual _TAO_CORBA_IDLType_Remote_Proxy_Impl
+        {
+        public:
+          _TAO_CORBA_TypedefDef_Remote_Proxy_Impl (void);
 
+          virtual ~_TAO_CORBA_TypedefDef_Remote_Proxy_Impl (void) { }
 
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
+        };
 
+        //
+        //             End Remote Proxy Impl. Declaration
+        ///////////////////////////////////////////////////////////////////////
 
+        // The Proxy Brokers are used by each interface to get
+        // the right proxy for performing a call. In the new
+        // collocation scheme, the proxy to be used can vary on
+        // a call by call basis.
 
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
 
-class TAO_IFR_Client_Export _TAO_CORBA_TypedefDef_Proxy_Broker
-{
-public:
-  virtual ~_TAO_CORBA_TypedefDef_Proxy_Broker (void);
-  virtual _TAO_CORBA_TypedefDef_Proxy_Impl &select_proxy (
-    CORBA_TypedefDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
+        ///////////////////////////////////////////////////////////////////////
+        //                 Base Proxy Broker Declaration
+        //
 
-protected:
-  _TAO_CORBA_TypedefDef_Proxy_Broker (void);
-  
-};
+                class TAO_IFR_Client_Export _TAO_CORBA_TypedefDef_Proxy_Broker
+        {
+        public:
+          virtual ~_TAO_CORBA_TypedefDef_Proxy_Broker (void);
+          virtual _TAO_CORBA_TypedefDef_Proxy_Impl &select_proxy (
+              CORBA_TypedefDef *object,
+              CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+            ) = 0;
 
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+        protected:
+          _TAO_CORBA_TypedefDef_Proxy_Broker (void);
 
+        };
 
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
+        //
+        //              End Base Proxy Broker Declaration
+        ///////////////////////////////////////////////////////////////////////
 
-class TAO_IFR_Client_Export _TAO_CORBA_TypedefDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_TypedefDef_Proxy_Broker
-{
-public: 
-  _TAO_CORBA_TypedefDef_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_CORBA_TypedefDef_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_CORBA_TypedefDef_Proxy_Impl &select_proxy (
-    CORBA_TypedefDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
 
-private:
-  _TAO_CORBA_TypedefDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
-
-public:
-  static _TAO_CORBA_TypedefDef_Remote_Proxy_Broker *the_TAO_CORBA_TypedefDef_Remote_Proxy_Broker (void);
-};
+        ///////////////////////////////////////////////////////////////////////
+        //                 Remote Proxy Broker Declaration
+        //
 
+        class TAO_IFR_Client_Export _TAO_CORBA_TypedefDef_Remote_Proxy_Broker
+          : public virtual _TAO_CORBA_TypedefDef_Proxy_Broker
+        {
+        public:
+          _TAO_CORBA_TypedefDef_Remote_Proxy_Broker (void);
 
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+          virtual ~_TAO_CORBA_TypedefDef_Remote_Proxy_Broker (void);
 
+          virtual _TAO_CORBA_TypedefDef_Proxy_Impl &select_proxy (
+              CORBA_TypedefDef *object,
+              CORBA_Environment &ACE_TRY_ENV
+            );
 
-#endif /* end #if !defined */
+          private:
+            _TAO_CORBA_TypedefDef_Remote_Proxy_Impl remote_proxy_impl_;
 
-struct CORBA_TypeDescription;
-class CORBA_TypeDescription_var;
+          public:
+            // This member function is used to get an handle to the unique instance
+            // of the Remote Proxy Broker that is available for a given
+            // interface.
+            static _TAO_CORBA_TypedefDef_Remote_Proxy_Broker *the_TAO_CORBA_TypedefDef_Remote_Proxy_Broker (void);
+          };
 
-struct TAO_IFR_Client_Export CORBA_TypeDescription
-{
+          //
+          //              End Remote Proxy Broker Declaration
+          ///////////////////////////////////////////////////////////////////////
 
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_TypeDescription_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
 
-  static void _tao_any_destructor (void*);
+#endif /* end #if !defined */
 
-  TAO_String_Manager name;
-  TAO_String_Manager id;
-  TAO_String_Manager defined_in;
-  TAO_String_Manager version;
-  CORBA::TypeCode_var type;
-};
+          struct CORBA_TypeDescription;
+          class CORBA_TypeDescription_var;
 
-class TAO_IFR_Client_Export CORBA_TypeDescription_var
-{
-public:
-  CORBA_TypeDescription_var (void); // default constructor
-  CORBA_TypeDescription_var (CORBA_TypeDescription *);
-  CORBA_TypeDescription_var (const CORBA_TypeDescription_var &); // copy constructor
-  ~CORBA_TypeDescription_var (void); // destructor
-  
-  CORBA_TypeDescription_var &operator= (CORBA_TypeDescription *);
-  CORBA_TypeDescription_var &operator= (const CORBA_TypeDescription_var &);
-  CORBA_TypeDescription *operator-> (void);
-  const CORBA_TypeDescription *operator-> (void) const;
-  
-  operator const CORBA_TypeDescription &() const;
-  operator CORBA_TypeDescription &();
-  operator CORBA_TypeDescription &() const;
-  operator CORBA_TypeDescription *&(); // variable-size types only
-  
-  // in, inout, out, _retn 
-  const CORBA_TypeDescription &in (void) const;
-  CORBA_TypeDescription &inout (void);
-  CORBA_TypeDescription *&out (void);
-  CORBA_TypeDescription *_retn (void);
-  CORBA_TypeDescription *ptr (void) const;
-
-private:
-  CORBA_TypeDescription *ptr_;
-};
+          struct TAO_IFR_Client_Export CORBA_TypeDescription
+          {
 
-class TAO_IFR_Client_Export CORBA_TypeDescription_out
-{
-public:
-  CORBA_TypeDescription_out (CORBA_TypeDescription *&);
-  CORBA_TypeDescription_out (CORBA_TypeDescription_var &);
-  CORBA_TypeDescription_out (const CORBA_TypeDescription_out &);
-  CORBA_TypeDescription_out &operator= (const CORBA_TypeDescription_out &);
-  CORBA_TypeDescription_out &operator= (CORBA_TypeDescription *);
-  operator CORBA_TypeDescription *&();
-  CORBA_TypeDescription *&ptr (void);
-  CORBA_TypeDescription *operator-> (void);
-  
-private:
-  CORBA_TypeDescription *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_TypeDescription_var &);
-};
+#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+            typedef CORBA_TypeDescription_var _var_type;
+#endif /* ! __GNUC__ || g++ >= 2.8 */
 
-// Proxy Broker Factory function pointer declarations.
-
-extern TAO_IFR_Client_Export
-_TAO_CORBA_IRObject_Proxy_Broker *
-(*_TAO_CORBA_IRObject_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-_TAO_CORBA_Contained_Proxy_Broker *
-(*_TAO_CORBA_Contained_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-_TAO_CORBA_Container_Proxy_Broker *
-(*_TAO_CORBA_Container_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-_TAO_CORBA_IDLType_Proxy_Broker *
-(*_TAO_CORBA_IDLType_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-_TAO_CORBA_TypedefDef_Proxy_Broker *
-(*_TAO_CORBA_TypedefDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-// Declarations for undefined interface
-// CORBA_Repository
-TAO_IFR_Client_Export
-CORBA_Repository_ptr
-tao_CORBA_Repository_duplicate (
-    CORBA_Repository_ptr
-  );
-TAO_IFR_Client_Export
-void
-tao_CORBA_Repository_release (
-    CORBA_Repository_ptr
-  );
-TAO_IFR_Client_Export
-CORBA_Repository_ptr
-tao_CORBA_Repository_nil (
-    void
-  );
-TAO_IFR_Client_Export
-CORBA_Repository_ptr
-tao_CORBA_Repository_narrow (
-    CORBA::Object *,
-    CORBA::Environment &
-  );
-TAO_IFR_Client_Export
-CORBA::Object *
-tao_CORBA_Repository_upcast (
-    void *
-  );
-
-// Declarations for undefined interface
-// CORBA_ModuleDef
-TAO_IFR_Client_Export
-CORBA_ModuleDef_ptr
-tao_CORBA_ModuleDef_duplicate (
-    CORBA_ModuleDef_ptr
-  );
-TAO_IFR_Client_Export
-void
-tao_CORBA_ModuleDef_release (
-    CORBA_ModuleDef_ptr
-  );
-TAO_IFR_Client_Export
-CORBA_ModuleDef_ptr
-tao_CORBA_ModuleDef_nil (
-    void
-  );
-TAO_IFR_Client_Export
-CORBA_ModuleDef_ptr
-tao_CORBA_ModuleDef_narrow (
-    CORBA::Object *,
-    CORBA::Environment &
-  );
-TAO_IFR_Client_Export
-CORBA::Object *
-tao_CORBA_ModuleDef_upcast (
-    void *
-  );
-
-// Declarations for undefined interface
-// CORBA_ConstantDef
-TAO_IFR_Client_Export
-CORBA_ConstantDef_ptr
-tao_CORBA_ConstantDef_duplicate (
-    CORBA_ConstantDef_ptr
-  );
-TAO_IFR_Client_Export
-void
-tao_CORBA_ConstantDef_release (
-    CORBA_ConstantDef_ptr
-  );
-TAO_IFR_Client_Export
-CORBA_ConstantDef_ptr
-tao_CORBA_ConstantDef_nil (
-    void
-  );
-TAO_IFR_Client_Export
-CORBA_ConstantDef_ptr
-tao_CORBA_ConstantDef_narrow (
-    CORBA::Object *,
-    CORBA::Environment &
-  );
-TAO_IFR_Client_Export
-CORBA::Object *
-tao_CORBA_ConstantDef_upcast (
-    void *
-  );
-
-// Declarations for undefined interface
-// CORBA_StructDef
-TAO_IFR_Client_Export
-CORBA_StructDef_ptr
-tao_CORBA_StructDef_duplicate (
-    CORBA_StructDef_ptr
-  );
-TAO_IFR_Client_Export
-void
-tao_CORBA_StructDef_release (
-    CORBA_StructDef_ptr
-  );
-TAO_IFR_Client_Export
-CORBA_StructDef_ptr
-tao_CORBA_StructDef_nil (
-    void
-  );
-TAO_IFR_Client_Export
-CORBA_StructDef_ptr
-tao_CORBA_StructDef_narrow (
-    CORBA::Object *,
-    CORBA::Environment &
-  );
-TAO_IFR_Client_Export
-CORBA::Object *
-tao_CORBA_StructDef_upcast (
-    void *
-  );
-
-// Declarations for undefined interface
-// CORBA_UnionDef
-TAO_IFR_Client_Export
-CORBA_UnionDef_ptr
-tao_CORBA_UnionDef_duplicate (
-    CORBA_UnionDef_ptr
-  );
-TAO_IFR_Client_Export
-void
-tao_CORBA_UnionDef_release (
-    CORBA_UnionDef_ptr
-  );
-TAO_IFR_Client_Export
-CORBA_UnionDef_ptr
-tao_CORBA_UnionDef_nil (
-    void
-  );
-TAO_IFR_Client_Export
-CORBA_UnionDef_ptr
-tao_CORBA_UnionDef_narrow (
-    CORBA::Object *,
-    CORBA::Environment &
-  );
-TAO_IFR_Client_Export
-CORBA::Object *
-tao_CORBA_UnionDef_upcast (
-    void *
-  );
-
-// Declarations for undefined interface
-// CORBA_EnumDef
-TAO_IFR_Client_Export
-CORBA_EnumDef_ptr
-tao_CORBA_EnumDef_duplicate (
-    CORBA_EnumDef_ptr
-  );
-TAO_IFR_Client_Export
-void
-tao_CORBA_EnumDef_release (
-    CORBA_EnumDef_ptr
-  );
-TAO_IFR_Client_Export
-CORBA_EnumDef_ptr
-tao_CORBA_EnumDef_nil (
-    void
-  );
-TAO_IFR_Client_Export
-CORBA_EnumDef_ptr
-tao_CORBA_EnumDef_narrow (
-    CORBA::Object *,
-    CORBA::Environment &
-  );
-TAO_IFR_Client_Export
-CORBA::Object *
-tao_CORBA_EnumDef_upcast (
-    void *
-  );
-
-// Declarations for undefined interface
-// CORBA_AliasDef
-TAO_IFR_Client_Export
-CORBA_AliasDef_ptr
-tao_CORBA_AliasDef_duplicate (
-    CORBA_AliasDef_ptr
-  );
-TAO_IFR_Client_Export
-void
-tao_CORBA_AliasDef_release (
-    CORBA_AliasDef_ptr
-  );
-TAO_IFR_Client_Export
-CORBA_AliasDef_ptr
-tao_CORBA_AliasDef_nil (
-    void
-  );
-TAO_IFR_Client_Export
-CORBA_AliasDef_ptr
-tao_CORBA_AliasDef_narrow (
-    CORBA::Object *,
-    CORBA::Environment &
-  );
-TAO_IFR_Client_Export
-CORBA::Object *
-tao_CORBA_AliasDef_upcast (
-    void *
-  );
-
-// Declarations for undefined interface
-// CORBA_InterfaceDef
-TAO_IFR_Client_Export
-CORBA_InterfaceDef_ptr
-tao_CORBA_InterfaceDef_duplicate (
-    CORBA_InterfaceDef_ptr
-  );
-TAO_IFR_Client_Export
-void
-tao_CORBA_InterfaceDef_release (
-    CORBA_InterfaceDef_ptr
-  );
-TAO_IFR_Client_Export
-CORBA_InterfaceDef_ptr
-tao_CORBA_InterfaceDef_nil (
-    void
-  );
-TAO_IFR_Client_Export
-CORBA_InterfaceDef_ptr
-tao_CORBA_InterfaceDef_narrow (
-    CORBA::Object *,
-    CORBA::Environment &
-  );
-TAO_IFR_Client_Export
-CORBA::Object *
-tao_CORBA_InterfaceDef_upcast (
-    void *
-  );
-
-// Declarations for undefined interface
-// CORBA_ExceptionDef
-TAO_IFR_Client_Export
-CORBA_ExceptionDef_ptr
-tao_CORBA_ExceptionDef_duplicate (
-    CORBA_ExceptionDef_ptr
-  );
-TAO_IFR_Client_Export
-void
-tao_CORBA_ExceptionDef_release (
-    CORBA_ExceptionDef_ptr
-  );
-TAO_IFR_Client_Export
-CORBA_ExceptionDef_ptr
-tao_CORBA_ExceptionDef_nil (
-    void
-  );
-TAO_IFR_Client_Export
-CORBA_ExceptionDef_ptr
-tao_CORBA_ExceptionDef_narrow (
-    CORBA::Object *,
-    CORBA::Environment &
-  );
-TAO_IFR_Client_Export
-CORBA::Object *
-tao_CORBA_ExceptionDef_upcast (
-    void *
-  );
-
-// Declarations for undefined interface
-// CORBA_NativeDef
-TAO_IFR_Client_Export
-CORBA_NativeDef_ptr
-tao_CORBA_NativeDef_duplicate (
-    CORBA_NativeDef_ptr
-  );
-TAO_IFR_Client_Export
-void
-tao_CORBA_NativeDef_release (
-    CORBA_NativeDef_ptr
-  );
-TAO_IFR_Client_Export
-CORBA_NativeDef_ptr
-tao_CORBA_NativeDef_nil (
-    void
-  );
-TAO_IFR_Client_Export
-CORBA_NativeDef_ptr
-tao_CORBA_NativeDef_narrow (
-    CORBA::Object *,
-    CORBA::Environment &
-  );
-TAO_IFR_Client_Export
-CORBA::Object *
-tao_CORBA_NativeDef_upcast (
-    void *
-  );
-
-// Declarations for undefined interface
-// CORBA_ValueDef
-TAO_IFR_Client_Export
-CORBA_ValueDef_ptr
-tao_CORBA_ValueDef_duplicate (
-    CORBA_ValueDef_ptr
-  );
-TAO_IFR_Client_Export
-void
-tao_CORBA_ValueDef_release (
-    CORBA_ValueDef_ptr
-  );
-TAO_IFR_Client_Export
-CORBA_ValueDef_ptr
-tao_CORBA_ValueDef_nil (
-    void
-  );
-TAO_IFR_Client_Export
-CORBA_ValueDef_ptr
-tao_CORBA_ValueDef_narrow (
-    CORBA::Object *,
-    CORBA::Environment &
-  );
-TAO_IFR_Client_Export
-CORBA::Object *
-tao_CORBA_ValueDef_upcast (
-    void *
-  );
-
-// Declarations for undefined interface
-// CORBA_ValueBoxDef
-TAO_IFR_Client_Export
-CORBA_ValueBoxDef_ptr
-tao_CORBA_ValueBoxDef_duplicate (
-    CORBA_ValueBoxDef_ptr
-  );
-TAO_IFR_Client_Export
-void
-tao_CORBA_ValueBoxDef_release (
-    CORBA_ValueBoxDef_ptr
-  );
-TAO_IFR_Client_Export
-CORBA_ValueBoxDef_ptr
-tao_CORBA_ValueBoxDef_nil (
-    void
-  );
-TAO_IFR_Client_Export
-CORBA_ValueBoxDef_ptr
-tao_CORBA_ValueBoxDef_narrow (
-    CORBA::Object *,
-    CORBA::Environment &
-  );
-TAO_IFR_Client_Export
-CORBA::Object *
-tao_CORBA_ValueBoxDef_upcast (
-    void *
-  );
-
-// Declarations for undefined interface
-// CORBA_AbstractInterfaceDef
-TAO_IFR_Client_Export
-CORBA_AbstractInterfaceDef_ptr
-tao_CORBA_AbstractInterfaceDef_duplicate (
-    CORBA_AbstractInterfaceDef_ptr
-  );
-TAO_IFR_Client_Export
-void
-tao_CORBA_AbstractInterfaceDef_release (
-    CORBA_AbstractInterfaceDef_ptr
-  );
-TAO_IFR_Client_Export
-CORBA_AbstractInterfaceDef_ptr
-tao_CORBA_AbstractInterfaceDef_nil (
-    void
-  );
-TAO_IFR_Client_Export
-CORBA_AbstractInterfaceDef_ptr
-tao_CORBA_AbstractInterfaceDef_narrow (
-    CORBA::Object *,
-    CORBA::Environment &
-  );
-TAO_IFR_Client_Export
-CORBA::Object *
-tao_CORBA_AbstractInterfaceDef_upcast (
-    void *
-  );
-
-// Declarations for undefined interface
-// CORBA_LocalInterfaceDef
-TAO_IFR_Client_Export
-CORBA_LocalInterfaceDef_ptr
-tao_CORBA_LocalInterfaceDef_duplicate (
-    CORBA_LocalInterfaceDef_ptr
-  );
-TAO_IFR_Client_Export
-void
-tao_CORBA_LocalInterfaceDef_release (
-    CORBA_LocalInterfaceDef_ptr
-  );
-TAO_IFR_Client_Export
-CORBA_LocalInterfaceDef_ptr
-tao_CORBA_LocalInterfaceDef_nil (
-    void
-  );
-TAO_IFR_Client_Export
-CORBA_LocalInterfaceDef_ptr
-tao_CORBA_LocalInterfaceDef_narrow (
-    CORBA::Object *,
-    CORBA::Environment &
-  );
-TAO_IFR_Client_Export
-CORBA::Object *
-tao_CORBA_LocalInterfaceDef_upcast (
-    void *
-  );
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::DefinitionKind);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::DefinitionKind &);
-// Any operators for interface CORBA_IRObject
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_IRObject_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_IRObject *&);
-// Any operators for interface CORBA_Repository
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_Repository_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_Repository *&);
-// Any operators for interface CORBA_Contained
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_Contained_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_Contained *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_Contained::Description &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_Contained::Description*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_Contained::Description *&); // deprecated
+            static void _tao_any_destructor (void*);
+
+            TAO_String_Manager name;
+            TAO_String_Manager id;
+            TAO_String_Manager defined_in;
+            TAO_String_Manager version;
+            CORBA::TypeCode_var type;
+
+          };
+
+          class TAO_IFR_Client_Export CORBA_TypeDescription_var
+          {
+          public:
+            CORBA_TypeDescription_var (void);
+            CORBA_TypeDescription_var (CORBA_TypeDescription *);
+            CORBA_TypeDescription_var (const CORBA_TypeDescription_var &);
+            ~CORBA_TypeDescription_var (void);
+
+            CORBA_TypeDescription_var &operator= (CORBA_TypeDescription *);
+            CORBA_TypeDescription_var &operator= (const CORBA_TypeDescription_var &);
+            CORBA_TypeDescription *operator-> (void);
+            const CORBA_TypeDescription *operator-> (void) const;
+
+            operator const CORBA_TypeDescription &() const;
+            operator CORBA_TypeDescription &();
+            operator CORBA_TypeDescription &() const;
+            // Variable-size types only.
+            operator CORBA_TypeDescription *&();
+
+            // in, inout, out, _retn
+            const CORBA_TypeDescription &in (void) const;
+            CORBA_TypeDescription &inout (void);
+            CORBA_TypeDescription *&out (void);
+            CORBA_TypeDescription *_retn (void);
+            CORBA_TypeDescription *ptr (void) const;
+
+          private:
+            CORBA_TypeDescription *ptr_;
+          };
+
+          class TAO_IFR_Client_Export CORBA_TypeDescription_out
+          {
+          public:
+            CORBA_TypeDescription_out (CORBA_TypeDescription *&);
+            CORBA_TypeDescription_out (CORBA_TypeDescription_var &);
+            CORBA_TypeDescription_out (const CORBA_TypeDescription_out &);
+            CORBA_TypeDescription_out &operator= (const CORBA_TypeDescription_out &);
+            CORBA_TypeDescription_out &operator= (CORBA_TypeDescription *);
+            operator CORBA_TypeDescription *&();
+            CORBA_TypeDescription *&ptr (void);
+            CORBA_TypeDescription *operator-> (void);
+
+          private:
+            CORBA_TypeDescription *&ptr_;
+            // Assignment from T_var not allowed.
+            void operator= (const CORBA_TypeDescription_var &);
+          };
+
+          // Proxy Broker Factory function pointer declarations.
+
+          extern TAO_IFR_Client_Export
+          _TAO_CORBA_IRObject_Proxy_Broker *
+          (*_TAO_CORBA_IRObject_Proxy_Broker_Factory_function_pointer) (
+              CORBA::Object_ptr obj
+            );
+
+          extern TAO_IFR_Client_Export
+          _TAO_CORBA_Contained_Proxy_Broker *
+          (*_TAO_CORBA_Contained_Proxy_Broker_Factory_function_pointer) (
+              CORBA::Object_ptr obj
+            );
+
+          extern TAO_IFR_Client_Export
+          _TAO_CORBA_Container_Proxy_Broker *
+          (*_TAO_CORBA_Container_Proxy_Broker_Factory_function_pointer) (
+              CORBA::Object_ptr obj
+            );
+
+          extern TAO_IFR_Client_Export
+          _TAO_CORBA_IDLType_Proxy_Broker *
+          (*_TAO_CORBA_IDLType_Proxy_Broker_Factory_function_pointer) (
+              CORBA::Object_ptr obj
+            );
+
+          extern TAO_IFR_Client_Export
+          _TAO_CORBA_TypedefDef_Proxy_Broker *
+          (*_TAO_CORBA_TypedefDef_Proxy_Broker_Factory_function_pointer) (
+              CORBA::Object_ptr obj
+            );
+
+          // External declarations for undefined interface
+          // CORBA_Repository
+          TAO_IFR_Client_Export
+          CORBA_Repository_ptr
+          tao_CORBA_Repository_duplicate (
+              CORBA_Repository_ptr
+            );
+          TAO_IFR_Client_Export
+          void
+          tao_CORBA_Repository_release (
+              CORBA_Repository_ptr
+            );
+          TAO_IFR_Client_Export
+          CORBA_Repository_ptr
+          tao_CORBA_Repository_nil (
+              void
+            );
+          TAO_IFR_Client_Export
+          CORBA_Repository_ptr
+          tao_CORBA_Repository_narrow (
+              CORBA::Object *,
+              CORBA::Environment &
+            );
+          TAO_IFR_Client_Export
+          CORBA::Object *
+          tao_CORBA_Repository_upcast (
+              void *
+            );
+
+          // External declarations for undefined interface
+          // CORBA_ModuleDef
+          TAO_IFR_Client_Export
+          CORBA_ModuleDef_ptr
+          tao_CORBA_ModuleDef_duplicate (
+              CORBA_ModuleDef_ptr
+            );
+          TAO_IFR_Client_Export
+          void
+          tao_CORBA_ModuleDef_release (
+              CORBA_ModuleDef_ptr
+            );
+          TAO_IFR_Client_Export
+          CORBA_ModuleDef_ptr
+          tao_CORBA_ModuleDef_nil (
+              void
+            );
+          TAO_IFR_Client_Export
+          CORBA_ModuleDef_ptr
+          tao_CORBA_ModuleDef_narrow (
+              CORBA::Object *,
+              CORBA::Environment &
+            );
+          TAO_IFR_Client_Export
+          CORBA::Object *
+          tao_CORBA_ModuleDef_upcast (
+              void *
+            );
+
+          // External declarations for undefined interface
+          // CORBA_ConstantDef
+          TAO_IFR_Client_Export
+          CORBA_ConstantDef_ptr
+          tao_CORBA_ConstantDef_duplicate (
+              CORBA_ConstantDef_ptr
+            );
+          TAO_IFR_Client_Export
+          void
+          tao_CORBA_ConstantDef_release (
+              CORBA_ConstantDef_ptr
+            );
+          TAO_IFR_Client_Export
+          CORBA_ConstantDef_ptr
+          tao_CORBA_ConstantDef_nil (
+              void
+            );
+          TAO_IFR_Client_Export
+          CORBA_ConstantDef_ptr
+          tao_CORBA_ConstantDef_narrow (
+              CORBA::Object *,
+              CORBA::Environment &
+            );
+          TAO_IFR_Client_Export
+          CORBA::Object *
+          tao_CORBA_ConstantDef_upcast (
+              void *
+            );
+
+          // External declarations for undefined interface
+          // CORBA_StructDef
+          TAO_IFR_Client_Export
+          CORBA_StructDef_ptr
+          tao_CORBA_StructDef_duplicate (
+              CORBA_StructDef_ptr
+            );
+          TAO_IFR_Client_Export
+          void
+          tao_CORBA_StructDef_release (
+              CORBA_StructDef_ptr
+            );
+          TAO_IFR_Client_Export
+          CORBA_StructDef_ptr
+          tao_CORBA_StructDef_nil (
+              void
+            );
+          TAO_IFR_Client_Export
+          CORBA_StructDef_ptr
+          tao_CORBA_StructDef_narrow (
+              CORBA::Object *,
+              CORBA::Environment &
+            );
+          TAO_IFR_Client_Export
+          CORBA::Object *
+          tao_CORBA_StructDef_upcast (
+              void *
+            );
+
+          // External declarations for undefined interface
+          // CORBA_UnionDef
+          TAO_IFR_Client_Export
+          CORBA_UnionDef_ptr
+          tao_CORBA_UnionDef_duplicate (
+              CORBA_UnionDef_ptr
+            );
+          TAO_IFR_Client_Export
+          void
+          tao_CORBA_UnionDef_release (
+              CORBA_UnionDef_ptr
+            );
+          TAO_IFR_Client_Export
+          CORBA_UnionDef_ptr
+          tao_CORBA_UnionDef_nil (
+              void
+            );
+          TAO_IFR_Client_Export
+          CORBA_UnionDef_ptr
+          tao_CORBA_UnionDef_narrow (
+              CORBA::Object *,
+              CORBA::Environment &
+            );
+          TAO_IFR_Client_Export
+          CORBA::Object *
+          tao_CORBA_UnionDef_upcast (
+              void *
+            );
+
+          // External declarations for undefined interface
+          // CORBA_EnumDef
+          TAO_IFR_Client_Export
+          CORBA_EnumDef_ptr
+          tao_CORBA_EnumDef_duplicate (
+              CORBA_EnumDef_ptr
+            );
+          TAO_IFR_Client_Export
+          void
+          tao_CORBA_EnumDef_release (
+              CORBA_EnumDef_ptr
+            );
+          TAO_IFR_Client_Export
+          CORBA_EnumDef_ptr
+          tao_CORBA_EnumDef_nil (
+              void
+            );
+          TAO_IFR_Client_Export
+          CORBA_EnumDef_ptr
+          tao_CORBA_EnumDef_narrow (
+              CORBA::Object *,
+              CORBA::Environment &
+            );
+          TAO_IFR_Client_Export
+          CORBA::Object *
+          tao_CORBA_EnumDef_upcast (
+              void *
+            );
+
+          // External declarations for undefined interface
+          // CORBA_AliasDef
+          TAO_IFR_Client_Export
+          CORBA_AliasDef_ptr
+          tao_CORBA_AliasDef_duplicate (
+              CORBA_AliasDef_ptr
+            );
+          TAO_IFR_Client_Export
+          void
+          tao_CORBA_AliasDef_release (
+              CORBA_AliasDef_ptr
+            );
+          TAO_IFR_Client_Export
+          CORBA_AliasDef_ptr
+          tao_CORBA_AliasDef_nil (
+              void
+            );
+          TAO_IFR_Client_Export
+          CORBA_AliasDef_ptr
+          tao_CORBA_AliasDef_narrow (
+              CORBA::Object *,
+              CORBA::Environment &
+            );
+          TAO_IFR_Client_Export
+          CORBA::Object *
+          tao_CORBA_AliasDef_upcast (
+              void *
+            );
+
+          // External declarations for undefined interface
+          // CORBA_InterfaceDef
+          TAO_IFR_Client_Export
+          CORBA_InterfaceDef_ptr
+          tao_CORBA_InterfaceDef_duplicate (
+              CORBA_InterfaceDef_ptr
+            );
+          TAO_IFR_Client_Export
+          void
+          tao_CORBA_InterfaceDef_release (
+              CORBA_InterfaceDef_ptr
+            );
+          TAO_IFR_Client_Export
+          CORBA_InterfaceDef_ptr
+          tao_CORBA_InterfaceDef_nil (
+              void
+            );
+          TAO_IFR_Client_Export
+          CORBA_InterfaceDef_ptr
+          tao_CORBA_InterfaceDef_narrow (
+              CORBA::Object *,
+              CORBA::Environment &
+            );
+          TAO_IFR_Client_Export
+          CORBA::Object *
+          tao_CORBA_InterfaceDef_upcast (
+              void *
+            );
+
+          // External declarations for undefined interface
+          // CORBA_ExceptionDef
+          TAO_IFR_Client_Export
+          CORBA_ExceptionDef_ptr
+          tao_CORBA_ExceptionDef_duplicate (
+              CORBA_ExceptionDef_ptr
+            );
+          TAO_IFR_Client_Export
+          void
+          tao_CORBA_ExceptionDef_release (
+              CORBA_ExceptionDef_ptr
+            );
+          TAO_IFR_Client_Export
+          CORBA_ExceptionDef_ptr
+          tao_CORBA_ExceptionDef_nil (
+              void
+            );
+          TAO_IFR_Client_Export
+          CORBA_ExceptionDef_ptr
+          tao_CORBA_ExceptionDef_narrow (
+              CORBA::Object *,
+              CORBA::Environment &
+            );
+          TAO_IFR_Client_Export
+          CORBA::Object *
+          tao_CORBA_ExceptionDef_upcast (
+              void *
+            );
+
+          // External declarations for undefined interface
+          // CORBA_NativeDef
+          TAO_IFR_Client_Export
+          CORBA_NativeDef_ptr
+          tao_CORBA_NativeDef_duplicate (
+              CORBA_NativeDef_ptr
+            );
+          TAO_IFR_Client_Export
+          void
+          tao_CORBA_NativeDef_release (
+              CORBA_NativeDef_ptr
+            );
+          TAO_IFR_Client_Export
+          CORBA_NativeDef_ptr
+          tao_CORBA_NativeDef_nil (
+              void
+            );
+          TAO_IFR_Client_Export
+          CORBA_NativeDef_ptr
+          tao_CORBA_NativeDef_narrow (
+              CORBA::Object *,
+              CORBA::Environment &
+            );
+          TAO_IFR_Client_Export
+          CORBA::Object *
+          tao_CORBA_NativeDef_upcast (
+              void *
+            );
+
+          // External declarations for undefined interface
+          // CORBA_ValueDef
+          TAO_IFR_Client_Export
+          CORBA_ValueDef_ptr
+          tao_CORBA_ValueDef_duplicate (
+              CORBA_ValueDef_ptr
+            );
+          TAO_IFR_Client_Export
+          void
+          tao_CORBA_ValueDef_release (
+              CORBA_ValueDef_ptr
+            );
+          TAO_IFR_Client_Export
+          CORBA_ValueDef_ptr
+          tao_CORBA_ValueDef_nil (
+              void
+            );
+          TAO_IFR_Client_Export
+          CORBA_ValueDef_ptr
+          tao_CORBA_ValueDef_narrow (
+              CORBA::Object *,
+              CORBA::Environment &
+            );
+          TAO_IFR_Client_Export
+          CORBA::Object *
+          tao_CORBA_ValueDef_upcast (
+              void *
+            );
+
+          // External declarations for undefined interface
+          // CORBA_ValueBoxDef
+          TAO_IFR_Client_Export
+          CORBA_ValueBoxDef_ptr
+          tao_CORBA_ValueBoxDef_duplicate (
+              CORBA_ValueBoxDef_ptr
+            );
+          TAO_IFR_Client_Export
+          void
+          tao_CORBA_ValueBoxDef_release (
+              CORBA_ValueBoxDef_ptr
+            );
+          TAO_IFR_Client_Export
+          CORBA_ValueBoxDef_ptr
+          tao_CORBA_ValueBoxDef_nil (
+              void
+            );
+          TAO_IFR_Client_Export
+          CORBA_ValueBoxDef_ptr
+          tao_CORBA_ValueBoxDef_narrow (
+              CORBA::Object *,
+              CORBA::Environment &
+            );
+          TAO_IFR_Client_Export
+          CORBA::Object *
+          tao_CORBA_ValueBoxDef_upcast (
+              void *
+            );
+
+          // External declarations for undefined interface
+          // CORBA_AbstractInterfaceDef
+          TAO_IFR_Client_Export
+          CORBA_AbstractInterfaceDef_ptr
+          tao_CORBA_AbstractInterfaceDef_duplicate (
+              CORBA_AbstractInterfaceDef_ptr
+            );
+          TAO_IFR_Client_Export
+          void
+          tao_CORBA_AbstractInterfaceDef_release (
+              CORBA_AbstractInterfaceDef_ptr
+            );
+          TAO_IFR_Client_Export
+          CORBA_AbstractInterfaceDef_ptr
+          tao_CORBA_AbstractInterfaceDef_nil (
+              void
+            );
+          TAO_IFR_Client_Export
+          CORBA_AbstractInterfaceDef_ptr
+          tao_CORBA_AbstractInterfaceDef_narrow (
+              CORBA::Object *,
+              CORBA::Environment &
+            );
+          TAO_IFR_Client_Export
+          CORBA::Object *
+          tao_CORBA_AbstractInterfaceDef_upcast (
+              void *
+            );
+
+          // External declarations for undefined interface
+          // CORBA_LocalInterfaceDef
+          TAO_IFR_Client_Export
+          CORBA_LocalInterfaceDef_ptr
+          tao_CORBA_LocalInterfaceDef_duplicate (
+              CORBA_LocalInterfaceDef_ptr
+            );
+          TAO_IFR_Client_Export
+          void
+          tao_CORBA_LocalInterfaceDef_release (
+              CORBA_LocalInterfaceDef_ptr
+            );
+          TAO_IFR_Client_Export
+          CORBA_LocalInterfaceDef_ptr
+          tao_CORBA_LocalInterfaceDef_nil (
+              void
+            );
+          TAO_IFR_Client_Export
+          CORBA_LocalInterfaceDef_ptr
+          tao_CORBA_LocalInterfaceDef_narrow (
+              CORBA::Object *,
+              CORBA::Environment &
+            );
+          TAO_IFR_Client_Export
+          CORBA::Object *
+          tao_CORBA_LocalInterfaceDef_upcast (
+              void *
+            );
+
+                    TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::DefinitionKind);
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::DefinitionKind &);
+          // Any operators for interface CORBA_IRObject
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_IRObject_ptr);
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_IRObject *&);
+          // Any operators for interface CORBA_Repository
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_Repository_ptr);
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_Repository *&);
+          // Any operators for interface CORBA_Contained
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_Contained_ptr);
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_Contained *&);
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_Contained::Description &); // copying version
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_Contained::Description*); // noncopying version
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_Contained::Description *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_Contained::Description *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ContainedSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ContainedSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ContainedSeq *&); // deprecated
+                    TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ContainedSeq &); // copying version
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ContainedSeq*); // noncopying version
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ContainedSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_ContainedSeq *&);
-// Any operators for interface CORBA_ModuleDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ModuleDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ModuleDef *&);
-// Any operators for interface CORBA_ConstantDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ConstantDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ConstantDef *&);
-// Any operators for interface CORBA_StructDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_StructDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_StructDef *&);
-// Any operators for interface CORBA_UnionDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_UnionDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_UnionDef *&);
-// Any operators for interface CORBA_EnumDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_EnumDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_EnumDef *&);
-// Any operators for interface CORBA_AliasDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_AliasDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_AliasDef *&);
-// Any operators for interface CORBA_InterfaceDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_InterfaceDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_InterfaceDef *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_InterfaceDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_InterfaceDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_InterfaceDefSeq *&); // deprecated
+          // Any operators for interface CORBA_ModuleDef
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ModuleDef_ptr);
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ModuleDef *&);
+          // Any operators for interface CORBA_ConstantDef
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ConstantDef_ptr);
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ConstantDef *&);
+          // Any operators for interface CORBA_StructDef
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_StructDef_ptr);
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_StructDef *&);
+          // Any operators for interface CORBA_UnionDef
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_UnionDef_ptr);
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_UnionDef *&);
+          // Any operators for interface CORBA_EnumDef
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_EnumDef_ptr);
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_EnumDef *&);
+          // Any operators for interface CORBA_AliasDef
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_AliasDef_ptr);
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_AliasDef *&);
+          // Any operators for interface CORBA_InterfaceDef
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_InterfaceDef_ptr);
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_InterfaceDef *&);
+                    TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_InterfaceDefSeq &); // copying version
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_InterfaceDefSeq*); // noncopying version
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_InterfaceDefSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_InterfaceDefSeq *&);
-// Any operators for interface CORBA_ExceptionDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ExceptionDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ExceptionDef *&);
-// Any operators for interface CORBA_NativeDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_NativeDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_NativeDef *&);
-// Any operators for interface CORBA_ValueDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ValueDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ValueDef *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ValueDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ValueDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ValueDefSeq *&); // deprecated
+          // Any operators for interface CORBA_ExceptionDef
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ExceptionDef_ptr);
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ExceptionDef *&);
+          // Any operators for interface CORBA_NativeDef
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_NativeDef_ptr);
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_NativeDef *&);
+          // Any operators for interface CORBA_ValueDef
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ValueDef_ptr);
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ValueDef *&);
+                    TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ValueDefSeq &); // copying version
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ValueDefSeq*); // noncopying version
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ValueDefSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_ValueDefSeq *&);
-// Any operators for interface CORBA_ValueBoxDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ValueBoxDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ValueBoxDef *&);
-// Any operators for interface CORBA_AbstractInterfaceDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_AbstractInterfaceDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_AbstractInterfaceDef *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_AbstractInterfaceDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_AbstractInterfaceDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_AbstractInterfaceDefSeq *&); // deprecated
+          // Any operators for interface CORBA_ValueBoxDef
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ValueBoxDef_ptr);
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ValueBoxDef *&);
+          // Any operators for interface CORBA_AbstractInterfaceDef
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_AbstractInterfaceDef_ptr);
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_AbstractInterfaceDef *&);
+                    TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_AbstractInterfaceDefSeq &); // copying version
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_AbstractInterfaceDefSeq*); // noncopying version
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_AbstractInterfaceDefSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_AbstractInterfaceDefSeq *&);
-// Any operators for interface CORBA_LocalInterfaceDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_LocalInterfaceDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_LocalInterfaceDef *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_LocalInterfaceDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_LocalInterfaceDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_LocalInterfaceDefSeq *&); // deprecated
+          // Any operators for interface CORBA_LocalInterfaceDef
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_LocalInterfaceDef_ptr);
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_LocalInterfaceDef *&);
+                    TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_LocalInterfaceDefSeq &); // copying version
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_LocalInterfaceDefSeq*); // noncopying version
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_LocalInterfaceDefSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_LocalInterfaceDefSeq *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_StructMember &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_StructMember*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_StructMember *&); // deprecated
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_StructMember &); // copying version
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_StructMember*); // noncopying version
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_StructMember *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_StructMember *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_StructMemberSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_StructMemberSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_StructMemberSeq *&); // deprecated
+                    TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_StructMemberSeq &); // copying version
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_StructMemberSeq*); // noncopying version
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_StructMemberSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_StructMemberSeq *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_Initializer &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_Initializer*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_Initializer *&); // deprecated
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_Initializer &); // copying version
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_Initializer*); // noncopying version
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_Initializer *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_Initializer *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_InitializerSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_InitializerSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_InitializerSeq *&); // deprecated
+                    TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_InitializerSeq &); // copying version
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_InitializerSeq*); // noncopying version
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_InitializerSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_InitializerSeq *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_UnionMember &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_UnionMember*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_UnionMember *&); // deprecated
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_UnionMember &); // copying version
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_UnionMember*); // noncopying version
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_UnionMember *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_UnionMember *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_UnionMemberSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_UnionMemberSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_UnionMemberSeq *&); // deprecated
+                    TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_UnionMemberSeq &); // copying version
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_UnionMemberSeq*); // noncopying version
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_UnionMemberSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_UnionMemberSeq *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_EnumMemberSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_EnumMemberSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_EnumMemberSeq *&); // deprecated
+                    TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_EnumMemberSeq &); // copying version
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_EnumMemberSeq*); // noncopying version
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_EnumMemberSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_EnumMemberSeq *&);
-// Any operators for interface CORBA_Container
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_Container_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_Container *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_Container::Description &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_Container::Description*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_Container::Description *&); // deprecated
+          // Any operators for interface CORBA_Container
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_Container_ptr);
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_Container *&);
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_Container::Description &); // copying version
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_Container::Description*); // noncopying version
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_Container::Description *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_Container::Description *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_Container::DescriptionSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_Container::DescriptionSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_Container::DescriptionSeq *&); // deprecated
+                    TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_Container::DescriptionSeq &); // copying version
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_Container::DescriptionSeq*); // noncopying version
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_Container::DescriptionSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_Container::DescriptionSeq *&);
-// Any operators for interface CORBA_IDLType
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_IDLType_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_IDLType *&);
-// Any operators for interface CORBA_TypedefDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_TypedefDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_TypedefDef *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_TypeDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_TypeDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_TypeDescription *&); // deprecated
+          // Any operators for interface CORBA_IDLType
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_IDLType_ptr);
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_IDLType *&);
+          // Any operators for interface CORBA_TypedefDef
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_TypedefDef_ptr);
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_TypedefDef *&);
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_TypeDescription &); // copying version
+          TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_TypeDescription*); // noncopying version
+          TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_TypeDescription *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_TypeDescription *&);
 
-#ifndef __ACE_INLINE__
+          #ifndef __ACE_INLINE__
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::DefinitionKind &); // 
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::DefinitionKind &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_IRObject_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_IRObject_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_Repository_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_Repository_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_Contained_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_Contained_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_Contained::Description &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_Contained::Description &);
+          TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::DefinitionKind &); //
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::DefinitionKind &);
+          TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_IRObject_ptr );
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_IRObject_ptr &);
+          TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_Repository_ptr );
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_Repository_ptr &);
+          TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_Contained_ptr );
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_Contained_ptr &);
+          TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_Contained::Description &);
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_Contained::Description &);
 
 #if !defined _TAO_CDR_OP_CORBA_ContainedSeq_H_
-#define _TAO_CDR_OP_CORBA_ContainedSeq_H_
+          #define _TAO_CDR_OP_CORBA_ContainedSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA_ContainedSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA_ContainedSeq &
-  );
+              TAO_OutputCDR &,
+              const CORBA_ContainedSeq &
+            );
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (
+              TAO_InputCDR &,
+              CORBA_ContainedSeq &
+            );
 
 #endif /* _TAO_CDR_OP_CORBA_ContainedSeq_H_ */
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ModuleDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ModuleDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ConstantDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ConstantDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_StructDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_StructDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_UnionDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_UnionDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_EnumDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_EnumDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_AliasDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_AliasDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_InterfaceDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_InterfaceDef_ptr &);
+          TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ModuleDef_ptr );
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ModuleDef_ptr &);
+          TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ConstantDef_ptr );
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ConstantDef_ptr &);
+          TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_StructDef_ptr );
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_StructDef_ptr &);
+          TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_UnionDef_ptr );
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_UnionDef_ptr &);
+          TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_EnumDef_ptr );
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_EnumDef_ptr &);
+          TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_AliasDef_ptr );
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_AliasDef_ptr &);
+          TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_InterfaceDef_ptr );
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_InterfaceDef_ptr &);
 
 #if !defined _TAO_CDR_OP_CORBA_InterfaceDefSeq_H_
-#define _TAO_CDR_OP_CORBA_InterfaceDefSeq_H_
+          #define _TAO_CDR_OP_CORBA_InterfaceDefSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA_InterfaceDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA_InterfaceDefSeq &
-  );
+              TAO_OutputCDR &,
+              const CORBA_InterfaceDefSeq &
+            );
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (
+              TAO_InputCDR &,
+              CORBA_InterfaceDefSeq &
+            );
 
 #endif /* _TAO_CDR_OP_CORBA_InterfaceDefSeq_H_ */
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ExceptionDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ExceptionDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_NativeDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_NativeDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ValueDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ValueDef_ptr &);
+          TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ExceptionDef_ptr );
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ExceptionDef_ptr &);
+          TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_NativeDef_ptr );
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_NativeDef_ptr &);
+          TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ValueDef_ptr );
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ValueDef_ptr &);
 
 #if !defined _TAO_CDR_OP_CORBA_ValueDefSeq_H_
-#define _TAO_CDR_OP_CORBA_ValueDefSeq_H_
+          #define _TAO_CDR_OP_CORBA_ValueDefSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA_ValueDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA_ValueDefSeq &
-  );
+              TAO_OutputCDR &,
+              const CORBA_ValueDefSeq &
+            );
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (
+              TAO_InputCDR &,
+              CORBA_ValueDefSeq &
+            );
 
 #endif /* _TAO_CDR_OP_CORBA_ValueDefSeq_H_ */
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ValueBoxDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ValueBoxDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_AbstractInterfaceDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_AbstractInterfaceDef_ptr &);
+          TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ValueBoxDef_ptr );
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ValueBoxDef_ptr &);
+          TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_AbstractInterfaceDef_ptr );
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_AbstractInterfaceDef_ptr &);
 
 #if !defined _TAO_CDR_OP_CORBA_AbstractInterfaceDefSeq_H_
-#define _TAO_CDR_OP_CORBA_AbstractInterfaceDefSeq_H_
+          #define _TAO_CDR_OP_CORBA_AbstractInterfaceDefSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA_AbstractInterfaceDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA_AbstractInterfaceDefSeq &
-  );
+              TAO_OutputCDR &,
+              const CORBA_AbstractInterfaceDefSeq &
+            );
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (
+              TAO_InputCDR &,
+              CORBA_AbstractInterfaceDefSeq &
+            );
 
 #endif /* _TAO_CDR_OP_CORBA_AbstractInterfaceDefSeq_H_ */
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_LocalInterfaceDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_LocalInterfaceDef_ptr &);
+          TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_LocalInterfaceDef_ptr );
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_LocalInterfaceDef_ptr &);
 
 #if !defined _TAO_CDR_OP_CORBA_LocalInterfaceDefSeq_H_
-#define _TAO_CDR_OP_CORBA_LocalInterfaceDefSeq_H_
+          #define _TAO_CDR_OP_CORBA_LocalInterfaceDefSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA_LocalInterfaceDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA_LocalInterfaceDefSeq &
-  );
+              TAO_OutputCDR &,
+              const CORBA_LocalInterfaceDefSeq &
+            );
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (
+              TAO_InputCDR &,
+              CORBA_LocalInterfaceDefSeq &
+            );
 
 #endif /* _TAO_CDR_OP_CORBA_LocalInterfaceDefSeq_H_ */
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_StructMember &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_StructMember &);
+          TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_StructMember &);
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_StructMember &);
 
 #if !defined _TAO_CDR_OP_CORBA_StructMemberSeq_H_
-#define _TAO_CDR_OP_CORBA_StructMemberSeq_H_
+          #define _TAO_CDR_OP_CORBA_StructMemberSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA_StructMemberSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA_StructMemberSeq &
-  );
+              TAO_OutputCDR &,
+              const CORBA_StructMemberSeq &
+            );
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (
+              TAO_InputCDR &,
+              CORBA_StructMemberSeq &
+            );
 
 #endif /* _TAO_CDR_OP_CORBA_StructMemberSeq_H_ */
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_Initializer &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_Initializer &);
+          TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_Initializer &);
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_Initializer &);
 
 #if !defined _TAO_CDR_OP_CORBA_InitializerSeq_H_
-#define _TAO_CDR_OP_CORBA_InitializerSeq_H_
+          #define _TAO_CDR_OP_CORBA_InitializerSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA_InitializerSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA_InitializerSeq &
-  );
+              TAO_OutputCDR &,
+              const CORBA_InitializerSeq &
+            );
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (
+              TAO_InputCDR &,
+              CORBA_InitializerSeq &
+            );
 
 #endif /* _TAO_CDR_OP_CORBA_InitializerSeq_H_ */
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_UnionMember &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_UnionMember &);
+          TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_UnionMember &);
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_UnionMember &);
 
 #if !defined _TAO_CDR_OP_CORBA_UnionMemberSeq_H_
-#define _TAO_CDR_OP_CORBA_UnionMemberSeq_H_
+          #define _TAO_CDR_OP_CORBA_UnionMemberSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA_UnionMemberSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA_UnionMemberSeq &
-  );
+              TAO_OutputCDR &,
+              const CORBA_UnionMemberSeq &
+            );
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (
+              TAO_InputCDR &,
+              CORBA_UnionMemberSeq &
+            );
 
 #endif /* _TAO_CDR_OP_CORBA_UnionMemberSeq_H_ */
 
 
 #if !defined _TAO_CDR_OP_CORBA_EnumMemberSeq_H_
-#define _TAO_CDR_OP_CORBA_EnumMemberSeq_H_
+          #define _TAO_CDR_OP_CORBA_EnumMemberSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA_EnumMemberSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA_EnumMemberSeq &
-  );
+              TAO_OutputCDR &,
+              const CORBA_EnumMemberSeq &
+            );
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (
+              TAO_InputCDR &,
+              CORBA_EnumMemberSeq &
+            );
 
 #endif /* _TAO_CDR_OP_CORBA_EnumMemberSeq_H_ */
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_Container_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_Container_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_Container::Description &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_Container::Description &);
+          TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_Container_ptr );
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_Container_ptr &);
+          TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_Container::Description &);
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_Container::Description &);
 
 #if !defined _TAO_CDR_OP_CORBA_Container_DescriptionSeq_H_
-#define _TAO_CDR_OP_CORBA_Container_DescriptionSeq_H_
+          #define _TAO_CDR_OP_CORBA_Container_DescriptionSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA_Container::DescriptionSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA_Container::DescriptionSeq &
-  );
+              TAO_OutputCDR &,
+              const CORBA_Container::DescriptionSeq &
+            );
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (
+              TAO_InputCDR &,
+              CORBA_Container::DescriptionSeq &
+            );
 
 #endif /* _TAO_CDR_OP_CORBA_Container_DescriptionSeq_H_ */
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_IDLType_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_IDLType_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_TypedefDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_TypedefDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_TypeDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_TypeDescription &);
+          TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_IDLType_ptr );
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_IDLType_ptr &);
+          TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_TypedefDef_ptr );
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_TypedefDef_ptr &);
+          TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_TypeDescription &);
+          TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_TypeDescription &);
 
-#endif /* __ACE_INLINE__ */
+          #endif /* __ACE_INLINE__ */
 
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.i b/TAO/tao/IFR_Client/IFR_BaseC.i
index 9121efdc2c9..dafd87768aa 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.i
+++ b/TAO/tao/IFR_Client/IFR_BaseC.i
@@ -250,162 +250,162 @@ CORBA_Contained::CORBA_Contained (
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CI_
 
-  ACE_INLINE CORBA_Contained **
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (CORBA::ULong nelems)
+ACE_INLINE CORBA_Contained **
+_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (CORBA::ULong nelems)
+{
+  CORBA_Contained **buf = 0;
+  
+  ACE_NEW_RETURN (buf, CORBA_Contained*[nelems], 0);
+  
+  for (CORBA::ULong i = 0; i < nelems; i++)
+    {
+      buf[i] = CORBA_Contained::_nil ();
+    }
+  
+  return buf;
+}
+
+ACE_INLINE void 
+_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::freebuf (CORBA_Contained **buffer)
+{
+  if (buffer == 0)
+    return;
+  delete[] buffer;
+}
+
+ACE_INLINE
+_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (void)
+{
+}
+
+ACE_INLINE
+_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (CORBA::ULong maximum)
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (CORBA::ULong maximum,
+  CORBA::ULong length,
+  CORBA_Contained* *value,
+  CORBA::Boolean release)
+: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+{
+}
+
+ACE_INLINE
+_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq(const _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &rhs)
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
   {
-    CORBA_Contained **buf = 0;
-    
-    ACE_NEW_RETURN (buf, CORBA_Contained*[nelems], 0);
+    CORBA_Contained **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (this->maximum_);
+    CORBA_Contained ** const tmp2 = ACE_reinterpret_cast (CORBA_Contained ** ACE_CAST_CONST, rhs.buffer_);
     
-    for (CORBA::ULong i = 0; i < nelems; i++)
+    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
       {
-        buf[i] = CORBA_Contained::_nil ();
+        tmp1[i] = CORBA_Contained::_duplicate (tmp2[i]);
       }
     
-    return buf;
-  }
-  
-  ACE_INLINE void 
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::freebuf (CORBA_Contained **buffer)
-  {
-    if (buffer == 0)
-      return;
-    delete[] buffer;
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (void)
-  {
+    this->buffer_ = tmp1;
   }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (CORBA::ULong maximum)
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA_Contained* *value,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+  else
   {
+    this->buffer_ = 0;
   }
+}
+
+ACE_INLINE _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &
+_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::operator= (const _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &rhs)
+{
+  if (this == &rhs)
+    return *this;
   
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq(const _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &rhs)
-    : TAO_Unbounded_Base_Sequence (rhs)
+  if (this->release_)
   {
-    if (rhs.buffer_ != 0)
+    CORBA_Contained **tmp = ACE_reinterpret_cast (CORBA_Contained **, this->buffer_);
+    
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      CORBA_Contained **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (this->maximum_);
-      CORBA_Contained ** const tmp2 = ACE_reinterpret_cast (CORBA_Contained ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = CORBA_Contained::_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
+      CORBA::release (tmp[i]);
+      tmp[i] = CORBA_Contained::_nil ();
     }
-    else
+    if (this->maximum_ < rhs.maximum_)
     {
-      this->buffer_ = 0;
+      _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::freebuf (tmp);
+      this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (rhs.maximum_);
     }
   }
+  else
+    this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (rhs.maximum_);
   
-  ACE_INLINE _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::operator= (const _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &rhs)
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  CORBA_Contained **tmp1 = ACE_reinterpret_cast (CORBA_Contained **, this->buffer_);
+  CORBA_Contained ** const tmp2 = ACE_reinterpret_cast (CORBA_Contained ** ACE_CAST_CONST, rhs.buffer_);
+  
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
-      CORBA_Contained **tmp = ACE_reinterpret_cast (CORBA_Contained **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-      {
-        CORBA::release (tmp[i]);
-        tmp[i] = CORBA_Contained::_nil ();
-      }
-      if (this->maximum_ < rhs.maximum_)
-      {
-        _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (rhs.maximum_);
-      }
+      tmp1[i] = CORBA_Contained::_duplicate (tmp2[i]);
     }
-    else
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    CORBA_Contained **tmp1 = ACE_reinterpret_cast (CORBA_Contained **, this->buffer_);
-    CORBA_Contained ** const tmp2 = ACE_reinterpret_cast (CORBA_Contained ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      {
-        tmp1[i] = CORBA_Contained::_duplicate (tmp2[i]);
-      }
-    
-    return *this;
-  }
   
-  ACE_INLINE TAO_Object_Manager<CORBA_Contained,CORBA_Contained_var>
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::operator[] (CORBA::ULong index) const
-  // read-write accessor
-  {
-    ACE_ASSERT (index < this->maximum_);
-    CORBA_Contained ** const tmp = ACE_reinterpret_cast (CORBA_Contained ** ACE_CAST_CONST, this->buffer_);
-    return TAO_Object_Manager<CORBA_Contained,CORBA_Contained_var> (tmp + index, this->release_);
-  }
-  
-  ACE_INLINE CORBA_Contained* *
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::get_buffer (CORBA::Boolean orphan)
+  return *this;
+}
+
+ACE_INLINE TAO_Object_Manager<CORBA_Contained,CORBA_Contained_var>
+_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::operator[] (CORBA::ULong index) const
+// read-write accessor
+{
+  ACE_ASSERT (index < this->maximum_);
+  CORBA_Contained ** const tmp = ACE_reinterpret_cast (CORBA_Contained ** ACE_CAST_CONST, this->buffer_);
+  return TAO_Object_Manager<CORBA_Contained,CORBA_Contained_var> (tmp + index, this->release_);
+}
+
+ACE_INLINE CORBA_Contained* *
+_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::get_buffer (CORBA::Boolean orphan)
+{
+  CORBA_Contained **result = 0;
+  if (orphan == 0)
   {
-    CORBA_Contained **result = 0;
-    if (orphan == 0)
+    // We retain ownership.
+    if (this->buffer_ == 0)
     {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (this->maximum_);
-        this->buffer_ = result;
-        this->release_ = 1;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA_Contained**, this->buffer_);
-      }
+      result = _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (this->maximum_);
+      this->buffer_ = result;
+      this->release_ = 1;
     }
-    else // if (orphan == 1)
+    else
     {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA_Contained**,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
+      result = ACE_reinterpret_cast (CORBA_Contained**, this->buffer_);
     }
-    return result;
   }
-  
-  ACE_INLINE const CORBA_Contained* *
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::get_buffer (void) const
+  else // if (orphan == 1)
   {
-    return ACE_reinterpret_cast(const CORBA_Contained ** ACE_CAST_CONST, this->buffer_);
+    if (this->release_ != 0)
+    {
+      // We set the state back to default and relinquish
+      // ownership.
+      result = ACE_reinterpret_cast(CORBA_Contained**,this->buffer_);
+      this->maximum_ = 0;
+      this->length_ = 0;
+      this->buffer_ = 0;
+      this->release_ = 0;
+    }
   }
-  
-  
+  return result;
+}
+
+ACE_INLINE const CORBA_Contained* *
+_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::get_buffer (void) const
+{
+  return ACE_reinterpret_cast(const CORBA_Contained ** ACE_CAST_CONST, this->buffer_);
+}
+
+
 #endif /* end #if !defined */
 
 
@@ -624,162 +624,162 @@ CORBA_ContainedSeq_out::operator[] (CORBA::ULong index)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_INTERFACEDEFSEQ_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_INTERFACEDEFSEQ_CI_
 
-  ACE_INLINE CORBA_InterfaceDef **
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (CORBA::ULong nelems)
+ACE_INLINE CORBA_InterfaceDef **
+_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (CORBA::ULong nelems)
+{
+  CORBA_InterfaceDef **buf = 0;
+  
+  ACE_NEW_RETURN (buf, CORBA_InterfaceDef*[nelems], 0);
+  
+  for (CORBA::ULong i = 0; i < nelems; i++)
+    {
+      buf[i] = tao_CORBA_InterfaceDef_nil ();
+    }
+  
+  return buf;
+}
+
+ACE_INLINE void 
+_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::freebuf (CORBA_InterfaceDef **buffer)
+{
+  if (buffer == 0)
+    return;
+  delete[] buffer;
+}
+
+ACE_INLINE
+_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (void)
+{
+}
+
+ACE_INLINE
+_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (CORBA::ULong maximum)
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (CORBA::ULong maximum,
+  CORBA::ULong length,
+  CORBA_InterfaceDef* *value,
+  CORBA::Boolean release)
+: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+{
+}
+
+ACE_INLINE
+_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &rhs)
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
   {
-    CORBA_InterfaceDef **buf = 0;
-    
-    ACE_NEW_RETURN (buf, CORBA_InterfaceDef*[nelems], 0);
+    CORBA_InterfaceDef **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (this->maximum_);
+    CORBA_InterfaceDef ** const tmp2 = ACE_reinterpret_cast (CORBA_InterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
     
-    for (CORBA::ULong i = 0; i < nelems; i++)
+    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
       {
-        buf[i] = tao_CORBA_InterfaceDef_nil ();
+        tmp1[i] = tao_CORBA_InterfaceDef_duplicate (tmp2[i]);
       }
     
-    return buf;
+    this->buffer_ = tmp1;
   }
-  
-  ACE_INLINE void 
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::freebuf (CORBA_InterfaceDef **buffer)
-  {
-    if (buffer == 0)
-      return;
-    delete[] buffer;
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (void)
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (CORBA::ULong maximum)
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA_InterfaceDef* *value,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+  else
   {
+    this->buffer_ = 0;
   }
+}
+
+ACE_INLINE _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &
+_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &rhs)
+{
+  if (this == &rhs)
+    return *this;
   
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &rhs)
-    : TAO_Unbounded_Base_Sequence (rhs)
+  if (this->release_)
   {
-    if (rhs.buffer_ != 0)
+    CORBA_InterfaceDef **tmp = ACE_reinterpret_cast (CORBA_InterfaceDef **, this->buffer_);
+    
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      CORBA_InterfaceDef **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (this->maximum_);
-      CORBA_InterfaceDef ** const tmp2 = ACE_reinterpret_cast (CORBA_InterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = tao_CORBA_InterfaceDef_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
+      tao_CORBA_InterfaceDef_release (tmp[i]);
+      tmp[i] = tao_CORBA_InterfaceDef_nil ();
     }
-    else
+    if (this->maximum_ < rhs.maximum_)
     {
-      this->buffer_ = 0;
+      _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::freebuf (tmp);
+      this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (rhs.maximum_);
     }
   }
+  else
+    this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (rhs.maximum_);
   
-  ACE_INLINE _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &rhs)
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  CORBA_InterfaceDef **tmp1 = ACE_reinterpret_cast (CORBA_InterfaceDef **, this->buffer_);
+  CORBA_InterfaceDef ** const tmp2 = ACE_reinterpret_cast (CORBA_InterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
+  
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
-      CORBA_InterfaceDef **tmp = ACE_reinterpret_cast (CORBA_InterfaceDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-      {
-        tao_CORBA_InterfaceDef_release (tmp[i]);
-        tmp[i] = tao_CORBA_InterfaceDef_nil ();
-      }
-      if (this->maximum_ < rhs.maximum_)
-      {
-        _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (rhs.maximum_);
-      }
+      tmp1[i] = tao_CORBA_InterfaceDef_duplicate (tmp2[i]);
     }
-    else
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    CORBA_InterfaceDef **tmp1 = ACE_reinterpret_cast (CORBA_InterfaceDef **, this->buffer_);
-    CORBA_InterfaceDef ** const tmp2 = ACE_reinterpret_cast (CORBA_InterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      {
-        tmp1[i] = tao_CORBA_InterfaceDef_duplicate (tmp2[i]);
-      }
-    
-    return *this;
-  }
   
-  ACE_INLINE TAO_Object_Manager<CORBA_InterfaceDef,CORBA_InterfaceDef_var>
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::operator[] (CORBA::ULong index) const
-  // read-write accessor
-  {
-    ACE_ASSERT (index < this->maximum_);
-    CORBA_InterfaceDef ** const tmp = ACE_reinterpret_cast (CORBA_InterfaceDef ** ACE_CAST_CONST, this->buffer_);
-    return TAO_Object_Manager<CORBA_InterfaceDef,CORBA_InterfaceDef_var> (tmp + index, this->release_);
-  }
-  
-  ACE_INLINE CORBA_InterfaceDef* *
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::get_buffer (CORBA::Boolean orphan)
+  return *this;
+}
+
+ACE_INLINE TAO_Object_Manager<CORBA_InterfaceDef,CORBA_InterfaceDef_var>
+_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::operator[] (CORBA::ULong index) const
+// read-write accessor
+{
+  ACE_ASSERT (index < this->maximum_);
+  CORBA_InterfaceDef ** const tmp = ACE_reinterpret_cast (CORBA_InterfaceDef ** ACE_CAST_CONST, this->buffer_);
+  return TAO_Object_Manager<CORBA_InterfaceDef,CORBA_InterfaceDef_var> (tmp + index, this->release_);
+}
+
+ACE_INLINE CORBA_InterfaceDef* *
+_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::get_buffer (CORBA::Boolean orphan)
+{
+  CORBA_InterfaceDef **result = 0;
+  if (orphan == 0)
   {
-    CORBA_InterfaceDef **result = 0;
-    if (orphan == 0)
+    // We retain ownership.
+    if (this->buffer_ == 0)
     {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (this->maximum_);
-        this->buffer_ = result;
-        this->release_ = 1;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA_InterfaceDef**, this->buffer_);
-      }
+      result = _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (this->maximum_);
+      this->buffer_ = result;
+      this->release_ = 1;
     }
-    else // if (orphan == 1)
+    else
     {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA_InterfaceDef**,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
+      result = ACE_reinterpret_cast (CORBA_InterfaceDef**, this->buffer_);
     }
-    return result;
   }
-  
-  ACE_INLINE const CORBA_InterfaceDef* *
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::get_buffer (void) const
+  else // if (orphan == 1)
   {
-    return ACE_reinterpret_cast(const CORBA_InterfaceDef ** ACE_CAST_CONST, this->buffer_);
+    if (this->release_ != 0)
+    {
+      // We set the state back to default and relinquish
+      // ownership.
+      result = ACE_reinterpret_cast(CORBA_InterfaceDef**,this->buffer_);
+      this->maximum_ = 0;
+      this->length_ = 0;
+      this->buffer_ = 0;
+      this->release_ = 0;
+    }
   }
-  
-  
+  return result;
+}
+
+ACE_INLINE const CORBA_InterfaceDef* *
+_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::get_buffer (void) const
+{
+  return ACE_reinterpret_cast(const CORBA_InterfaceDef ** ACE_CAST_CONST, this->buffer_);
+}
+
+
 #endif /* end #if !defined */
 
 
@@ -998,162 +998,162 @@ CORBA_InterfaceDefSeq_out::operator[] (CORBA::ULong index)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CI_
 
-  ACE_INLINE CORBA_ValueDef **
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (CORBA::ULong nelems)
+ACE_INLINE CORBA_ValueDef **
+_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (CORBA::ULong nelems)
+{
+  CORBA_ValueDef **buf = 0;
+  
+  ACE_NEW_RETURN (buf, CORBA_ValueDef*[nelems], 0);
+  
+  for (CORBA::ULong i = 0; i < nelems; i++)
+    {
+      buf[i] = tao_CORBA_ValueDef_nil ();
+    }
+  
+  return buf;
+}
+
+ACE_INLINE void 
+_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::freebuf (CORBA_ValueDef **buffer)
+{
+  if (buffer == 0)
+    return;
+  delete[] buffer;
+}
+
+ACE_INLINE
+_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (void)
+{
+}
+
+ACE_INLINE
+_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (CORBA::ULong maximum)
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (CORBA::ULong maximum,
+  CORBA::ULong length,
+  CORBA_ValueDef* *value,
+  CORBA::Boolean release)
+: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+{
+}
+
+ACE_INLINE
+_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &rhs)
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
   {
-    CORBA_ValueDef **buf = 0;
-    
-    ACE_NEW_RETURN (buf, CORBA_ValueDef*[nelems], 0);
+    CORBA_ValueDef **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (this->maximum_);
+    CORBA_ValueDef ** const tmp2 = ACE_reinterpret_cast (CORBA_ValueDef ** ACE_CAST_CONST, rhs.buffer_);
     
-    for (CORBA::ULong i = 0; i < nelems; i++)
+    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
       {
-        buf[i] = tao_CORBA_ValueDef_nil ();
+        tmp1[i] = tao_CORBA_ValueDef_duplicate (tmp2[i]);
       }
     
-    return buf;
+    this->buffer_ = tmp1;
   }
-  
-  ACE_INLINE void 
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::freebuf (CORBA_ValueDef **buffer)
-  {
-    if (buffer == 0)
-      return;
-    delete[] buffer;
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (void)
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (CORBA::ULong maximum)
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA_ValueDef* *value,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+  else
   {
+    this->buffer_ = 0;
   }
+}
+
+ACE_INLINE _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &
+_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &rhs)
+{
+  if (this == &rhs)
+    return *this;
   
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &rhs)
-    : TAO_Unbounded_Base_Sequence (rhs)
+  if (this->release_)
   {
-    if (rhs.buffer_ != 0)
+    CORBA_ValueDef **tmp = ACE_reinterpret_cast (CORBA_ValueDef **, this->buffer_);
+    
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      CORBA_ValueDef **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (this->maximum_);
-      CORBA_ValueDef ** const tmp2 = ACE_reinterpret_cast (CORBA_ValueDef ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = tao_CORBA_ValueDef_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
+      tao_CORBA_ValueDef_release (tmp[i]);
+      tmp[i] = tao_CORBA_ValueDef_nil ();
     }
-    else
+    if (this->maximum_ < rhs.maximum_)
     {
-      this->buffer_ = 0;
+      _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::freebuf (tmp);
+      this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (rhs.maximum_);
     }
   }
+  else
+    this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (rhs.maximum_);
   
-  ACE_INLINE _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &rhs)
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  CORBA_ValueDef **tmp1 = ACE_reinterpret_cast (CORBA_ValueDef **, this->buffer_);
+  CORBA_ValueDef ** const tmp2 = ACE_reinterpret_cast (CORBA_ValueDef ** ACE_CAST_CONST, rhs.buffer_);
+  
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
-      CORBA_ValueDef **tmp = ACE_reinterpret_cast (CORBA_ValueDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-      {
-        tao_CORBA_ValueDef_release (tmp[i]);
-        tmp[i] = tao_CORBA_ValueDef_nil ();
-      }
-      if (this->maximum_ < rhs.maximum_)
-      {
-        _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (rhs.maximum_);
-      }
+      tmp1[i] = tao_CORBA_ValueDef_duplicate (tmp2[i]);
     }
-    else
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    CORBA_ValueDef **tmp1 = ACE_reinterpret_cast (CORBA_ValueDef **, this->buffer_);
-    CORBA_ValueDef ** const tmp2 = ACE_reinterpret_cast (CORBA_ValueDef ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      {
-        tmp1[i] = tao_CORBA_ValueDef_duplicate (tmp2[i]);
-      }
-    
-    return *this;
-  }
-  
-  ACE_INLINE TAO_Object_Manager<CORBA_ValueDef,CORBA_ValueDef_var>
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::operator[] (CORBA::ULong index) const
-  // read-write accessor
-  {
-    ACE_ASSERT (index < this->maximum_);
-    CORBA_ValueDef ** const tmp = ACE_reinterpret_cast (CORBA_ValueDef ** ACE_CAST_CONST, this->buffer_);
-    return TAO_Object_Manager<CORBA_ValueDef,CORBA_ValueDef_var> (tmp + index, this->release_);
-  }
   
-  ACE_INLINE CORBA_ValueDef* *
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::get_buffer (CORBA::Boolean orphan)
+  return *this;
+}
+
+ACE_INLINE TAO_Object_Manager<CORBA_ValueDef,CORBA_ValueDef_var>
+_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::operator[] (CORBA::ULong index) const
+// read-write accessor
+{
+  ACE_ASSERT (index < this->maximum_);
+  CORBA_ValueDef ** const tmp = ACE_reinterpret_cast (CORBA_ValueDef ** ACE_CAST_CONST, this->buffer_);
+  return TAO_Object_Manager<CORBA_ValueDef,CORBA_ValueDef_var> (tmp + index, this->release_);
+}
+
+ACE_INLINE CORBA_ValueDef* *
+_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::get_buffer (CORBA::Boolean orphan)
+{
+  CORBA_ValueDef **result = 0;
+  if (orphan == 0)
   {
-    CORBA_ValueDef **result = 0;
-    if (orphan == 0)
+    // We retain ownership.
+    if (this->buffer_ == 0)
     {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (this->maximum_);
-        this->buffer_ = result;
-        this->release_ = 1;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA_ValueDef**, this->buffer_);
-      }
+      result = _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (this->maximum_);
+      this->buffer_ = result;
+      this->release_ = 1;
     }
-    else // if (orphan == 1)
+    else
     {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA_ValueDef**,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
+      result = ACE_reinterpret_cast (CORBA_ValueDef**, this->buffer_);
     }
-    return result;
   }
-  
-  ACE_INLINE const CORBA_ValueDef* *
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::get_buffer (void) const
+  else // if (orphan == 1)
   {
-    return ACE_reinterpret_cast(const CORBA_ValueDef ** ACE_CAST_CONST, this->buffer_);
+    if (this->release_ != 0)
+    {
+      // We set the state back to default and relinquish
+      // ownership.
+      result = ACE_reinterpret_cast(CORBA_ValueDef**,this->buffer_);
+      this->maximum_ = 0;
+      this->length_ = 0;
+      this->buffer_ = 0;
+      this->release_ = 0;
+    }
   }
-  
-  
+  return result;
+}
+
+ACE_INLINE const CORBA_ValueDef* *
+_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::get_buffer (void) const
+{
+  return ACE_reinterpret_cast(const CORBA_ValueDef ** ACE_CAST_CONST, this->buffer_);
+}
+
+
 #endif /* end #if !defined */
 
 
@@ -1372,162 +1372,162 @@ CORBA_ValueDefSeq_out::operator[] (CORBA::ULong index)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_ABSTRACTINTERFACEDEFSEQ_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_ABSTRACTINTERFACEDEFSEQ_CI_
 
-  ACE_INLINE CORBA_AbstractInterfaceDef **
-  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (CORBA::ULong nelems)
+ACE_INLINE CORBA_AbstractInterfaceDef **
+_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (CORBA::ULong nelems)
+{
+  CORBA_AbstractInterfaceDef **buf = 0;
+  
+  ACE_NEW_RETURN (buf, CORBA_AbstractInterfaceDef*[nelems], 0);
+  
+  for (CORBA::ULong i = 0; i < nelems; i++)
+    {
+      buf[i] = tao_CORBA_AbstractInterfaceDef_nil ();
+    }
+  
+  return buf;
+}
+
+ACE_INLINE void 
+_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::freebuf (CORBA_AbstractInterfaceDef **buffer)
+{
+  if (buffer == 0)
+    return;
+  delete[] buffer;
+}
+
+ACE_INLINE
+_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (void)
+{
+}
+
+ACE_INLINE
+_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (CORBA::ULong maximum)
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (CORBA::ULong maximum,
+  CORBA::ULong length,
+  CORBA_AbstractInterfaceDef* *value,
+  CORBA::Boolean release)
+: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+{
+}
+
+ACE_INLINE
+_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq &rhs)
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
   {
-    CORBA_AbstractInterfaceDef **buf = 0;
-    
-    ACE_NEW_RETURN (buf, CORBA_AbstractInterfaceDef*[nelems], 0);
+    CORBA_AbstractInterfaceDef **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (this->maximum_);
+    CORBA_AbstractInterfaceDef ** const tmp2 = ACE_reinterpret_cast (CORBA_AbstractInterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
     
-    for (CORBA::ULong i = 0; i < nelems; i++)
+    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
       {
-        buf[i] = tao_CORBA_AbstractInterfaceDef_nil ();
+        tmp1[i] = tao_CORBA_AbstractInterfaceDef_duplicate (tmp2[i]);
       }
     
-    return buf;
+    this->buffer_ = tmp1;
   }
-  
-  ACE_INLINE void 
-  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::freebuf (CORBA_AbstractInterfaceDef **buffer)
-  {
-    if (buffer == 0)
-      return;
-    delete[] buffer;
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (void)
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (CORBA::ULong maximum)
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA_AbstractInterfaceDef* *value,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+  else
   {
+    this->buffer_ = 0;
   }
+}
+
+ACE_INLINE _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq &
+_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq &rhs)
+{
+  if (this == &rhs)
+    return *this;
   
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq &rhs)
-    : TAO_Unbounded_Base_Sequence (rhs)
+  if (this->release_)
   {
-    if (rhs.buffer_ != 0)
+    CORBA_AbstractInterfaceDef **tmp = ACE_reinterpret_cast (CORBA_AbstractInterfaceDef **, this->buffer_);
+    
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      CORBA_AbstractInterfaceDef **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (this->maximum_);
-      CORBA_AbstractInterfaceDef ** const tmp2 = ACE_reinterpret_cast (CORBA_AbstractInterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = tao_CORBA_AbstractInterfaceDef_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
+      tao_CORBA_AbstractInterfaceDef_release (tmp[i]);
+      tmp[i] = tao_CORBA_AbstractInterfaceDef_nil ();
     }
-    else
+    if (this->maximum_ < rhs.maximum_)
     {
-      this->buffer_ = 0;
+      _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::freebuf (tmp);
+      this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (rhs.maximum_);
     }
   }
+  else
+    this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (rhs.maximum_);
   
-  ACE_INLINE _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq &
-  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq &rhs)
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  CORBA_AbstractInterfaceDef **tmp1 = ACE_reinterpret_cast (CORBA_AbstractInterfaceDef **, this->buffer_);
+  CORBA_AbstractInterfaceDef ** const tmp2 = ACE_reinterpret_cast (CORBA_AbstractInterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
+  
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
-      CORBA_AbstractInterfaceDef **tmp = ACE_reinterpret_cast (CORBA_AbstractInterfaceDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-      {
-        tao_CORBA_AbstractInterfaceDef_release (tmp[i]);
-        tmp[i] = tao_CORBA_AbstractInterfaceDef_nil ();
-      }
-      if (this->maximum_ < rhs.maximum_)
-      {
-        _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (rhs.maximum_);
-      }
+      tmp1[i] = tao_CORBA_AbstractInterfaceDef_duplicate (tmp2[i]);
     }
-    else
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    CORBA_AbstractInterfaceDef **tmp1 = ACE_reinterpret_cast (CORBA_AbstractInterfaceDef **, this->buffer_);
-    CORBA_AbstractInterfaceDef ** const tmp2 = ACE_reinterpret_cast (CORBA_AbstractInterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      {
-        tmp1[i] = tao_CORBA_AbstractInterfaceDef_duplicate (tmp2[i]);
-      }
-    
-    return *this;
-  }
   
-  ACE_INLINE TAO_Object_Manager<CORBA_AbstractInterfaceDef,CORBA_AbstractInterfaceDef_var>
-  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::operator[] (CORBA::ULong index) const
-  // read-write accessor
-  {
-    ACE_ASSERT (index < this->maximum_);
-    CORBA_AbstractInterfaceDef ** const tmp = ACE_reinterpret_cast (CORBA_AbstractInterfaceDef ** ACE_CAST_CONST, this->buffer_);
-    return TAO_Object_Manager<CORBA_AbstractInterfaceDef,CORBA_AbstractInterfaceDef_var> (tmp + index, this->release_);
-  }
-  
-  ACE_INLINE CORBA_AbstractInterfaceDef* *
-  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::get_buffer (CORBA::Boolean orphan)
+  return *this;
+}
+
+ACE_INLINE TAO_Object_Manager<CORBA_AbstractInterfaceDef,CORBA_AbstractInterfaceDef_var>
+_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::operator[] (CORBA::ULong index) const
+// read-write accessor
+{
+  ACE_ASSERT (index < this->maximum_);
+  CORBA_AbstractInterfaceDef ** const tmp = ACE_reinterpret_cast (CORBA_AbstractInterfaceDef ** ACE_CAST_CONST, this->buffer_);
+  return TAO_Object_Manager<CORBA_AbstractInterfaceDef,CORBA_AbstractInterfaceDef_var> (tmp + index, this->release_);
+}
+
+ACE_INLINE CORBA_AbstractInterfaceDef* *
+_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::get_buffer (CORBA::Boolean orphan)
+{
+  CORBA_AbstractInterfaceDef **result = 0;
+  if (orphan == 0)
   {
-    CORBA_AbstractInterfaceDef **result = 0;
-    if (orphan == 0)
+    // We retain ownership.
+    if (this->buffer_ == 0)
     {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (this->maximum_);
-        this->buffer_ = result;
-        this->release_ = 1;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA_AbstractInterfaceDef**, this->buffer_);
-      }
+      result = _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (this->maximum_);
+      this->buffer_ = result;
+      this->release_ = 1;
     }
-    else // if (orphan == 1)
+    else
     {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA_AbstractInterfaceDef**,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
+      result = ACE_reinterpret_cast (CORBA_AbstractInterfaceDef**, this->buffer_);
     }
-    return result;
   }
-  
-  ACE_INLINE const CORBA_AbstractInterfaceDef* *
-  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::get_buffer (void) const
+  else // if (orphan == 1)
   {
-    return ACE_reinterpret_cast(const CORBA_AbstractInterfaceDef ** ACE_CAST_CONST, this->buffer_);
+    if (this->release_ != 0)
+    {
+      // We set the state back to default and relinquish
+      // ownership.
+      result = ACE_reinterpret_cast(CORBA_AbstractInterfaceDef**,this->buffer_);
+      this->maximum_ = 0;
+      this->length_ = 0;
+      this->buffer_ = 0;
+      this->release_ = 0;
+    }
   }
-  
-  
+  return result;
+}
+
+ACE_INLINE const CORBA_AbstractInterfaceDef* *
+_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::get_buffer (void) const
+{
+  return ACE_reinterpret_cast(const CORBA_AbstractInterfaceDef ** ACE_CAST_CONST, this->buffer_);
+}
+
+
 #endif /* end #if !defined */
 
 
@@ -1746,162 +1746,162 @@ CORBA_AbstractInterfaceDefSeq_out::operator[] (CORBA::ULong index)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_LOCALINTERFACEDEFSEQ_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_LOCALINTERFACEDEFSEQ_CI_
 
-  ACE_INLINE CORBA_LocalInterfaceDef **
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (CORBA::ULong nelems)
+ACE_INLINE CORBA_LocalInterfaceDef **
+_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (CORBA::ULong nelems)
+{
+  CORBA_LocalInterfaceDef **buf = 0;
+  
+  ACE_NEW_RETURN (buf, CORBA_LocalInterfaceDef*[nelems], 0);
+  
+  for (CORBA::ULong i = 0; i < nelems; i++)
+    {
+      buf[i] = tao_CORBA_LocalInterfaceDef_nil ();
+    }
+  
+  return buf;
+}
+
+ACE_INLINE void 
+_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::freebuf (CORBA_LocalInterfaceDef **buffer)
+{
+  if (buffer == 0)
+    return;
+  delete[] buffer;
+}
+
+ACE_INLINE
+_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (void)
+{
+}
+
+ACE_INLINE
+_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (CORBA::ULong maximum)
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (CORBA::ULong maximum,
+  CORBA::ULong length,
+  CORBA_LocalInterfaceDef* *value,
+  CORBA::Boolean release)
+: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+{
+}
+
+ACE_INLINE
+_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq &rhs)
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
   {
-    CORBA_LocalInterfaceDef **buf = 0;
-    
-    ACE_NEW_RETURN (buf, CORBA_LocalInterfaceDef*[nelems], 0);
+    CORBA_LocalInterfaceDef **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (this->maximum_);
+    CORBA_LocalInterfaceDef ** const tmp2 = ACE_reinterpret_cast (CORBA_LocalInterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
     
-    for (CORBA::ULong i = 0; i < nelems; i++)
+    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
       {
-        buf[i] = tao_CORBA_LocalInterfaceDef_nil ();
+        tmp1[i] = tao_CORBA_LocalInterfaceDef_duplicate (tmp2[i]);
       }
     
-    return buf;
-  }
-  
-  ACE_INLINE void 
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::freebuf (CORBA_LocalInterfaceDef **buffer)
-  {
-    if (buffer == 0)
-      return;
-    delete[] buffer;
+    this->buffer_ = tmp1;
   }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (void)
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (CORBA::ULong maximum)
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA_LocalInterfaceDef* *value,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+  else
   {
+    this->buffer_ = 0;
   }
+}
+
+ACE_INLINE _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq &
+_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq &rhs)
+{
+  if (this == &rhs)
+    return *this;
   
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq &rhs)
-    : TAO_Unbounded_Base_Sequence (rhs)
+  if (this->release_)
   {
-    if (rhs.buffer_ != 0)
+    CORBA_LocalInterfaceDef **tmp = ACE_reinterpret_cast (CORBA_LocalInterfaceDef **, this->buffer_);
+    
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      CORBA_LocalInterfaceDef **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (this->maximum_);
-      CORBA_LocalInterfaceDef ** const tmp2 = ACE_reinterpret_cast (CORBA_LocalInterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = tao_CORBA_LocalInterfaceDef_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
+      tao_CORBA_LocalInterfaceDef_release (tmp[i]);
+      tmp[i] = tao_CORBA_LocalInterfaceDef_nil ();
     }
-    else
+    if (this->maximum_ < rhs.maximum_)
     {
-      this->buffer_ = 0;
+      _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::freebuf (tmp);
+      this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (rhs.maximum_);
     }
   }
+  else
+    this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (rhs.maximum_);
   
-  ACE_INLINE _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq &
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq &rhs)
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  CORBA_LocalInterfaceDef **tmp1 = ACE_reinterpret_cast (CORBA_LocalInterfaceDef **, this->buffer_);
+  CORBA_LocalInterfaceDef ** const tmp2 = ACE_reinterpret_cast (CORBA_LocalInterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
+  
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
-      CORBA_LocalInterfaceDef **tmp = ACE_reinterpret_cast (CORBA_LocalInterfaceDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-      {
-        tao_CORBA_LocalInterfaceDef_release (tmp[i]);
-        tmp[i] = tao_CORBA_LocalInterfaceDef_nil ();
-      }
-      if (this->maximum_ < rhs.maximum_)
-      {
-        _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (rhs.maximum_);
-      }
+      tmp1[i] = tao_CORBA_LocalInterfaceDef_duplicate (tmp2[i]);
     }
-    else
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    CORBA_LocalInterfaceDef **tmp1 = ACE_reinterpret_cast (CORBA_LocalInterfaceDef **, this->buffer_);
-    CORBA_LocalInterfaceDef ** const tmp2 = ACE_reinterpret_cast (CORBA_LocalInterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      {
-        tmp1[i] = tao_CORBA_LocalInterfaceDef_duplicate (tmp2[i]);
-      }
-    
-    return *this;
-  }
-  
-  ACE_INLINE TAO_Object_Manager<CORBA_LocalInterfaceDef,CORBA_LocalInterfaceDef_var>
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::operator[] (CORBA::ULong index) const
-  // read-write accessor
-  {
-    ACE_ASSERT (index < this->maximum_);
-    CORBA_LocalInterfaceDef ** const tmp = ACE_reinterpret_cast (CORBA_LocalInterfaceDef ** ACE_CAST_CONST, this->buffer_);
-    return TAO_Object_Manager<CORBA_LocalInterfaceDef,CORBA_LocalInterfaceDef_var> (tmp + index, this->release_);
-  }
   
-  ACE_INLINE CORBA_LocalInterfaceDef* *
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::get_buffer (CORBA::Boolean orphan)
+  return *this;
+}
+
+ACE_INLINE TAO_Object_Manager<CORBA_LocalInterfaceDef,CORBA_LocalInterfaceDef_var>
+_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::operator[] (CORBA::ULong index) const
+// read-write accessor
+{
+  ACE_ASSERT (index < this->maximum_);
+  CORBA_LocalInterfaceDef ** const tmp = ACE_reinterpret_cast (CORBA_LocalInterfaceDef ** ACE_CAST_CONST, this->buffer_);
+  return TAO_Object_Manager<CORBA_LocalInterfaceDef,CORBA_LocalInterfaceDef_var> (tmp + index, this->release_);
+}
+
+ACE_INLINE CORBA_LocalInterfaceDef* *
+_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::get_buffer (CORBA::Boolean orphan)
+{
+  CORBA_LocalInterfaceDef **result = 0;
+  if (orphan == 0)
   {
-    CORBA_LocalInterfaceDef **result = 0;
-    if (orphan == 0)
+    // We retain ownership.
+    if (this->buffer_ == 0)
     {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (this->maximum_);
-        this->buffer_ = result;
-        this->release_ = 1;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA_LocalInterfaceDef**, this->buffer_);
-      }
+      result = _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (this->maximum_);
+      this->buffer_ = result;
+      this->release_ = 1;
     }
-    else // if (orphan == 1)
+    else
     {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA_LocalInterfaceDef**,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
+      result = ACE_reinterpret_cast (CORBA_LocalInterfaceDef**, this->buffer_);
     }
-    return result;
   }
-  
-  ACE_INLINE const CORBA_LocalInterfaceDef* *
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::get_buffer (void) const
+  else // if (orphan == 1)
   {
-    return ACE_reinterpret_cast(const CORBA_LocalInterfaceDef ** ACE_CAST_CONST, this->buffer_);
+    if (this->release_ != 0)
+    {
+      // We set the state back to default and relinquish
+      // ownership.
+      result = ACE_reinterpret_cast(CORBA_LocalInterfaceDef**,this->buffer_);
+      this->maximum_ = 0;
+      this->length_ = 0;
+      this->buffer_ = 0;
+      this->release_ = 0;
+    }
   }
-  
-  
+  return result;
+}
+
+ACE_INLINE const CORBA_LocalInterfaceDef* *
+_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::get_buffer (void) const
+{
+  return ACE_reinterpret_cast(const CORBA_LocalInterfaceDef ** ACE_CAST_CONST, this->buffer_);
+}
+
+
 #endif /* end #if !defined */
 
 
@@ -2313,176 +2313,176 @@ CORBA_StructMember_out::operator-> (void)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_STRUCTMEMBERSEQ_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_STRUCTMEMBERSEQ_CI_
 
-  // = Static operations.
-  ACE_INLINE CORBA_StructMember *
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::allocbuf (CORBA::ULong size)
-  // Allocate storage for the sequence.
-  {
-    CORBA_StructMember *retval = 0;
-    ACE_NEW_RETURN (retval, CORBA_StructMember[size], 0);
-    return retval;
-  }
-  
-  ACE_INLINE void _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::freebuf (CORBA_StructMember *buffer)
-  // Free the sequence.
-  {
-    delete [] buffer;
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq (void) // Default constructor.
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA_StructMember *data,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq (const _TAO_Unbounded_Sequence_CORBA_StructMemberSeq &rhs)
-  // Copy constructor.
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    if (rhs.buffer_ != 0)
-    {
-      CORBA_StructMember *tmp1 = _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::allocbuf (this->maximum_);
-      CORBA_StructMember * const tmp2 = ACE_reinterpret_cast (CORBA_StructMember * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp1[i] = tmp2[i];
-      
-      this->buffer_ = tmp1;
-    }
-    else
-    {
-      this->buffer_ = 0;
-    }
-  }
-  
-  ACE_INLINE _TAO_Unbounded_Sequence_CORBA_StructMemberSeq &
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::operator= (const _TAO_Unbounded_Sequence_CORBA_StructMemberSeq &rhs)
-  // Assignment operator.
+// = Static operations.
+ACE_INLINE CORBA_StructMember *
+_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::allocbuf (CORBA::ULong size)
+// Allocate storage for the sequence.
+{
+  CORBA_StructMember *retval = 0;
+  ACE_NEW_RETURN (retval, CORBA_StructMember[size], 0);
+  return retval;
+}
+
+ACE_INLINE void _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::freebuf (CORBA_StructMember *buffer)
+// Free the sequence.
+{
+  delete [] buffer;
+}
+
+ACE_INLINE
+_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq (void) // Default constructor.
+{
+}
+
+ACE_INLINE
+_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq (CORBA::ULong maximum,
+  CORBA::ULong length,
+  CORBA_StructMember *data,
+  CORBA::Boolean release)
+: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+{
+}
+
+ACE_INLINE
+_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq (const _TAO_Unbounded_Sequence_CORBA_StructMemberSeq &rhs)
+// Copy constructor.
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
   {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-      {
-        // free the old buffer
-        CORBA_StructMember *tmp = ACE_reinterpret_cast (CORBA_StructMember *, this->buffer_);
-        _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    CORBA_StructMember *tmp1 = ACE_reinterpret_cast (CORBA_StructMember *, this->buffer_);
+    CORBA_StructMember *tmp1 = _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::allocbuf (this->maximum_);
     CORBA_StructMember * const tmp2 = ACE_reinterpret_cast (CORBA_StructMember * ACE_CAST_CONST, rhs.buffer_);
     
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
     
-    return *this;
+    this->buffer_ = tmp1;
   }
-  
-  // = Accessors.
-  ACE_INLINE CORBA_StructMember &
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::operator[] (CORBA::ULong i)
-  // operator []
+  else
   {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA_StructMember* tmp = ACE_reinterpret_cast(CORBA_StructMember*,this->buffer_);
-    return tmp[i];
+    this->buffer_ = 0;
   }
+}
+
+ACE_INLINE _TAO_Unbounded_Sequence_CORBA_StructMemberSeq &
+_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::operator= (const _TAO_Unbounded_Sequence_CORBA_StructMemberSeq &rhs)
+// Assignment operator.
+{
+  if (this == &rhs)
+    return *this;
   
-  ACE_INLINE const CORBA_StructMember &
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::operator[] (CORBA::ULong i) const
-  // operator []
+  if (this->release_)
   {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA_StructMember * const tmp = ACE_reinterpret_cast (CORBA_StructMember* ACE_CAST_CONST, this->buffer_);
-    return tmp[i];
+    if (this->maximum_ < rhs.maximum_)
+    {
+      // free the old buffer
+      CORBA_StructMember *tmp = ACE_reinterpret_cast (CORBA_StructMember *, this->buffer_);
+      _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::freebuf (tmp);
+      this->buffer_ = _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::allocbuf (rhs.maximum_);
+    }
   }
+  else
+    this->buffer_ = _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::allocbuf (rhs.maximum_);
+  
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  CORBA_StructMember *tmp1 = ACE_reinterpret_cast (CORBA_StructMember *, this->buffer_);
+  CORBA_StructMember * const tmp2 = ACE_reinterpret_cast (CORBA_StructMember * ACE_CAST_CONST, rhs.buffer_);
   
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    tmp1[i] = tmp2[i];
   
-  ACE_INLINE CORBA_StructMember *
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::get_buffer (CORBA::Boolean orphan)
+  return *this;
+}
+
+// = Accessors.
+ACE_INLINE CORBA_StructMember &
+_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::operator[] (CORBA::ULong i)
+// operator []
+{
+  ACE_ASSERT (i < this->maximum_);
+  CORBA_StructMember* tmp = ACE_reinterpret_cast(CORBA_StructMember*,this->buffer_);
+  return tmp[i];
+}
+
+ACE_INLINE const CORBA_StructMember &
+_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::operator[] (CORBA::ULong i) const
+// operator []
+{
+  ACE_ASSERT (i < this->maximum_);
+  CORBA_StructMember * const tmp = ACE_reinterpret_cast (CORBA_StructMember* ACE_CAST_CONST, this->buffer_);
+  return tmp[i];
+}
+
+// Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+ACE_INLINE CORBA_StructMember *
+_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::get_buffer (CORBA::Boolean orphan)
+{
+  CORBA_StructMember *result = 0;
+  if (orphan == 0)
   {
-    CORBA_StructMember *result = 0;
-    if (orphan == 0)
+    // We retain ownership.
+    if (this->buffer_ == 0)
     {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::allocbuf (this->length_);
-        this->buffer_ = result;
-        this->release_ = 1;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA_StructMember*, this->buffer_);
-      }
+      result = _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::allocbuf (this->length_);
+      this->buffer_ = result;
+      this->release_ = 1;
     }
-    else // if (orphan == 1)
+    else
     {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA_StructMember*,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
+      result = ACE_reinterpret_cast (CORBA_StructMember*, this->buffer_);
     }
-    return result;
   }
-  
-  ACE_INLINE const CORBA_StructMember *
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::get_buffer (void) const
+  else // if (orphan == 1)
   {
-    return ACE_reinterpret_cast(const CORBA_StructMember * ACE_CAST_CONST, this->buffer_);
-  }
-  
-  ACE_INLINE void
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::replace (CORBA::ULong max,
-  CORBA::ULong length,
-  CORBA_StructMember *data,
-  CORBA::Boolean release)
-  {
-    this->maximum_ = max;
-    this->length_ = length;
-    if (this->buffer_ && this->release_ == 1)
+    if (this->release_ != 0)
     {
-      CORBA_StructMember *tmp = ACE_reinterpret_cast(CORBA_StructMember*,this->buffer_);
-      _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::freebuf (tmp);
+      // We set the state back to default and relinquish
+      // ownership.
+      result = ACE_reinterpret_cast(CORBA_StructMember*,this->buffer_);
+      this->maximum_ = 0;
+      this->length_ = 0;
+      this->buffer_ = 0;
+      this->release_ = 0;
     }
-    this->buffer_ = data;
-    this->release_ = release;
   }
-  
+  return result;
+}
+
+ACE_INLINE const CORBA_StructMember *
+_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::get_buffer (void) const
+{
+  return ACE_reinterpret_cast(const CORBA_StructMember * ACE_CAST_CONST, this->buffer_);
+}
+
+ACE_INLINE void
+_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::replace (CORBA::ULong max,
+CORBA::ULong length,
+CORBA_StructMember *data,
+CORBA::Boolean release)
+{
+  this->maximum_ = max;
+  this->length_ = length;
+  if (this->buffer_ && this->release_ == 1)
+  {
+    CORBA_StructMember *tmp = ACE_reinterpret_cast(CORBA_StructMember*,this->buffer_);
+    _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::freebuf (tmp);
+  }
+  this->buffer_ = data;
+  this->release_ = release;
+}
+
 #endif /* end #if !defined */
 
 
@@ -2900,176 +2900,176 @@ CORBA_Initializer_out::operator-> (void)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_INITIALIZERSEQ_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_INITIALIZERSEQ_CI_
 
-  // = Static operations.
-  ACE_INLINE CORBA_Initializer *
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq::allocbuf (CORBA::ULong size)
-  // Allocate storage for the sequence.
-  {
-    CORBA_Initializer *retval = 0;
-    ACE_NEW_RETURN (retval, CORBA_Initializer[size], 0);
-    return retval;
-  }
-  
-  ACE_INLINE void _TAO_Unbounded_Sequence_CORBA_InitializerSeq::freebuf (CORBA_Initializer *buffer)
-  // Free the sequence.
-  {
-    delete [] buffer;
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq::_TAO_Unbounded_Sequence_CORBA_InitializerSeq (void) // Default constructor.
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq::_TAO_Unbounded_Sequence_CORBA_InitializerSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_InitializerSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq::_TAO_Unbounded_Sequence_CORBA_InitializerSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA_Initializer *data,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq::_TAO_Unbounded_Sequence_CORBA_InitializerSeq (const _TAO_Unbounded_Sequence_CORBA_InitializerSeq &rhs)
-  // Copy constructor.
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    if (rhs.buffer_ != 0)
-    {
-      CORBA_Initializer *tmp1 = _TAO_Unbounded_Sequence_CORBA_InitializerSeq::allocbuf (this->maximum_);
-      CORBA_Initializer * const tmp2 = ACE_reinterpret_cast (CORBA_Initializer * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp1[i] = tmp2[i];
-      
-      this->buffer_ = tmp1;
-    }
-    else
-    {
-      this->buffer_ = 0;
-    }
-  }
-  
-  ACE_INLINE _TAO_Unbounded_Sequence_CORBA_InitializerSeq &
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq::operator= (const _TAO_Unbounded_Sequence_CORBA_InitializerSeq &rhs)
-  // Assignment operator.
+// = Static operations.
+ACE_INLINE CORBA_Initializer *
+_TAO_Unbounded_Sequence_CORBA_InitializerSeq::allocbuf (CORBA::ULong size)
+// Allocate storage for the sequence.
+{
+  CORBA_Initializer *retval = 0;
+  ACE_NEW_RETURN (retval, CORBA_Initializer[size], 0);
+  return retval;
+}
+
+ACE_INLINE void _TAO_Unbounded_Sequence_CORBA_InitializerSeq::freebuf (CORBA_Initializer *buffer)
+// Free the sequence.
+{
+  delete [] buffer;
+}
+
+ACE_INLINE
+_TAO_Unbounded_Sequence_CORBA_InitializerSeq::_TAO_Unbounded_Sequence_CORBA_InitializerSeq (void) // Default constructor.
+{
+}
+
+ACE_INLINE
+_TAO_Unbounded_Sequence_CORBA_InitializerSeq::_TAO_Unbounded_Sequence_CORBA_InitializerSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_InitializerSeq::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+_TAO_Unbounded_Sequence_CORBA_InitializerSeq::_TAO_Unbounded_Sequence_CORBA_InitializerSeq (CORBA::ULong maximum,
+  CORBA::ULong length,
+  CORBA_Initializer *data,
+  CORBA::Boolean release)
+: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+{
+}
+
+ACE_INLINE
+_TAO_Unbounded_Sequence_CORBA_InitializerSeq::_TAO_Unbounded_Sequence_CORBA_InitializerSeq (const _TAO_Unbounded_Sequence_CORBA_InitializerSeq &rhs)
+// Copy constructor.
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
   {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-      {
-        // free the old buffer
-        CORBA_Initializer *tmp = ACE_reinterpret_cast (CORBA_Initializer *, this->buffer_);
-        _TAO_Unbounded_Sequence_CORBA_InitializerSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Sequence_CORBA_InitializerSeq::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = _TAO_Unbounded_Sequence_CORBA_InitializerSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    CORBA_Initializer *tmp1 = ACE_reinterpret_cast (CORBA_Initializer *, this->buffer_);
+    CORBA_Initializer *tmp1 = _TAO_Unbounded_Sequence_CORBA_InitializerSeq::allocbuf (this->maximum_);
     CORBA_Initializer * const tmp2 = ACE_reinterpret_cast (CORBA_Initializer * ACE_CAST_CONST, rhs.buffer_);
     
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
     
-    return *this;
+    this->buffer_ = tmp1;
   }
-  
-  // = Accessors.
-  ACE_INLINE CORBA_Initializer &
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq::operator[] (CORBA::ULong i)
-  // operator []
+  else
   {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA_Initializer* tmp = ACE_reinterpret_cast(CORBA_Initializer*,this->buffer_);
-    return tmp[i];
+    this->buffer_ = 0;
   }
+}
+
+ACE_INLINE _TAO_Unbounded_Sequence_CORBA_InitializerSeq &
+_TAO_Unbounded_Sequence_CORBA_InitializerSeq::operator= (const _TAO_Unbounded_Sequence_CORBA_InitializerSeq &rhs)
+// Assignment operator.
+{
+  if (this == &rhs)
+    return *this;
   
-  ACE_INLINE const CORBA_Initializer &
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq::operator[] (CORBA::ULong i) const
-  // operator []
+  if (this->release_)
   {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA_Initializer * const tmp = ACE_reinterpret_cast (CORBA_Initializer* ACE_CAST_CONST, this->buffer_);
-    return tmp[i];
+    if (this->maximum_ < rhs.maximum_)
+    {
+      // free the old buffer
+      CORBA_Initializer *tmp = ACE_reinterpret_cast (CORBA_Initializer *, this->buffer_);
+      _TAO_Unbounded_Sequence_CORBA_InitializerSeq::freebuf (tmp);
+      this->buffer_ = _TAO_Unbounded_Sequence_CORBA_InitializerSeq::allocbuf (rhs.maximum_);
+    }
   }
+  else
+    this->buffer_ = _TAO_Unbounded_Sequence_CORBA_InitializerSeq::allocbuf (rhs.maximum_);
+  
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
+  CORBA_Initializer *tmp1 = ACE_reinterpret_cast (CORBA_Initializer *, this->buffer_);
+  CORBA_Initializer * const tmp2 = ACE_reinterpret_cast (CORBA_Initializer * ACE_CAST_CONST, rhs.buffer_);
   
-  ACE_INLINE CORBA_Initializer *
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq::get_buffer (CORBA::Boolean orphan)
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    tmp1[i] = tmp2[i];
+  
+  return *this;
+}
+
+// = Accessors.
+ACE_INLINE CORBA_Initializer &
+_TAO_Unbounded_Sequence_CORBA_InitializerSeq::operator[] (CORBA::ULong i)
+// operator []
+{
+  ACE_ASSERT (i < this->maximum_);
+  CORBA_Initializer* tmp = ACE_reinterpret_cast(CORBA_Initializer*,this->buffer_);
+  return tmp[i];
+}
+
+ACE_INLINE const CORBA_Initializer &
+_TAO_Unbounded_Sequence_CORBA_InitializerSeq::operator[] (CORBA::ULong i) const
+// operator []
+{
+  ACE_ASSERT (i < this->maximum_);
+  CORBA_Initializer * const tmp = ACE_reinterpret_cast (CORBA_Initializer* ACE_CAST_CONST, this->buffer_);
+  return tmp[i];
+}
+
+// Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+ACE_INLINE CORBA_Initializer *
+_TAO_Unbounded_Sequence_CORBA_InitializerSeq::get_buffer (CORBA::Boolean orphan)
+{
+  CORBA_Initializer *result = 0;
+  if (orphan == 0)
   {
-    CORBA_Initializer *result = 0;
-    if (orphan == 0)
+    // We retain ownership.
+    if (this->buffer_ == 0)
     {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Sequence_CORBA_InitializerSeq::allocbuf (this->length_);
-        this->buffer_ = result;
-        this->release_ = 1;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA_Initializer*, this->buffer_);
-      }
+      result = _TAO_Unbounded_Sequence_CORBA_InitializerSeq::allocbuf (this->length_);
+      this->buffer_ = result;
+      this->release_ = 1;
     }
-    else // if (orphan == 1)
+    else
     {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA_Initializer*,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
+      result = ACE_reinterpret_cast (CORBA_Initializer*, this->buffer_);
     }
-    return result;
   }
-  
-  ACE_INLINE const CORBA_Initializer *
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq::get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const CORBA_Initializer * ACE_CAST_CONST, this->buffer_);
-  }
-  
-  ACE_INLINE void
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq::replace (CORBA::ULong max,
-  CORBA::ULong length,
-  CORBA_Initializer *data,
-  CORBA::Boolean release)
+  else // if (orphan == 1)
   {
-    this->maximum_ = max;
-    this->length_ = length;
-    if (this->buffer_ && this->release_ == 1)
+    if (this->release_ != 0)
     {
-      CORBA_Initializer *tmp = ACE_reinterpret_cast(CORBA_Initializer*,this->buffer_);
-      _TAO_Unbounded_Sequence_CORBA_InitializerSeq::freebuf (tmp);
+      // We set the state back to default and relinquish
+      // ownership.
+      result = ACE_reinterpret_cast(CORBA_Initializer*,this->buffer_);
+      this->maximum_ = 0;
+      this->length_ = 0;
+      this->buffer_ = 0;
+      this->release_ = 0;
     }
-    this->buffer_ = data;
-    this->release_ = release;
   }
-  
+  return result;
+}
+
+ACE_INLINE const CORBA_Initializer *
+_TAO_Unbounded_Sequence_CORBA_InitializerSeq::get_buffer (void) const
+{
+  return ACE_reinterpret_cast(const CORBA_Initializer * ACE_CAST_CONST, this->buffer_);
+}
+
+ACE_INLINE void
+_TAO_Unbounded_Sequence_CORBA_InitializerSeq::replace (CORBA::ULong max,
+CORBA::ULong length,
+CORBA_Initializer *data,
+CORBA::Boolean release)
+{
+  this->maximum_ = max;
+  this->length_ = length;
+  if (this->buffer_ && this->release_ == 1)
+  {
+    CORBA_Initializer *tmp = ACE_reinterpret_cast(CORBA_Initializer*,this->buffer_);
+    _TAO_Unbounded_Sequence_CORBA_InitializerSeq::freebuf (tmp);
+  }
+  this->buffer_ = data;
+  this->release_ = release;
+}
+
 #endif /* end #if !defined */
 
 
@@ -3487,176 +3487,176 @@ CORBA_UnionMember_out::operator-> (void)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_UNIONMEMBERSEQ_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_UNIONMEMBERSEQ_CI_
 
-  // = Static operations.
-  ACE_INLINE CORBA_UnionMember *
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::allocbuf (CORBA::ULong size)
-  // Allocate storage for the sequence.
-  {
-    CORBA_UnionMember *retval = 0;
-    ACE_NEW_RETURN (retval, CORBA_UnionMember[size], 0);
-    return retval;
-  }
-  
-  ACE_INLINE void _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::freebuf (CORBA_UnionMember *buffer)
-  // Free the sequence.
-  {
-    delete [] buffer;
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (void) // Default constructor.
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA_UnionMember *data,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (const _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq &rhs)
-  // Copy constructor.
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    if (rhs.buffer_ != 0)
-    {
-      CORBA_UnionMember *tmp1 = _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::allocbuf (this->maximum_);
-      CORBA_UnionMember * const tmp2 = ACE_reinterpret_cast (CORBA_UnionMember * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp1[i] = tmp2[i];
-      
-      this->buffer_ = tmp1;
-    }
-    else
-    {
-      this->buffer_ = 0;
-    }
-  }
-  
-  ACE_INLINE _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq &
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::operator= (const _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq &rhs)
-  // Assignment operator.
+// = Static operations.
+ACE_INLINE CORBA_UnionMember *
+_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::allocbuf (CORBA::ULong size)
+// Allocate storage for the sequence.
+{
+  CORBA_UnionMember *retval = 0;
+  ACE_NEW_RETURN (retval, CORBA_UnionMember[size], 0);
+  return retval;
+}
+
+ACE_INLINE void _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::freebuf (CORBA_UnionMember *buffer)
+// Free the sequence.
+{
+  delete [] buffer;
+}
+
+ACE_INLINE
+_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (void) // Default constructor.
+{
+}
+
+ACE_INLINE
+_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (CORBA::ULong maximum,
+  CORBA::ULong length,
+  CORBA_UnionMember *data,
+  CORBA::Boolean release)
+: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+{
+}
+
+ACE_INLINE
+_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (const _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq &rhs)
+// Copy constructor.
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
   {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-      {
-        // free the old buffer
-        CORBA_UnionMember *tmp = ACE_reinterpret_cast (CORBA_UnionMember *, this->buffer_);
-        _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    CORBA_UnionMember *tmp1 = ACE_reinterpret_cast (CORBA_UnionMember *, this->buffer_);
+    CORBA_UnionMember *tmp1 = _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::allocbuf (this->maximum_);
     CORBA_UnionMember * const tmp2 = ACE_reinterpret_cast (CORBA_UnionMember * ACE_CAST_CONST, rhs.buffer_);
     
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
     
-    return *this;
+    this->buffer_ = tmp1;
   }
-  
-  // = Accessors.
-  ACE_INLINE CORBA_UnionMember &
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::operator[] (CORBA::ULong i)
-  // operator []
+  else
   {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA_UnionMember* tmp = ACE_reinterpret_cast(CORBA_UnionMember*,this->buffer_);
-    return tmp[i];
+    this->buffer_ = 0;
   }
+}
+
+ACE_INLINE _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq &
+_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::operator= (const _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq &rhs)
+// Assignment operator.
+{
+  if (this == &rhs)
+    return *this;
   
-  ACE_INLINE const CORBA_UnionMember &
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::operator[] (CORBA::ULong i) const
-  // operator []
+  if (this->release_)
   {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA_UnionMember * const tmp = ACE_reinterpret_cast (CORBA_UnionMember* ACE_CAST_CONST, this->buffer_);
-    return tmp[i];
+    if (this->maximum_ < rhs.maximum_)
+    {
+      // free the old buffer
+      CORBA_UnionMember *tmp = ACE_reinterpret_cast (CORBA_UnionMember *, this->buffer_);
+      _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::freebuf (tmp);
+      this->buffer_ = _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::allocbuf (rhs.maximum_);
+    }
   }
+  else
+    this->buffer_ = _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::allocbuf (rhs.maximum_);
   
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  ACE_INLINE CORBA_UnionMember *
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::get_buffer (CORBA::Boolean orphan)
+  CORBA_UnionMember *tmp1 = ACE_reinterpret_cast (CORBA_UnionMember *, this->buffer_);
+  CORBA_UnionMember * const tmp2 = ACE_reinterpret_cast (CORBA_UnionMember * ACE_CAST_CONST, rhs.buffer_);
+  
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    tmp1[i] = tmp2[i];
+  
+  return *this;
+}
+
+// = Accessors.
+ACE_INLINE CORBA_UnionMember &
+_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::operator[] (CORBA::ULong i)
+// operator []
+{
+  ACE_ASSERT (i < this->maximum_);
+  CORBA_UnionMember* tmp = ACE_reinterpret_cast(CORBA_UnionMember*,this->buffer_);
+  return tmp[i];
+}
+
+ACE_INLINE const CORBA_UnionMember &
+_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::operator[] (CORBA::ULong i) const
+// operator []
+{
+  ACE_ASSERT (i < this->maximum_);
+  CORBA_UnionMember * const tmp = ACE_reinterpret_cast (CORBA_UnionMember* ACE_CAST_CONST, this->buffer_);
+  return tmp[i];
+}
+
+// Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+ACE_INLINE CORBA_UnionMember *
+_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::get_buffer (CORBA::Boolean orphan)
+{
+  CORBA_UnionMember *result = 0;
+  if (orphan == 0)
   {
-    CORBA_UnionMember *result = 0;
-    if (orphan == 0)
+    // We retain ownership.
+    if (this->buffer_ == 0)
     {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::allocbuf (this->length_);
-        this->buffer_ = result;
-        this->release_ = 1;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA_UnionMember*, this->buffer_);
-      }
+      result = _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::allocbuf (this->length_);
+      this->buffer_ = result;
+      this->release_ = 1;
     }
-    else // if (orphan == 1)
+    else
     {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA_UnionMember*,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
+      result = ACE_reinterpret_cast (CORBA_UnionMember*, this->buffer_);
     }
-    return result;
   }
-  
-  ACE_INLINE const CORBA_UnionMember *
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::get_buffer (void) const
+  else // if (orphan == 1)
   {
-    return ACE_reinterpret_cast(const CORBA_UnionMember * ACE_CAST_CONST, this->buffer_);
-  }
-  
-  ACE_INLINE void
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::replace (CORBA::ULong max,
-  CORBA::ULong length,
-  CORBA_UnionMember *data,
-  CORBA::Boolean release)
-  {
-    this->maximum_ = max;
-    this->length_ = length;
-    if (this->buffer_ && this->release_ == 1)
+    if (this->release_ != 0)
     {
-      CORBA_UnionMember *tmp = ACE_reinterpret_cast(CORBA_UnionMember*,this->buffer_);
-      _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::freebuf (tmp);
+      // We set the state back to default and relinquish
+      // ownership.
+      result = ACE_reinterpret_cast(CORBA_UnionMember*,this->buffer_);
+      this->maximum_ = 0;
+      this->length_ = 0;
+      this->buffer_ = 0;
+      this->release_ = 0;
     }
-    this->buffer_ = data;
-    this->release_ = release;
   }
-  
+  return result;
+}
+
+ACE_INLINE const CORBA_UnionMember *
+_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::get_buffer (void) const
+{
+  return ACE_reinterpret_cast(const CORBA_UnionMember * ACE_CAST_CONST, this->buffer_);
+}
+
+ACE_INLINE void
+_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::replace (CORBA::ULong max,
+CORBA::ULong length,
+CORBA_UnionMember *data,
+CORBA::Boolean release)
+{
+  this->maximum_ = max;
+  this->length_ = length;
+  if (this->buffer_ && this->release_ == 1)
+  {
+    CORBA_UnionMember *tmp = ACE_reinterpret_cast(CORBA_UnionMember*,this->buffer_);
+    _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::freebuf (tmp);
+  }
+  this->buffer_ = data;
+  this->release_ = release;
+}
+
 #endif /* end #if !defined */
 
 
@@ -4286,176 +4286,176 @@ CORBA_Container::Description_out::operator-> (void)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_CONTAINER_DESCRIPTIONSEQ_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_CONTAINER_DESCRIPTIONSEQ_CI_
 
-  // = Static operations.
-  ACE_INLINE CORBA_Container::Description *
-  CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (CORBA::ULong size)
-  // Allocate storage for the sequence.
-  {
-    CORBA_Container::Description *retval = 0;
-    ACE_NEW_RETURN (retval, CORBA_Container::Description[size], 0);
-    return retval;
-  }
-  
-  ACE_INLINE void CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::freebuf (CORBA_Container::Description *buffer)
-  // Free the sequence.
-  {
-    delete [] buffer;
-  }
-  
-  ACE_INLINE
-  CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (void) // Default constructor.
-  {
-  }
-  
-  ACE_INLINE
-  CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA_Container::Description *data,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-  {
-  }
-  
-  ACE_INLINE
-  CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (const _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq &rhs)
-  // Copy constructor.
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    if (rhs.buffer_ != 0)
-    {
-      CORBA_Container::Description *tmp1 = _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (this->maximum_);
-      CORBA_Container::Description * const tmp2 = ACE_reinterpret_cast (CORBA_Container::Description * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp1[i] = tmp2[i];
-      
-      this->buffer_ = tmp1;
-    }
-    else
-    {
-      this->buffer_ = 0;
-    }
-  }
-  
-  ACE_INLINE CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq &
-  CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::operator= (const _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq &rhs)
-  // Assignment operator.
+// = Static operations.
+ACE_INLINE CORBA_Container::Description *
+CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (CORBA::ULong size)
+// Allocate storage for the sequence.
+{
+  CORBA_Container::Description *retval = 0;
+  ACE_NEW_RETURN (retval, CORBA_Container::Description[size], 0);
+  return retval;
+}
+
+ACE_INLINE void CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::freebuf (CORBA_Container::Description *buffer)
+// Free the sequence.
+{
+  delete [] buffer;
+}
+
+ACE_INLINE
+CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (void) // Default constructor.
+{
+}
+
+ACE_INLINE
+CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (CORBA::ULong maximum,
+  CORBA::ULong length,
+  CORBA_Container::Description *data,
+  CORBA::Boolean release)
+: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+{
+}
+
+ACE_INLINE
+CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (const _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq &rhs)
+// Copy constructor.
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
   {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-      {
-        // free the old buffer
-        CORBA_Container::Description *tmp = ACE_reinterpret_cast (CORBA_Container::Description *, this->buffer_);
-        _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    CORBA_Container::Description *tmp1 = ACE_reinterpret_cast (CORBA_Container::Description *, this->buffer_);
+    CORBA_Container::Description *tmp1 = _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (this->maximum_);
     CORBA_Container::Description * const tmp2 = ACE_reinterpret_cast (CORBA_Container::Description * ACE_CAST_CONST, rhs.buffer_);
     
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
     
-    return *this;
+    this->buffer_ = tmp1;
   }
-  
-  // = Accessors.
-  ACE_INLINE CORBA_Container::Description &
-  CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::operator[] (CORBA::ULong i)
-  // operator []
+  else
   {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA_Container::Description* tmp = ACE_reinterpret_cast(CORBA_Container::Description*,this->buffer_);
-    return tmp[i];
+    this->buffer_ = 0;
   }
+}
+
+ACE_INLINE CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq &
+CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::operator= (const _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq &rhs)
+// Assignment operator.
+{
+  if (this == &rhs)
+    return *this;
   
-  ACE_INLINE const CORBA_Container::Description &
-  CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::operator[] (CORBA::ULong i) const
-  // operator []
+  if (this->release_)
   {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA_Container::Description * const tmp = ACE_reinterpret_cast (CORBA_Container::Description* ACE_CAST_CONST, this->buffer_);
-    return tmp[i];
+    if (this->maximum_ < rhs.maximum_)
+    {
+      // free the old buffer
+      CORBA_Container::Description *tmp = ACE_reinterpret_cast (CORBA_Container::Description *, this->buffer_);
+      _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::freebuf (tmp);
+      this->buffer_ = _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (rhs.maximum_);
+    }
   }
+  else
+    this->buffer_ = _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (rhs.maximum_);
+  
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  CORBA_Container::Description *tmp1 = ACE_reinterpret_cast (CORBA_Container::Description *, this->buffer_);
+  CORBA_Container::Description * const tmp2 = ACE_reinterpret_cast (CORBA_Container::Description * ACE_CAST_CONST, rhs.buffer_);
   
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    tmp1[i] = tmp2[i];
   
-  ACE_INLINE CORBA_Container::Description *
-  CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::get_buffer (CORBA::Boolean orphan)
+  return *this;
+}
+
+// = Accessors.
+ACE_INLINE CORBA_Container::Description &
+CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::operator[] (CORBA::ULong i)
+// operator []
+{
+  ACE_ASSERT (i < this->maximum_);
+  CORBA_Container::Description* tmp = ACE_reinterpret_cast(CORBA_Container::Description*,this->buffer_);
+  return tmp[i];
+}
+
+ACE_INLINE const CORBA_Container::Description &
+CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::operator[] (CORBA::ULong i) const
+// operator []
+{
+  ACE_ASSERT (i < this->maximum_);
+  CORBA_Container::Description * const tmp = ACE_reinterpret_cast (CORBA_Container::Description* ACE_CAST_CONST, this->buffer_);
+  return tmp[i];
+}
+
+// Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+ACE_INLINE CORBA_Container::Description *
+CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::get_buffer (CORBA::Boolean orphan)
+{
+  CORBA_Container::Description *result = 0;
+  if (orphan == 0)
   {
-    CORBA_Container::Description *result = 0;
-    if (orphan == 0)
+    // We retain ownership.
+    if (this->buffer_ == 0)
     {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (this->length_);
-        this->buffer_ = result;
-        this->release_ = 1;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA_Container::Description*, this->buffer_);
-      }
+      result = _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (this->length_);
+      this->buffer_ = result;
+      this->release_ = 1;
     }
-    else // if (orphan == 1)
+    else
     {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA_Container::Description*,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
+      result = ACE_reinterpret_cast (CORBA_Container::Description*, this->buffer_);
     }
-    return result;
   }
-  
-  ACE_INLINE const CORBA_Container::Description *
-  CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const CORBA_Container::Description * ACE_CAST_CONST, this->buffer_);
-  }
-  
-  ACE_INLINE void
-  CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::replace (CORBA::ULong max,
-  CORBA::ULong length,
-  CORBA_Container::Description *data,
-  CORBA::Boolean release)
+  else // if (orphan == 1)
   {
-    this->maximum_ = max;
-    this->length_ = length;
-    if (this->buffer_ && this->release_ == 1)
+    if (this->release_ != 0)
     {
-      CORBA_Container::Description *tmp = ACE_reinterpret_cast(CORBA_Container::Description*,this->buffer_);
-      _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::freebuf (tmp);
+      // We set the state back to default and relinquish
+      // ownership.
+      result = ACE_reinterpret_cast(CORBA_Container::Description*,this->buffer_);
+      this->maximum_ = 0;
+      this->length_ = 0;
+      this->buffer_ = 0;
+      this->release_ = 0;
     }
-    this->buffer_ = data;
-    this->release_ = release;
   }
-  
+  return result;
+}
+
+ACE_INLINE const CORBA_Container::Description *
+CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::get_buffer (void) const
+{
+  return ACE_reinterpret_cast(const CORBA_Container::Description * ACE_CAST_CONST, this->buffer_);
+}
+
+ACE_INLINE void
+CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::replace (CORBA::ULong max,
+CORBA::ULong length,
+CORBA_Container::Description *data,
+CORBA::Boolean release)
+{
+  this->maximum_ = max;
+  this->length_ = length;
+  if (this->buffer_ && this->release_ == 1)
+  {
+    CORBA_Container::Description *tmp = ACE_reinterpret_cast(CORBA_Container::Description*,this->buffer_);
+    _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::freebuf (tmp);
+  }
+  this->buffer_ = data;
+  this->release_ = release;
+}
+
 #endif /* end #if !defined */
 
 
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.cpp b/TAO/tao/IFR_Client/IFR_BasicC.cpp
index 87016949b2a..b9ed8506499 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.cpp
+++ b/TAO/tao/IFR_Client/IFR_BasicC.cpp
@@ -23,9 +23,12 @@
 
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
-#include "tao/ClientRequestInfo.h"
+#include "tao/PortableInterceptor.h"
+
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
+#include "tao/ClientRequestInfo.h"
+#include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 #if defined (__BORLANDC__)
@@ -36,6 +39,7 @@
 #include "IFR_BasicC.i"
 #endif /* !defined INLINE */
 
+
 CORBA_Repository_ptr
 tao_CORBA_Repository_duplicate (
     CORBA_Repository_ptr p
@@ -127,7 +131,7 @@ CORBA_Repository_var::operator const ::CORBA_Repository_ptr &() const // cast
   return this->ptr_;
 }
 
-CORBA_Repository_var::operator ::CORBA_Repository_ptr &() // cast 
+CORBA_Repository_var::operator ::CORBA_Repository_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -203,7 +207,7 @@ CORBA_Repository_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class CORBA_Repository_out
+// Operations for class CORBA_Repository_out
 // *************************************************************
 
 CORBA_Repository_out::CORBA_Repository_out (CORBA_Repository_ptr &p)
@@ -270,24 +274,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * search_id,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -306,7 +310,7 @@ TAO_ClientRequestInfo_CORBA_Repository_lookup_id::TAO_ClientRequestInfo_CORBA_Re
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const char * search_id,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     search_id_ (search_id)
@@ -320,14 +324,16 @@ TAO_ClientRequestInfo_CORBA_Repository_lookup_id::arguments (CORBA::Environment
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_search_id = parameter_list->length ();
-  parameter_list->length (length_search_id + 1);
-  (*parameter_list)[length_search_id].argument <<= search_id_;
-  (*parameter_list)[length_search_id].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= search_id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -339,12 +345,12 @@ TAO_ClientRequestInfo_CORBA_Repository_lookup_id::exceptions (CORBA::Environment
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Repository_lookup_id::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -353,17 +359,17 @@ TAO_ClientRequestInfo_CORBA_Repository_lookup_id::result (CORBA::Environment &AC
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Repository_lookup_id::result (CORBA_Contained_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -374,24 +380,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::TypeCode_ptr tc,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -410,7 +416,7 @@ TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::TAO_ClientRequest
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     CORBA::TypeCode_ptr tc,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     tc_ (tc)
@@ -424,14 +430,16 @@ TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::arguments (CORBA:
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_tc = parameter_list->length ();
-  parameter_list->length (length_tc + 1);
-  (*parameter_list)[length_tc].argument <<= tc_;
-  (*parameter_list)[length_tc].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= tc_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -443,12 +451,12 @@ TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::exceptions (CORBA
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -457,17 +465,17 @@ TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::result (CORBA::En
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::result (CORBA::TypeCode_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -478,24 +486,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::PrimitiveKind & kind,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -514,7 +522,7 @@ TAO_ClientRequestInfo_CORBA_Repository_get_primitive::TAO_ClientRequestInfo_CORB
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     CORBA::PrimitiveKind & kind,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     kind_ (kind)
@@ -528,15 +536,16 @@ TAO_ClientRequestInfo_CORBA_Repository_get_primitive::arguments (CORBA::Environm
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_kind = parameter_list->length ();
-  parameter_list->length (length_kind + 1);
-  (*parameter_list)[length_kind].argument <<=  this->kind_;
-  
-  (*parameter_list)[length_kind].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<=  this->kind_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -548,12 +557,12 @@ TAO_ClientRequestInfo_CORBA_Repository_get_primitive::exceptions (CORBA::Environ
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Repository_get_primitive::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -562,17 +571,17 @@ TAO_ClientRequestInfo_CORBA_Repository_get_primitive::result (CORBA::Environment
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Repository_get_primitive::result (CORBA_PrimitiveDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -583,24 +592,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::ULong & bound,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -619,7 +628,7 @@ TAO_ClientRequestInfo_CORBA_Repository_create_string::TAO_ClientRequestInfo_CORB
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA::ULong & bound,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     bound_ (bound)
@@ -633,14 +642,16 @@ TAO_ClientRequestInfo_CORBA_Repository_create_string::arguments (CORBA::Environm
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_bound = parameter_list->length ();
-  parameter_list->length (length_bound + 1);
-  (*parameter_list)[length_bound].argument <<= bound_;
-  (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= bound_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -652,12 +663,12 @@ TAO_ClientRequestInfo_CORBA_Repository_create_string::exceptions (CORBA::Environ
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Repository_create_string::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -666,17 +677,17 @@ TAO_ClientRequestInfo_CORBA_Repository_create_string::result (CORBA::Environment
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Repository_create_string::result (CORBA_StringDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -687,24 +698,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::ULong & bound,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -723,7 +734,7 @@ TAO_ClientRequestInfo_CORBA_Repository_create_wstring::TAO_ClientRequestInfo_COR
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA::ULong & bound,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     bound_ (bound)
@@ -737,14 +748,16 @@ TAO_ClientRequestInfo_CORBA_Repository_create_wstring::arguments (CORBA::Environ
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_bound = parameter_list->length ();
-  parameter_list->length (length_bound + 1);
-  (*parameter_list)[length_bound].argument <<= bound_;
-  (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= bound_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -756,12 +769,12 @@ TAO_ClientRequestInfo_CORBA_Repository_create_wstring::exceptions (CORBA::Enviro
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Repository_create_wstring::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -770,17 +783,17 @@ TAO_ClientRequestInfo_CORBA_Repository_create_wstring::result (CORBA::Environmen
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Repository_create_wstring::result (CORBA_WstringDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -792,24 +805,24 @@ public:
       CORBA::Object_ptr _tao_target,
       const CORBA::ULong & bound,
       CORBA_IDLType_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -830,7 +843,7 @@ TAO_ClientRequestInfo_CORBA_Repository_create_sequence::TAO_ClientRequestInfo_CO
     CORBA::Object_ptr _tao_target,
     const CORBA::ULong & bound,
     CORBA_IDLType_ptr element_type,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     bound_ (bound),
@@ -845,20 +858,19 @@ TAO_ClientRequestInfo_CORBA_Repository_create_sequence::arguments (CORBA::Enviro
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_bound = parameter_list->length ();
-  parameter_list->length (length_bound + 1);
-  (*parameter_list)[length_bound].argument <<= bound_;
-  (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_element_type = parameter_list->length ();
-  parameter_list->length (length_element_type + 1);
-  (*parameter_list)[length_element_type].argument <<=  this->element_type_;
-  
-  (*parameter_list)[length_element_type].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (2);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= bound_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->element_type_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -870,12 +882,12 @@ TAO_ClientRequestInfo_CORBA_Repository_create_sequence::exceptions (CORBA::Envir
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Repository_create_sequence::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -884,17 +896,17 @@ TAO_ClientRequestInfo_CORBA_Repository_create_sequence::result (CORBA::Environme
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Repository_create_sequence::result (CORBA_SequenceDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -906,24 +918,24 @@ public:
       CORBA::Object_ptr _tao_target,
       const CORBA::ULong & length,
       CORBA_IDLType_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -944,7 +956,7 @@ TAO_ClientRequestInfo_CORBA_Repository_create_array::TAO_ClientRequestInfo_CORBA
     CORBA::Object_ptr _tao_target,
     const CORBA::ULong & length,
     CORBA_IDLType_ptr element_type,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     length_ (length),
@@ -959,20 +971,19 @@ TAO_ClientRequestInfo_CORBA_Repository_create_array::arguments (CORBA::Environme
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_length = parameter_list->length ();
-  parameter_list->length (length_length + 1);
-  (*parameter_list)[length_length].argument <<= length_;
-  (*parameter_list)[length_length].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_element_type = parameter_list->length ();
-  parameter_list->length (length_element_type + 1);
-  (*parameter_list)[length_element_type].argument <<=  this->element_type_;
-  
-  (*parameter_list)[length_element_type].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (2);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= length_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->element_type_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -984,12 +995,12 @@ TAO_ClientRequestInfo_CORBA_Repository_create_array::exceptions (CORBA::Environm
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Repository_create_array::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -998,17 +1009,17 @@ TAO_ClientRequestInfo_CORBA_Repository_create_array::result (CORBA::Environment
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Repository_create_array::result (CORBA_ArrayDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -1020,24 +1031,24 @@ public:
       CORBA::Object_ptr _tao_target,
       const CORBA::UShort & digits,
       const CORBA::Short & scale,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -1058,7 +1069,7 @@ TAO_ClientRequestInfo_CORBA_Repository_create_fixed::TAO_ClientRequestInfo_CORBA
     CORBA::Object_ptr _tao_target,
     const CORBA::UShort & digits,
     const CORBA::Short & scale,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     digits_ (digits),
@@ -1073,19 +1084,19 @@ TAO_ClientRequestInfo_CORBA_Repository_create_fixed::arguments (CORBA::Environme
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_digits = parameter_list->length ();
-  parameter_list->length (length_digits + 1);
-  (*parameter_list)[length_digits].argument <<= digits_;
-  (*parameter_list)[length_digits].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_scale = parameter_list->length ();
-  parameter_list->length (length_scale + 1);
-  (*parameter_list)[length_scale].argument <<= scale_;
-  (*parameter_list)[length_scale].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (2);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= digits_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= scale_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -1097,12 +1108,12 @@ TAO_ClientRequestInfo_CORBA_Repository_create_fixed::exceptions (CORBA::Environm
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Repository_create_fixed::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1111,24 +1122,24 @@ TAO_ClientRequestInfo_CORBA_Repository_create_fixed::result (CORBA::Environment
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Repository_create_fixed::result (CORBA_FixedDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 _TAO_CORBA_Repository_Proxy_Impl::_TAO_CORBA_Repository_Proxy_Impl (void)
@@ -1148,16 +1159,16 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::lookup_id (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_Contained_ptr _tao_retval = CORBA_Contained::_nil ();
   CORBA_Contained_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "lookup_id",
@@ -1166,17 +1177,21 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::lookup_id (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Repository_lookup_id ri (
         &_tao_call,
@@ -1185,31 +1200,40 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::lookup_id (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << search_id)
@@ -1218,20 +1242,33 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::lookup_id (
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -1241,74 +1278,55 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::lookup_id (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_Contained_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_Contained_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_canonical_typecode (
@@ -1320,16 +1338,16 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_canonical_typec
     CORBA::SystemException
   ))
 {
-  
+
   CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
   CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "get_canonical_typecode",
@@ -1338,17 +1356,21 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_canonical_typec
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode ri (
         &_tao_call,
@@ -1357,31 +1379,40 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_canonical_typec
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << tc)
@@ -1390,20 +1421,33 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_canonical_typec
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -1413,74 +1457,55 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_canonical_typec
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive (
@@ -1492,16 +1517,16 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_PrimitiveDef_ptr _tao_retval = CORBA_PrimitiveDef::_nil ();
   CORBA_PrimitiveDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "get_primitive",
@@ -1510,17 +1535,21 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Repository_get_primitive ri (
         &_tao_call,
@@ -1529,31 +1558,40 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << kind)
@@ -1562,20 +1600,33 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive (
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -1585,74 +1636,55 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_PrimitiveDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_PrimitiveDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_StringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_string (
@@ -1664,16 +1696,16 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_string (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_StringDef_ptr _tao_retval = CORBA_StringDef::_nil ();
   CORBA_StringDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_string",
@@ -1682,17 +1714,21 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_string (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Repository_create_string ri (
         &_tao_call,
@@ -1701,31 +1737,40 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_string (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << bound)
@@ -1734,20 +1779,33 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_string (
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -1757,74 +1815,55 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_string (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_StringDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_StringDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_WstringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_wstring (
@@ -1836,16 +1875,16 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_wstring (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_WstringDef_ptr _tao_retval = CORBA_WstringDef::_nil ();
   CORBA_WstringDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_wstring",
@@ -1854,17 +1893,21 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_wstring (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Repository_create_wstring ri (
         &_tao_call,
@@ -1873,31 +1916,40 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_wstring (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << bound)
@@ -1906,20 +1958,33 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_wstring (
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -1929,74 +1994,55 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_wstring (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_WstringDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_WstringDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_SequenceDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_sequence (
@@ -2009,16 +2055,16 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_sequence (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_SequenceDef_ptr _tao_retval = CORBA_SequenceDef::_nil ();
   CORBA_SequenceDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_sequence",
@@ -2027,17 +2073,21 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_sequence (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Repository_create_sequence ri (
         &_tao_call,
@@ -2047,31 +2097,40 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_sequence (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << bound) &&
@@ -2081,20 +2140,33 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_sequence (
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -2104,74 +2176,55 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_sequence (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_SequenceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_SequenceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_ArrayDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_array (
@@ -2184,16 +2237,16 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_array (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_ArrayDef_ptr _tao_retval = CORBA_ArrayDef::_nil ();
   CORBA_ArrayDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_array",
@@ -2202,17 +2255,21 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_array (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Repository_create_array ri (
         &_tao_call,
@@ -2222,31 +2279,40 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_array (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << length) &&
@@ -2256,20 +2322,33 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_array (
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -2279,74 +2358,55 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_array (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_ArrayDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_ArrayDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_FixedDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_fixed (
@@ -2359,16 +2419,16 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_fixed (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_FixedDef_ptr _tao_retval = tao_CORBA_FixedDef_nil ();
   CORBA_FixedDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_fixed",
@@ -2377,17 +2437,21 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_fixed (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Repository_create_fixed ri (
         &_tao_call,
@@ -2397,31 +2461,40 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_fixed (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << digits) &&
@@ -2431,20 +2504,33 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_fixed (
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -2454,79 +2540,60 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_fixed (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_FixedDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_FixedDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -2596,13 +2663,13 @@ CORBA_Repository::CORBA_Repository_setup_collocation (int collocated)
   else
     this->the_TAO_CORBA_Repository_Proxy_Broker_ =
       ::_TAO_CORBA_Repository_Remote_Proxy_Broker::the_TAO_CORBA_Repository_Remote_Proxy_Broker ();
-  
+
   this->CORBA_Container_setup_collocation (collocated);
 }
 
-void CORBA_Repository::_tao_any_destructor (void *x)
+void CORBA_Repository::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_Repository *tmp = ACE_static_cast (CORBA_Repository*,x);
+  CORBA_Repository *tmp = ACE_static_cast (CORBA_Repository*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -2649,14 +2716,14 @@ CORBA_Repository_ptr CORBA_Repository::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           CORBA_Repository::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::CORBA_Repository (stub, 0, obj->_servant ()), CORBA_Repository::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -2726,7 +2793,7 @@ void *CORBA_Repository::_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;
@@ -2745,10 +2812,10 @@ CORBA_Contained_ptr CORBA_Repository::lookup_id (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_Repository_Proxy_Impl &proxy = 
+  _TAO_CORBA_Repository_Proxy_Impl &proxy =
     this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.lookup_id (
       this,
       search_id,
@@ -2764,10 +2831,10 @@ CORBA::TypeCode_ptr CORBA_Repository::get_canonical_typecode (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_Repository_Proxy_Impl &proxy = 
+  _TAO_CORBA_Repository_Proxy_Impl &proxy =
     this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.get_canonical_typecode (
       this,
       tc,
@@ -2783,10 +2850,10 @@ CORBA_PrimitiveDef_ptr CORBA_Repository::get_primitive (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_Repository_Proxy_Impl &proxy = 
+  _TAO_CORBA_Repository_Proxy_Impl &proxy =
     this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.get_primitive (
       this,
       kind,
@@ -2802,10 +2869,10 @@ CORBA_StringDef_ptr CORBA_Repository::create_string (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_Repository_Proxy_Impl &proxy = 
+  _TAO_CORBA_Repository_Proxy_Impl &proxy =
     this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_string (
       this,
       bound,
@@ -2821,10 +2888,10 @@ CORBA_WstringDef_ptr CORBA_Repository::create_wstring (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_Repository_Proxy_Impl &proxy = 
+  _TAO_CORBA_Repository_Proxy_Impl &proxy =
     this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_wstring (
       this,
       bound,
@@ -2841,10 +2908,10 @@ CORBA_SequenceDef_ptr CORBA_Repository::create_sequence (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_Repository_Proxy_Impl &proxy = 
+  _TAO_CORBA_Repository_Proxy_Impl &proxy =
     this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_sequence (
       this,
       bound,
@@ -2862,10 +2929,10 @@ CORBA_ArrayDef_ptr CORBA_Repository::create_array (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_Repository_Proxy_Impl &proxy = 
+  _TAO_CORBA_Repository_Proxy_Impl &proxy =
     this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_array (
       this,
       length,
@@ -2883,10 +2950,10 @@ CORBA_FixedDef_ptr CORBA_Repository::create_fixed (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_Repository_Proxy_Impl &proxy = 
+  _TAO_CORBA_Repository_Proxy_Impl &proxy =
     this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_fixed (
       this,
       digits,
@@ -2986,7 +3053,7 @@ CORBA_ModuleDef_var::operator const ::CORBA_ModuleDef_ptr &() const // cast
   return this->ptr_;
 }
 
-CORBA_ModuleDef_var::operator ::CORBA_ModuleDef_ptr &() // cast 
+CORBA_ModuleDef_var::operator ::CORBA_ModuleDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -3062,7 +3129,7 @@ CORBA_ModuleDef_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class CORBA_ModuleDef_out
+// Operations for class CORBA_ModuleDef_out
 // *************************************************************
 
 CORBA_ModuleDef_out::CORBA_ModuleDef_out (CORBA_ModuleDef_ptr &p)
@@ -3125,7 +3192,7 @@ CORBA_ModuleDef_out::operator-> (void)
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 _TAO_CORBA_ModuleDef_Proxy_Impl::_TAO_CORBA_ModuleDef_Proxy_Impl (void)
@@ -3138,7 +3205,7 @@ _TAO_CORBA_ModuleDef_Remote_Proxy_Impl::_TAO_CORBA_ModuleDef_Remote_Proxy_Impl (
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -3208,15 +3275,15 @@ CORBA_ModuleDef::CORBA_ModuleDef_setup_collocation (int collocated)
   else
     this->the_TAO_CORBA_ModuleDef_Proxy_Broker_ =
       ::_TAO_CORBA_ModuleDef_Remote_Proxy_Broker::the_TAO_CORBA_ModuleDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_Container_setup_collocation (collocated);
-  
+
   this->CORBA_Contained_setup_collocation (collocated);
 }
 
-void CORBA_ModuleDef::_tao_any_destructor (void *x)
+void CORBA_ModuleDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_ModuleDef *tmp = ACE_static_cast (CORBA_ModuleDef*,x);
+  CORBA_ModuleDef *tmp = ACE_static_cast (CORBA_ModuleDef*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -3263,14 +3330,14 @@ CORBA_ModuleDef_ptr CORBA_ModuleDef::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           CORBA_ModuleDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::CORBA_ModuleDef (stub, 0, obj->_servant ()), CORBA_ModuleDef::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -3353,7 +3420,7 @@ void *CORBA_ModuleDef::_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;
@@ -3364,9 +3431,9 @@ const char* CORBA_ModuleDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/ModuleDef:1.0";
 }
 
-void CORBA_ModuleDescription::_tao_any_destructor (void *x)
+void CORBA_ModuleDescription::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_ModuleDescription *tmp = ACE_static_cast (CORBA_ModuleDescription*,x);
+  CORBA_ModuleDescription *tmp = ACE_static_cast (CORBA_ModuleDescription*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -3461,7 +3528,7 @@ CORBA_ConstantDef_var::operator const ::CORBA_ConstantDef_ptr &() const // cast
   return this->ptr_;
 }
 
-CORBA_ConstantDef_var::operator ::CORBA_ConstantDef_ptr &() // cast 
+CORBA_ConstantDef_var::operator ::CORBA_ConstantDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -3537,7 +3604,7 @@ CORBA_ConstantDef_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class CORBA_ConstantDef_out
+// Operations for class CORBA_ConstantDef_out
 // *************************************************************
 
 CORBA_ConstantDef_out::CORBA_ConstantDef_out (CORBA_ConstantDef_ptr &p)
@@ -3603,24 +3670,24 @@ public:
   TAO_ClientRequestInfo_CORBA_ConstantDef_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -3637,7 +3704,7 @@ private:
 TAO_ClientRequestInfo_CORBA_ConstantDef_type_get::TAO_ClientRequestInfo_CORBA_ConstantDef_type_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -3650,7 +3717,7 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_get::arguments (CORBA::Environment
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -3662,12 +3729,12 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_get::exceptions (CORBA::Environment
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ConstantDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -3676,17 +3743,17 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_get::result (CORBA::Environment &AC
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ConstantDef_type_get::result (CORBA::TypeCode_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -3696,24 +3763,24 @@ public:
   TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -3730,7 +3797,7 @@ private:
 TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -3743,7 +3810,7 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::arguments (CORBA::Environm
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -3755,12 +3822,12 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::exceptions (CORBA::Environ
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -3769,17 +3836,17 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::result (CORBA::Environment
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::result (CORBA_IDLType_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -3790,24 +3857,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -3817,14 +3884,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set &);
 
   CORBA_IDLType_ptr type_def_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     CORBA_IDLType_ptr type_def,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     type_def_ (type_def)
@@ -3838,15 +3905,16 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::arguments (CORBA::Environm
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_type_def = parameter_list->length ();
-  parameter_list->length (length_type_def + 1);
-  (*parameter_list)[length_type_def].argument <<=  this->type_def_;
-  
-  (*parameter_list)[length_type_def].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<=  this->type_def_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -3858,12 +3926,12 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::exceptions (CORBA::Environ
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -3872,7 +3940,7 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::result (CORBA::Environment
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -3882,24 +3950,24 @@ public:
   TAO_ClientRequestInfo_CORBA_ConstantDef_value_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -3916,7 +3984,7 @@ private:
 TAO_ClientRequestInfo_CORBA_ConstantDef_value_get::TAO_ClientRequestInfo_CORBA_ConstantDef_value_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -3929,7 +3997,7 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_value_get::arguments (CORBA::Environment
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -3941,12 +4009,12 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_value_get::exceptions (CORBA::Environmen
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ConstantDef_value_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -3955,17 +4023,17 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_value_get::result (CORBA::Environment &A
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ConstantDef_value_get::result (CORBA::Any * result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -3976,24 +4044,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -4003,14 +4071,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_ConstantDef_value_set &);
 
   const CORBA::Any & value_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::TAO_ClientRequestInfo_CORBA_ConstantDef_value_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA::Any & value,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     value_ (value)
@@ -4024,14 +4092,16 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::arguments (CORBA::Environment
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_value = parameter_list->length ();
-  parameter_list->length (length_value + 1);
-  (*parameter_list)[length_value].argument <<= value_;
-  (*parameter_list)[length_value].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= value_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -4043,12 +4113,12 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::exceptions (CORBA::Environmen
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -4057,14 +4127,14 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::result (CORBA::Environment &A
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 _TAO_CORBA_ConstantDef_Proxy_Impl::_TAO_CORBA_ConstantDef_Proxy_Impl (void)
@@ -4083,16 +4153,16 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
   CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_type",
@@ -4101,17 +4171,21 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ConstantDef_type_get ri (
         &_tao_call,
@@ -4119,43 +4193,66 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -4165,74 +4262,55 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
@@ -4243,16 +4321,16 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_IDLType_ptr _tao_retval = CORBA_IDLType::_nil ();
   CORBA_IDLType_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_type_def",
@@ -4261,17 +4339,21 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get ri (
         &_tao_call,
@@ -4279,43 +4361,66 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -4325,74 +4430,55 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
@@ -4404,15 +4490,15 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_type_def",
@@ -4421,17 +4507,21 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set ri (
         &_tao_call,
@@ -4440,31 +4530,40 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << type_def)
@@ -4472,79 +4571,76 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 CORBA::Any * _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
@@ -4555,15 +4651,15 @@ CORBA::Any * _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA::Any *_tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_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 (
@@ -4574,17 +4670,21 @@ CORBA::Any * _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ConstantDef_value_get ri (
         &_tao_call,
@@ -4592,43 +4692,66 @@ CORBA::Any * _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -4638,74 +4761,55 @@ CORBA::Any * _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA::Any * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA::Any * _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
@@ -4717,15 +4821,15 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_value",
@@ -4734,17 +4838,21 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ConstantDef_value_set ri (
         &_tao_call,
@@ -4753,31 +4861,40 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << value)
@@ -4785,84 +4902,81 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -4932,13 +5046,13 @@ CORBA_ConstantDef::CORBA_ConstantDef_setup_collocation (int collocated)
   else
     this->the_TAO_CORBA_ConstantDef_Proxy_Broker_ =
       ::_TAO_CORBA_ConstantDef_Remote_Proxy_Broker::the_TAO_CORBA_ConstantDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_Contained_setup_collocation (collocated);
 }
 
-void CORBA_ConstantDef::_tao_any_destructor (void *x)
+void CORBA_ConstantDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_ConstantDef *tmp = ACE_static_cast (CORBA_ConstantDef*,x);
+  CORBA_ConstantDef *tmp = ACE_static_cast (CORBA_ConstantDef*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -4985,14 +5099,14 @@ CORBA_ConstantDef_ptr CORBA_ConstantDef::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           CORBA_ConstantDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::CORBA_ConstantDef (stub, 0, obj->_servant ()), CORBA_ConstantDef::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -5062,7 +5176,7 @@ void *CORBA_ConstantDef::_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;
@@ -5080,10 +5194,10 @@ CORBA::TypeCode_ptr CORBA_ConstantDef::type (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ConstantDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ConstantDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.type (
       this,
       ACE_TRY_ENV
@@ -5097,10 +5211,10 @@ CORBA_IDLType_ptr CORBA_ConstantDef::type_def (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ConstantDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ConstantDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.type_def (
       this,
       ACE_TRY_ENV
@@ -5115,10 +5229,10 @@ void CORBA_ConstantDef::type_def (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ConstantDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ConstantDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.type_def (
       this,
       type_def,
@@ -5133,10 +5247,10 @@ CORBA::Any * CORBA_ConstantDef::value (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ConstantDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ConstantDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.value (
       this,
       ACE_TRY_ENV
@@ -5151,10 +5265,10 @@ void CORBA_ConstantDef::value (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ConstantDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ConstantDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.value (
       this,
       value,
@@ -5162,9 +5276,9 @@ void CORBA_ConstantDef::value (
     );
 }
 
-void CORBA_ConstantDescription::_tao_any_destructor (void *x)
+void CORBA_ConstantDescription::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_ConstantDescription *tmp = ACE_static_cast (CORBA_ConstantDescription*,x);
+  CORBA_ConstantDescription *tmp = ACE_static_cast (CORBA_ConstantDescription*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -5259,7 +5373,7 @@ CORBA_StructDef_var::operator const ::CORBA_StructDef_ptr &() const // cast
   return this->ptr_;
 }
 
-CORBA_StructDef_var::operator ::CORBA_StructDef_ptr &() // cast 
+CORBA_StructDef_var::operator ::CORBA_StructDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -5335,7 +5449,7 @@ CORBA_StructDef_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class CORBA_StructDef_out
+// Operations for class CORBA_StructDef_out
 // *************************************************************
 
 CORBA_StructDef_out::CORBA_StructDef_out (CORBA_StructDef_ptr &p)
@@ -5401,24 +5515,24 @@ public:
   TAO_ClientRequestInfo_CORBA_StructDef_members_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -5435,7 +5549,7 @@ private:
 TAO_ClientRequestInfo_CORBA_StructDef_members_get::TAO_ClientRequestInfo_CORBA_StructDef_members_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -5448,7 +5562,7 @@ TAO_ClientRequestInfo_CORBA_StructDef_members_get::arguments (CORBA::Environment
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -5460,12 +5574,12 @@ TAO_ClientRequestInfo_CORBA_StructDef_members_get::exceptions (CORBA::Environmen
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_StructDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -5474,17 +5588,17 @@ TAO_ClientRequestInfo_CORBA_StructDef_members_get::result (CORBA::Environment &A
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_StructDef_members_get::result (CORBA_StructMemberSeq * result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -5495,24 +5609,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -5522,14 +5636,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_StructDef_members_set &);
 
   const CORBA_StructMemberSeq & members_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_StructDef_members_set::TAO_ClientRequestInfo_CORBA_StructDef_members_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA_StructMemberSeq & members,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     members_ (members)
@@ -5543,15 +5657,16 @@ TAO_ClientRequestInfo_CORBA_StructDef_members_set::arguments (CORBA::Environment
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_members = parameter_list->length ();
-  parameter_list->length (length_members + 1);
-  (*parameter_list)[length_members].argument <<=  this->members_;
-  
-  (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<=  this->members_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -5563,12 +5678,12 @@ TAO_ClientRequestInfo_CORBA_StructDef_members_set::exceptions (CORBA::Environmen
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_StructDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -5577,14 +5692,14 @@ TAO_ClientRequestInfo_CORBA_StructDef_members_set::result (CORBA::Environment &A
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 _TAO_CORBA_StructDef_Proxy_Impl::_TAO_CORBA_StructDef_Proxy_Impl (void)
@@ -5603,15 +5718,15 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_StructMemberSeq *_tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   ACE_NEW_RETURN (_tao_retval, CORBA_StructMemberSeq, _tao_retval);
   CORBA_StructMemberSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -5622,17 +5737,21 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_StructDef_members_get ri (
         &_tao_call,
@@ -5640,43 +5759,66 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -5686,74 +5828,55 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_StructMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_StructMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 void _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
@@ -5765,15 +5888,15 @@ void _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_members",
@@ -5782,17 +5905,21 @@ void _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_StructDef_members_set ri (
         &_tao_call,
@@ -5801,31 +5928,40 @@ void _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << members)
@@ -5833,84 +5969,81 @@ void _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -5980,15 +6113,15 @@ CORBA_StructDef::CORBA_StructDef_setup_collocation (int collocated)
   else
     this->the_TAO_CORBA_StructDef_Proxy_Broker_ =
       ::_TAO_CORBA_StructDef_Remote_Proxy_Broker::the_TAO_CORBA_StructDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_TypedefDef_setup_collocation (collocated);
-  
+
   this->CORBA_Container_setup_collocation (collocated);
 }
 
-void CORBA_StructDef::_tao_any_destructor (void *x)
+void CORBA_StructDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_StructDef *tmp = ACE_static_cast (CORBA_StructDef*,x);
+  CORBA_StructDef *tmp = ACE_static_cast (CORBA_StructDef*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -6035,14 +6168,14 @@ CORBA_StructDef_ptr CORBA_StructDef::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           CORBA_StructDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::CORBA_StructDef (stub, 0, obj->_servant ()), CORBA_StructDef::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -6151,7 +6284,7 @@ void *CORBA_StructDef::_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;
@@ -6169,10 +6302,10 @@ CORBA_StructMemberSeq * CORBA_StructDef::members (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_StructDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_StructDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_StructDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.members (
       this,
       ACE_TRY_ENV
@@ -6187,10 +6320,10 @@ void CORBA_StructDef::members (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_StructDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_StructDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_StructDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.members (
       this,
       members,
@@ -6289,7 +6422,7 @@ CORBA_UnionDef_var::operator const ::CORBA_UnionDef_ptr &() const // cast
   return this->ptr_;
 }
 
-CORBA_UnionDef_var::operator ::CORBA_UnionDef_ptr &() // cast 
+CORBA_UnionDef_var::operator ::CORBA_UnionDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -6365,7 +6498,7 @@ CORBA_UnionDef_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class CORBA_UnionDef_out
+// Operations for class CORBA_UnionDef_out
 // *************************************************************
 
 CORBA_UnionDef_out::CORBA_UnionDef_out (CORBA_UnionDef_ptr &p)
@@ -6431,24 +6564,24 @@ public:
   TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -6465,7 +6598,7 @@ private:
 TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get::TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -6478,7 +6611,7 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get::arguments (CORBA::E
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -6490,12 +6623,12 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get::exceptions (CORBA::
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -6504,17 +6637,17 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get::result (CORBA::Envi
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get::result (CORBA::TypeCode_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -6524,24 +6657,24 @@ public:
   TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -6558,7 +6691,7 @@ private:
 TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -6571,7 +6704,7 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::arguments (CORB
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -6583,12 +6716,12 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::exceptions (COR
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -6597,17 +6730,17 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (CORBA::
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (CORBA_IDLType_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -6618,24 +6751,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA_IDLType_ptr discriminator_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -6645,14 +6778,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set &);
 
   CORBA_IDLType_ptr discriminator_type_def_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     CORBA_IDLType_ptr discriminator_type_def,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     discriminator_type_def_ (discriminator_type_def)
@@ -6666,15 +6799,16 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::arguments (CORB
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_discriminator_type_def = parameter_list->length ();
-  parameter_list->length (length_discriminator_type_def + 1);
-  (*parameter_list)[length_discriminator_type_def].argument <<=  this->discriminator_type_def_;
-  
-  (*parameter_list)[length_discriminator_type_def].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<=  this->discriminator_type_def_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -6686,12 +6820,12 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::exceptions (COR
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -6700,7 +6834,7 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::result (CORBA::
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -6710,24 +6844,24 @@ public:
   TAO_ClientRequestInfo_CORBA_UnionDef_members_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -6744,7 +6878,7 @@ private:
 TAO_ClientRequestInfo_CORBA_UnionDef_members_get::TAO_ClientRequestInfo_CORBA_UnionDef_members_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -6757,7 +6891,7 @@ TAO_ClientRequestInfo_CORBA_UnionDef_members_get::arguments (CORBA::Environment
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -6769,12 +6903,12 @@ TAO_ClientRequestInfo_CORBA_UnionDef_members_get::exceptions (CORBA::Environment
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_UnionDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -6783,17 +6917,17 @@ TAO_ClientRequestInfo_CORBA_UnionDef_members_get::result (CORBA::Environment &AC
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_UnionDef_members_get::result (CORBA_UnionMemberSeq * result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -6804,24 +6938,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -6831,14 +6965,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_UnionDef_members_set &);
 
   const CORBA_UnionMemberSeq & members_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_UnionDef_members_set::TAO_ClientRequestInfo_CORBA_UnionDef_members_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     members_ (members)
@@ -6852,15 +6986,16 @@ TAO_ClientRequestInfo_CORBA_UnionDef_members_set::arguments (CORBA::Environment
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_members = parameter_list->length ();
-  parameter_list->length (length_members + 1);
-  (*parameter_list)[length_members].argument <<=  this->members_;
-  
-  (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<=  this->members_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -6872,12 +7007,12 @@ TAO_ClientRequestInfo_CORBA_UnionDef_members_set::exceptions (CORBA::Environment
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_UnionDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -6886,14 +7021,14 @@ TAO_ClientRequestInfo_CORBA_UnionDef_members_set::result (CORBA::Environment &AC
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 _TAO_CORBA_UnionDef_Proxy_Impl::_TAO_CORBA_UnionDef_Proxy_Impl (void)
@@ -6912,16 +7047,16 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
   CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_discriminator_type",
@@ -6930,17 +7065,21 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get ri (
         &_tao_call,
@@ -6948,43 +7087,66 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -6994,74 +7156,55 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
@@ -7072,16 +7215,16 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_IDLType_ptr _tao_retval = CORBA_IDLType::_nil ();
   CORBA_IDLType_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_discriminator_type_def",
@@ -7090,17 +7233,21 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get ri (
         &_tao_call,
@@ -7108,43 +7255,66 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -7154,74 +7324,55 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
@@ -7233,15 +7384,15 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_discriminator_type_def",
@@ -7250,17 +7401,21 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set ri (
         &_tao_call,
@@ -7269,31 +7424,40 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << discriminator_type_def)
@@ -7301,79 +7465,76 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
@@ -7384,15 +7545,15 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_UnionMemberSeq *_tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   ACE_NEW_RETURN (_tao_retval, CORBA_UnionMemberSeq, _tao_retval);
   CORBA_UnionMemberSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -7403,17 +7564,21 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_UnionDef_members_get ri (
         &_tao_call,
@@ -7421,43 +7586,66 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -7467,74 +7655,55 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_UnionMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_UnionMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
@@ -7546,15 +7715,15 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_members",
@@ -7563,17 +7732,21 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_UnionDef_members_set ri (
         &_tao_call,
@@ -7582,31 +7755,40 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << members)
@@ -7614,84 +7796,81 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -7761,15 +7940,15 @@ CORBA_UnionDef::CORBA_UnionDef_setup_collocation (int collocated)
   else
     this->the_TAO_CORBA_UnionDef_Proxy_Broker_ =
       ::_TAO_CORBA_UnionDef_Remote_Proxy_Broker::the_TAO_CORBA_UnionDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_TypedefDef_setup_collocation (collocated);
-  
+
   this->CORBA_Container_setup_collocation (collocated);
 }
 
-void CORBA_UnionDef::_tao_any_destructor (void *x)
+void CORBA_UnionDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_UnionDef *tmp = ACE_static_cast (CORBA_UnionDef*,x);
+  CORBA_UnionDef *tmp = ACE_static_cast (CORBA_UnionDef*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -7816,14 +7995,14 @@ CORBA_UnionDef_ptr CORBA_UnionDef::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           CORBA_UnionDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::CORBA_UnionDef (stub, 0, obj->_servant ()), CORBA_UnionDef::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -7932,7 +8111,7 @@ void *CORBA_UnionDef::_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;
@@ -7950,10 +8129,10 @@ CORBA::TypeCode_ptr CORBA_UnionDef::discriminator_type (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_UnionDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_UnionDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.discriminator_type (
       this,
       ACE_TRY_ENV
@@ -7967,10 +8146,10 @@ CORBA_IDLType_ptr CORBA_UnionDef::discriminator_type_def (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_UnionDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_UnionDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.discriminator_type_def (
       this,
       ACE_TRY_ENV
@@ -7985,10 +8164,10 @@ void CORBA_UnionDef::discriminator_type_def (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_UnionDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_UnionDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.discriminator_type_def (
       this,
       discriminator_type_def,
@@ -8003,10 +8182,10 @@ CORBA_UnionMemberSeq * CORBA_UnionDef::members (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_UnionDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_UnionDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.members (
       this,
       ACE_TRY_ENV
@@ -8021,10 +8200,10 @@ void CORBA_UnionDef::members (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_UnionDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_UnionDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.members (
       this,
       members,
@@ -8123,7 +8302,7 @@ CORBA_EnumDef_var::operator const ::CORBA_EnumDef_ptr &() const // cast
   return this->ptr_;
 }
 
-CORBA_EnumDef_var::operator ::CORBA_EnumDef_ptr &() // cast 
+CORBA_EnumDef_var::operator ::CORBA_EnumDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -8199,7 +8378,7 @@ CORBA_EnumDef_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class CORBA_EnumDef_out
+// Operations for class CORBA_EnumDef_out
 // *************************************************************
 
 CORBA_EnumDef_out::CORBA_EnumDef_out (CORBA_EnumDef_ptr &p)
@@ -8265,24 +8444,24 @@ public:
   TAO_ClientRequestInfo_CORBA_EnumDef_members_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -8299,7 +8478,7 @@ private:
 TAO_ClientRequestInfo_CORBA_EnumDef_members_get::TAO_ClientRequestInfo_CORBA_EnumDef_members_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -8312,7 +8491,7 @@ TAO_ClientRequestInfo_CORBA_EnumDef_members_get::arguments (CORBA::Environment &
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -8324,12 +8503,12 @@ TAO_ClientRequestInfo_CORBA_EnumDef_members_get::exceptions (CORBA::Environment
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_EnumDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -8338,17 +8517,17 @@ TAO_ClientRequestInfo_CORBA_EnumDef_members_get::result (CORBA::Environment &ACE
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_EnumDef_members_get::result (CORBA_EnumMemberSeq * result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -8359,24 +8538,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -8386,14 +8565,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_EnumDef_members_set &);
 
   const CORBA_EnumMemberSeq & members_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_EnumDef_members_set::TAO_ClientRequestInfo_CORBA_EnumDef_members_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     members_ (members)
@@ -8407,15 +8586,16 @@ TAO_ClientRequestInfo_CORBA_EnumDef_members_set::arguments (CORBA::Environment &
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_members = parameter_list->length ();
-  parameter_list->length (length_members + 1);
-  (*parameter_list)[length_members].argument <<=  this->members_;
-  
-  (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<=  this->members_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -8427,12 +8607,12 @@ TAO_ClientRequestInfo_CORBA_EnumDef_members_set::exceptions (CORBA::Environment
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_EnumDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -8441,14 +8621,14 @@ TAO_ClientRequestInfo_CORBA_EnumDef_members_set::result (CORBA::Environment &ACE
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 _TAO_CORBA_EnumDef_Proxy_Impl::_TAO_CORBA_EnumDef_Proxy_Impl (void)
@@ -8467,15 +8647,15 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_EnumMemberSeq *_tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   ACE_NEW_RETURN (_tao_retval, CORBA_EnumMemberSeq, _tao_retval);
   CORBA_EnumMemberSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -8486,17 +8666,21 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_EnumDef_members_get ri (
         &_tao_call,
@@ -8504,43 +8688,66 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -8550,74 +8757,55 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_EnumMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_EnumMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 void _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
@@ -8629,15 +8817,15 @@ void _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_members",
@@ -8646,17 +8834,21 @@ void _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_EnumDef_members_set ri (
         &_tao_call,
@@ -8665,31 +8857,40 @@ void _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << members)
@@ -8697,84 +8898,81 @@ void _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -8844,13 +9042,13 @@ CORBA_EnumDef::CORBA_EnumDef_setup_collocation (int collocated)
   else
     this->the_TAO_CORBA_EnumDef_Proxy_Broker_ =
       ::_TAO_CORBA_EnumDef_Remote_Proxy_Broker::the_TAO_CORBA_EnumDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_TypedefDef_setup_collocation (collocated);
 }
 
-void CORBA_EnumDef::_tao_any_destructor (void *x)
+void CORBA_EnumDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_EnumDef *tmp = ACE_static_cast (CORBA_EnumDef*,x);
+  CORBA_EnumDef *tmp = ACE_static_cast (CORBA_EnumDef*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -8897,14 +9095,14 @@ CORBA_EnumDef_ptr CORBA_EnumDef::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           CORBA_EnumDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::CORBA_EnumDef (stub, 0, obj->_servant ()), CORBA_EnumDef::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -9000,7 +9198,7 @@ void *CORBA_EnumDef::_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;
@@ -9018,10 +9216,10 @@ CORBA_EnumMemberSeq * CORBA_EnumDef::members (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_EnumDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_EnumDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_EnumDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.members (
       this,
       ACE_TRY_ENV
@@ -9036,10 +9234,10 @@ void CORBA_EnumDef::members (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_EnumDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_EnumDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_EnumDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.members (
       this,
       members,
@@ -9138,7 +9336,7 @@ CORBA_AliasDef_var::operator const ::CORBA_AliasDef_ptr &() const // cast
   return this->ptr_;
 }
 
-CORBA_AliasDef_var::operator ::CORBA_AliasDef_ptr &() // cast 
+CORBA_AliasDef_var::operator ::CORBA_AliasDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -9214,7 +9412,7 @@ CORBA_AliasDef_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class CORBA_AliasDef_out
+// Operations for class CORBA_AliasDef_out
 // *************************************************************
 
 CORBA_AliasDef_out::CORBA_AliasDef_out (CORBA_AliasDef_ptr &p)
@@ -9280,24 +9478,24 @@ public:
   TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -9314,7 +9512,7 @@ private:
 TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -9327,7 +9525,7 @@ TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::arguments (CORBA::En
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -9339,12 +9537,12 @@ TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::exceptions (CORBA::E
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -9353,17 +9551,17 @@ TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::result (CORBA::Envir
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::result (CORBA_IDLType_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -9374,24 +9572,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -9401,14 +9599,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set &);
 
   CORBA_IDLType_ptr original_type_def_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     original_type_def_ (original_type_def)
@@ -9422,15 +9620,16 @@ TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::arguments (CORBA::En
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_original_type_def = parameter_list->length ();
-  parameter_list->length (length_original_type_def + 1);
-  (*parameter_list)[length_original_type_def].argument <<=  this->original_type_def_;
-  
-  (*parameter_list)[length_original_type_def].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<=  this->original_type_def_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -9442,12 +9641,12 @@ TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::exceptions (CORBA::E
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -9456,14 +9655,14 @@ TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::result (CORBA::Envir
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 _TAO_CORBA_AliasDef_Proxy_Impl::_TAO_CORBA_AliasDef_Proxy_Impl (void)
@@ -9482,16 +9681,16 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_IDLType_ptr _tao_retval = CORBA_IDLType::_nil ();
   CORBA_IDLType_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_original_type_def",
@@ -9500,17 +9699,21 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get ri (
         &_tao_call,
@@ -9518,43 +9721,66 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -9564,74 +9790,55 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 void _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
@@ -9643,15 +9850,15 @@ void _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_original_type_def",
@@ -9660,17 +9867,21 @@ void _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set ri (
         &_tao_call,
@@ -9679,31 +9890,40 @@ void _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << original_type_def)
@@ -9711,84 +9931,81 @@ void _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -9858,13 +10075,13 @@ CORBA_AliasDef::CORBA_AliasDef_setup_collocation (int collocated)
   else
     this->the_TAO_CORBA_AliasDef_Proxy_Broker_ =
       ::_TAO_CORBA_AliasDef_Remote_Proxy_Broker::the_TAO_CORBA_AliasDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_TypedefDef_setup_collocation (collocated);
 }
 
-void CORBA_AliasDef::_tao_any_destructor (void *x)
+void CORBA_AliasDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_AliasDef *tmp = ACE_static_cast (CORBA_AliasDef*,x);
+  CORBA_AliasDef *tmp = ACE_static_cast (CORBA_AliasDef*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -9911,14 +10128,14 @@ CORBA_AliasDef_ptr CORBA_AliasDef::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           CORBA_AliasDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::CORBA_AliasDef (stub, 0, obj->_servant ()), CORBA_AliasDef::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -10014,7 +10231,7 @@ void *CORBA_AliasDef::_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;
@@ -10032,10 +10249,10 @@ CORBA_IDLType_ptr CORBA_AliasDef::original_type_def (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_AliasDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_AliasDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_AliasDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.original_type_def (
       this,
       ACE_TRY_ENV
@@ -10050,10 +10267,10 @@ void CORBA_AliasDef::original_type_def (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_AliasDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_AliasDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_AliasDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.original_type_def (
       this,
       original_type_def,
@@ -10152,7 +10369,7 @@ CORBA_NativeDef_var::operator const ::CORBA_NativeDef_ptr &() const // cast
   return this->ptr_;
 }
 
-CORBA_NativeDef_var::operator ::CORBA_NativeDef_ptr &() // cast 
+CORBA_NativeDef_var::operator ::CORBA_NativeDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -10228,7 +10445,7 @@ CORBA_NativeDef_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class CORBA_NativeDef_out
+// Operations for class CORBA_NativeDef_out
 // *************************************************************
 
 CORBA_NativeDef_out::CORBA_NativeDef_out (CORBA_NativeDef_ptr &p)
@@ -10291,7 +10508,7 @@ CORBA_NativeDef_out::operator-> (void)
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 _TAO_CORBA_NativeDef_Proxy_Impl::_TAO_CORBA_NativeDef_Proxy_Impl (void)
@@ -10304,7 +10521,7 @@ _TAO_CORBA_NativeDef_Remote_Proxy_Impl::_TAO_CORBA_NativeDef_Remote_Proxy_Impl (
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -10374,13 +10591,13 @@ CORBA_NativeDef::CORBA_NativeDef_setup_collocation (int collocated)
   else
     this->the_TAO_CORBA_NativeDef_Proxy_Broker_ =
       ::_TAO_CORBA_NativeDef_Remote_Proxy_Broker::the_TAO_CORBA_NativeDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_TypedefDef_setup_collocation (collocated);
 }
 
-void CORBA_NativeDef::_tao_any_destructor (void *x)
+void CORBA_NativeDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_NativeDef *tmp = ACE_static_cast (CORBA_NativeDef*,x);
+  CORBA_NativeDef *tmp = ACE_static_cast (CORBA_NativeDef*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -10427,14 +10644,14 @@ CORBA_NativeDef_ptr CORBA_NativeDef::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           CORBA_NativeDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::CORBA_NativeDef (stub, 0, obj->_servant ()), CORBA_NativeDef::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -10530,7 +10747,7 @@ void *CORBA_NativeDef::_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;
@@ -10632,7 +10849,7 @@ CORBA_PrimitiveDef_var::operator const ::CORBA_PrimitiveDef_ptr &() const // cas
   return this->ptr_;
 }
 
-CORBA_PrimitiveDef_var::operator ::CORBA_PrimitiveDef_ptr &() // cast 
+CORBA_PrimitiveDef_var::operator ::CORBA_PrimitiveDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -10708,7 +10925,7 @@ CORBA_PrimitiveDef_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class CORBA_PrimitiveDef_out
+// Operations for class CORBA_PrimitiveDef_out
 // *************************************************************
 
 CORBA_PrimitiveDef_out::CORBA_PrimitiveDef_out (CORBA_PrimitiveDef_ptr &p)
@@ -10774,24 +10991,24 @@ public:
   TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -10808,7 +11025,7 @@ private:
 TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -10821,7 +11038,7 @@ TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::arguments (CORBA::Environment
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -10833,12 +11050,12 @@ TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::exceptions (CORBA::Environmen
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -10847,24 +11064,24 @@ TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::result (CORBA::Environment &A
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::result (CORBA::PrimitiveKind result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 _TAO_CORBA_PrimitiveDef_Proxy_Impl::_TAO_CORBA_PrimitiveDef_Proxy_Impl (void)
@@ -10883,15 +11100,15 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl::kind (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA::PrimitiveKind _tao_retval = (CORBA::PrimitiveKind)0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_kind",
@@ -10900,17 +11117,21 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl::kind (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get ri (
         &_tao_call,
@@ -10918,43 +11139,66 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl::kind (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN  (_tao_retval);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_retval)
@@ -10964,78 +11208,59 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl::kind (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA::PrimitiveKind  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA::PrimitiveKind _tao_retval_info = _tao_retval;
+          ri.result (_tao_retval_info);
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN  (_tao_retval);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_retval;
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN  (_tao_retval);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_retval;
 }
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -11105,13 +11330,13 @@ CORBA_PrimitiveDef::CORBA_PrimitiveDef_setup_collocation (int collocated)
   else
     this->the_TAO_CORBA_PrimitiveDef_Proxy_Broker_ =
       ::_TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker::the_TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_IDLType_setup_collocation (collocated);
 }
 
-void CORBA_PrimitiveDef::_tao_any_destructor (void *x)
+void CORBA_PrimitiveDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_PrimitiveDef *tmp = ACE_static_cast (CORBA_PrimitiveDef*,x);
+  CORBA_PrimitiveDef *tmp = ACE_static_cast (CORBA_PrimitiveDef*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -11158,14 +11383,14 @@ CORBA_PrimitiveDef_ptr CORBA_PrimitiveDef::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           CORBA_PrimitiveDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::CORBA_PrimitiveDef (stub, 0, obj->_servant ()), CORBA_PrimitiveDef::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -11235,7 +11460,7 @@ void *CORBA_PrimitiveDef::_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;
@@ -11253,10 +11478,10 @@ CORBA::PrimitiveKind CORBA_PrimitiveDef::kind (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_PrimitiveDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_PrimitiveDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_PrimitiveDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN ((CORBA::PrimitiveKind)0);
-  
+
   return proxy.kind (
       this,
       ACE_TRY_ENV
@@ -11354,7 +11579,7 @@ CORBA_StringDef_var::operator const ::CORBA_StringDef_ptr &() const // cast
   return this->ptr_;
 }
 
-CORBA_StringDef_var::operator ::CORBA_StringDef_ptr &() // cast 
+CORBA_StringDef_var::operator ::CORBA_StringDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -11430,7 +11655,7 @@ CORBA_StringDef_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class CORBA_StringDef_out
+// Operations for class CORBA_StringDef_out
 // *************************************************************
 
 CORBA_StringDef_out::CORBA_StringDef_out (CORBA_StringDef_ptr &p)
@@ -11496,24 +11721,24 @@ public:
   TAO_ClientRequestInfo_CORBA_StringDef_bound_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -11530,7 +11755,7 @@ private:
 TAO_ClientRequestInfo_CORBA_StringDef_bound_get::TAO_ClientRequestInfo_CORBA_StringDef_bound_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -11543,7 +11768,7 @@ TAO_ClientRequestInfo_CORBA_StringDef_bound_get::arguments (CORBA::Environment &
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -11555,12 +11780,12 @@ TAO_ClientRequestInfo_CORBA_StringDef_bound_get::exceptions (CORBA::Environment
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_StringDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -11569,17 +11794,17 @@ TAO_ClientRequestInfo_CORBA_StringDef_bound_get::result (CORBA::Environment &ACE
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_StringDef_bound_get::result (CORBA::ULong result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -11590,24 +11815,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::ULong & bound,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -11617,14 +11842,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_StringDef_bound_set &);
 
   const CORBA::ULong & bound_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_StringDef_bound_set::TAO_ClientRequestInfo_CORBA_StringDef_bound_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA::ULong & bound,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     bound_ (bound)
@@ -11638,14 +11863,16 @@ TAO_ClientRequestInfo_CORBA_StringDef_bound_set::arguments (CORBA::Environment &
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_bound = parameter_list->length ();
-  parameter_list->length (length_bound + 1);
-  (*parameter_list)[length_bound].argument <<= bound_;
-  (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= bound_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -11657,12 +11884,12 @@ TAO_ClientRequestInfo_CORBA_StringDef_bound_set::exceptions (CORBA::Environment
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_StringDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -11671,14 +11898,14 @@ TAO_ClientRequestInfo_CORBA_StringDef_bound_set::result (CORBA::Environment &ACE
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 _TAO_CORBA_StringDef_Proxy_Impl::_TAO_CORBA_StringDef_Proxy_Impl (void)
@@ -11697,15 +11924,15 @@ CORBA::ULong _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA::ULong _tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_bound",
@@ -11714,17 +11941,21 @@ CORBA::ULong _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_StringDef_bound_get ri (
         &_tao_call,
@@ -11732,43 +11963,66 @@ CORBA::ULong _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN  (_tao_retval);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_retval)
@@ -11778,73 +12032,54 @@ CORBA::ULong _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA::ULong  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA::ULong _tao_retval_info = _tao_retval;
+          ri.result (_tao_retval_info);
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN  (_tao_retval);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_retval;
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN  (_tao_retval);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_retval;
 }
 
 void _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
@@ -11856,15 +12091,15 @@ void _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_bound",
@@ -11873,17 +12108,21 @@ void _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_StringDef_bound_set ri (
         &_tao_call,
@@ -11892,31 +12131,40 @@ void _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << bound)
@@ -11924,84 +12172,81 @@ void _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -12071,13 +12316,13 @@ CORBA_StringDef::CORBA_StringDef_setup_collocation (int collocated)
   else
     this->the_TAO_CORBA_StringDef_Proxy_Broker_ =
       ::_TAO_CORBA_StringDef_Remote_Proxy_Broker::the_TAO_CORBA_StringDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_IDLType_setup_collocation (collocated);
 }
 
-void CORBA_StringDef::_tao_any_destructor (void *x)
+void CORBA_StringDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_StringDef *tmp = ACE_static_cast (CORBA_StringDef*,x);
+  CORBA_StringDef *tmp = ACE_static_cast (CORBA_StringDef*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -12124,14 +12369,14 @@ CORBA_StringDef_ptr CORBA_StringDef::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           CORBA_StringDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::CORBA_StringDef (stub, 0, obj->_servant ()), CORBA_StringDef::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -12201,7 +12446,7 @@ void *CORBA_StringDef::_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;
@@ -12219,10 +12464,10 @@ CORBA::ULong CORBA_StringDef::bound (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_StringDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_StringDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_StringDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.bound (
       this,
       ACE_TRY_ENV
@@ -12237,10 +12482,10 @@ void CORBA_StringDef::bound (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_StringDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_StringDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_StringDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.bound (
       this,
       bound,
@@ -12339,7 +12584,7 @@ CORBA_WstringDef_var::operator const ::CORBA_WstringDef_ptr &() const // cast
   return this->ptr_;
 }
 
-CORBA_WstringDef_var::operator ::CORBA_WstringDef_ptr &() // cast 
+CORBA_WstringDef_var::operator ::CORBA_WstringDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -12415,7 +12660,7 @@ CORBA_WstringDef_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class CORBA_WstringDef_out
+// Operations for class CORBA_WstringDef_out
 // *************************************************************
 
 CORBA_WstringDef_out::CORBA_WstringDef_out (CORBA_WstringDef_ptr &p)
@@ -12481,24 +12726,24 @@ public:
   TAO_ClientRequestInfo_CORBA_WstringDef_bound_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -12515,7 +12760,7 @@ private:
 TAO_ClientRequestInfo_CORBA_WstringDef_bound_get::TAO_ClientRequestInfo_CORBA_WstringDef_bound_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -12528,7 +12773,7 @@ TAO_ClientRequestInfo_CORBA_WstringDef_bound_get::arguments (CORBA::Environment
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -12540,12 +12785,12 @@ TAO_ClientRequestInfo_CORBA_WstringDef_bound_get::exceptions (CORBA::Environment
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_WstringDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -12554,17 +12799,17 @@ TAO_ClientRequestInfo_CORBA_WstringDef_bound_get::result (CORBA::Environment &AC
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_WstringDef_bound_get::result (CORBA::ULong result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -12575,24 +12820,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::ULong & bound,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -12602,14 +12847,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_WstringDef_bound_set &);
 
   const CORBA::ULong & bound_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::TAO_ClientRequestInfo_CORBA_WstringDef_bound_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA::ULong & bound,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     bound_ (bound)
@@ -12623,14 +12868,16 @@ TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::arguments (CORBA::Environment
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_bound = parameter_list->length ();
-  parameter_list->length (length_bound + 1);
-  (*parameter_list)[length_bound].argument <<= bound_;
-  (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= bound_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -12642,12 +12889,12 @@ TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::exceptions (CORBA::Environment
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -12656,14 +12903,14 @@ TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::result (CORBA::Environment &AC
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 _TAO_CORBA_WstringDef_Proxy_Impl::_TAO_CORBA_WstringDef_Proxy_Impl (void)
@@ -12682,15 +12929,15 @@ CORBA::ULong _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA::ULong _tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_bound",
@@ -12699,17 +12946,21 @@ CORBA::ULong _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_WstringDef_bound_get ri (
         &_tao_call,
@@ -12717,43 +12968,66 @@ CORBA::ULong _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN  (_tao_retval);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_retval)
@@ -12763,73 +13037,54 @@ CORBA::ULong _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA::ULong  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA::ULong _tao_retval_info = _tao_retval;
+          ri.result (_tao_retval_info);
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN  (_tao_retval);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_retval;
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN  (_tao_retval);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_retval;
 }
 
 void _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
@@ -12841,15 +13096,15 @@ void _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_bound",
@@ -12858,17 +13113,21 @@ void _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_WstringDef_bound_set ri (
         &_tao_call,
@@ -12877,31 +13136,40 @@ void _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << bound)
@@ -12909,84 +13177,81 @@ void _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -13056,13 +13321,13 @@ CORBA_WstringDef::CORBA_WstringDef_setup_collocation (int collocated)
   else
     this->the_TAO_CORBA_WstringDef_Proxy_Broker_ =
       ::_TAO_CORBA_WstringDef_Remote_Proxy_Broker::the_TAO_CORBA_WstringDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_IDLType_setup_collocation (collocated);
 }
 
-void CORBA_WstringDef::_tao_any_destructor (void *x)
+void CORBA_WstringDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_WstringDef *tmp = ACE_static_cast (CORBA_WstringDef*,x);
+  CORBA_WstringDef *tmp = ACE_static_cast (CORBA_WstringDef*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -13109,14 +13374,14 @@ CORBA_WstringDef_ptr CORBA_WstringDef::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           CORBA_WstringDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::CORBA_WstringDef (stub, 0, obj->_servant ()), CORBA_WstringDef::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -13186,7 +13451,7 @@ void *CORBA_WstringDef::_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;
@@ -13204,10 +13469,10 @@ CORBA::ULong CORBA_WstringDef::bound (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_WstringDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_WstringDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_WstringDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.bound (
       this,
       ACE_TRY_ENV
@@ -13222,10 +13487,10 @@ void CORBA_WstringDef::bound (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_WstringDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_WstringDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_WstringDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.bound (
       this,
       bound,
@@ -13324,7 +13589,7 @@ CORBA_SequenceDef_var::operator const ::CORBA_SequenceDef_ptr &() const // cast
   return this->ptr_;
 }
 
-CORBA_SequenceDef_var::operator ::CORBA_SequenceDef_ptr &() // cast 
+CORBA_SequenceDef_var::operator ::CORBA_SequenceDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -13400,7 +13665,7 @@ CORBA_SequenceDef_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class CORBA_SequenceDef_out
+// Operations for class CORBA_SequenceDef_out
 // *************************************************************
 
 CORBA_SequenceDef_out::CORBA_SequenceDef_out (CORBA_SequenceDef_ptr &p)
@@ -13466,24 +13731,24 @@ public:
   TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -13500,7 +13765,7 @@ private:
 TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get::TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -13513,7 +13778,7 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get::arguments (CORBA::Environment
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -13525,12 +13790,12 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get::exceptions (CORBA::Environmen
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -13539,17 +13804,17 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get::result (CORBA::Environment &A
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get::result (CORBA::ULong result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -13560,24 +13825,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::ULong & bound,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -13587,14 +13852,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set &);
 
   const CORBA::ULong & bound_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA::ULong & bound,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     bound_ (bound)
@@ -13608,14 +13873,16 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::arguments (CORBA::Environment
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_bound = parameter_list->length ();
-  parameter_list->length (length_bound + 1);
-  (*parameter_list)[length_bound].argument <<= bound_;
-  (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= bound_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -13627,12 +13894,12 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::exceptions (CORBA::Environmen
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -13641,7 +13908,7 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::result (CORBA::Environment &A
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -13651,24 +13918,24 @@ public:
   TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -13685,7 +13952,7 @@ private:
 TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get::TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -13698,7 +13965,7 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get::arguments (CORBA::Envi
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -13710,12 +13977,12 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get::exceptions (CORBA::Env
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -13724,17 +13991,17 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get::result (CORBA::Environ
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get::result (CORBA::TypeCode_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -13744,24 +14011,24 @@ public:
   TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -13778,7 +14045,7 @@ private:
 TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -13791,7 +14058,7 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::arguments (CORBA::
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -13803,12 +14070,12 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::exceptions (CORBA:
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -13817,17 +14084,17 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::result (CORBA::Env
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::result (CORBA_IDLType_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -13838,24 +14105,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA_IDLType_ptr element_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -13865,14 +14132,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set &);
 
   CORBA_IDLType_ptr element_type_def_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     CORBA_IDLType_ptr element_type_def,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     element_type_def_ (element_type_def)
@@ -13886,15 +14153,16 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::arguments (CORBA::
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_element_type_def = parameter_list->length ();
-  parameter_list->length (length_element_type_def + 1);
-  (*parameter_list)[length_element_type_def].argument <<=  this->element_type_def_;
-  
-  (*parameter_list)[length_element_type_def].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<=  this->element_type_def_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -13906,12 +14174,12 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::exceptions (CORBA:
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -13920,14 +14188,14 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::result (CORBA::Env
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 _TAO_CORBA_SequenceDef_Proxy_Impl::_TAO_CORBA_SequenceDef_Proxy_Impl (void)
@@ -13946,15 +14214,15 @@ CORBA::ULong _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA::ULong _tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_bound",
@@ -13963,17 +14231,21 @@ CORBA::ULong _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get ri (
         &_tao_call,
@@ -13981,43 +14253,66 @@ CORBA::ULong _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN  (_tao_retval);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_retval)
@@ -14027,73 +14322,54 @@ CORBA::ULong _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA::ULong  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA::ULong _tao_retval_info = _tao_retval;
+          ri.result (_tao_retval_info);
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN  (_tao_retval);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_retval;
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN  (_tao_retval);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_retval;
 }
 
 void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
@@ -14105,15 +14381,15 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_bound",
@@ -14122,17 +14398,21 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set ri (
         &_tao_call,
@@ -14141,31 +14421,40 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << bound)
@@ -14173,79 +14462,76 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type (
@@ -14256,16 +14542,16 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
   CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_element_type",
@@ -14274,17 +14560,21 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get ri (
         &_tao_call,
@@ -14292,43 +14582,66 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -14338,74 +14651,55 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
@@ -14416,16 +14710,16 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_IDLType_ptr _tao_retval = CORBA_IDLType::_nil ();
   CORBA_IDLType_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_element_type_def",
@@ -14434,17 +14728,21 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get ri (
         &_tao_call,
@@ -14452,43 +14750,66 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -14498,74 +14819,55 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
@@ -14577,15 +14879,15 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_element_type_def",
@@ -14594,17 +14896,21 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set ri (
         &_tao_call,
@@ -14613,31 +14919,40 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << element_type_def)
@@ -14645,84 +14960,81 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -14792,13 +15104,13 @@ CORBA_SequenceDef::CORBA_SequenceDef_setup_collocation (int collocated)
   else
     this->the_TAO_CORBA_SequenceDef_Proxy_Broker_ =
       ::_TAO_CORBA_SequenceDef_Remote_Proxy_Broker::the_TAO_CORBA_SequenceDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_IDLType_setup_collocation (collocated);
 }
 
-void CORBA_SequenceDef::_tao_any_destructor (void *x)
+void CORBA_SequenceDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_SequenceDef *tmp = ACE_static_cast (CORBA_SequenceDef*,x);
+  CORBA_SequenceDef *tmp = ACE_static_cast (CORBA_SequenceDef*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -14845,14 +15157,14 @@ CORBA_SequenceDef_ptr CORBA_SequenceDef::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           CORBA_SequenceDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::CORBA_SequenceDef (stub, 0, obj->_servant ()), CORBA_SequenceDef::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -14922,7 +15234,7 @@ void *CORBA_SequenceDef::_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;
@@ -14940,10 +15252,10 @@ CORBA::ULong CORBA_SequenceDef::bound (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_SequenceDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_SequenceDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.bound (
       this,
       ACE_TRY_ENV
@@ -14958,10 +15270,10 @@ void CORBA_SequenceDef::bound (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_SequenceDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_SequenceDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.bound (
       this,
       bound,
@@ -14976,10 +15288,10 @@ CORBA::TypeCode_ptr CORBA_SequenceDef::element_type (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_SequenceDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_SequenceDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.element_type (
       this,
       ACE_TRY_ENV
@@ -14993,10 +15305,10 @@ CORBA_IDLType_ptr CORBA_SequenceDef::element_type_def (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_SequenceDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_SequenceDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.element_type_def (
       this,
       ACE_TRY_ENV
@@ -15011,10 +15323,10 @@ void CORBA_SequenceDef::element_type_def (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_SequenceDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_SequenceDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.element_type_def (
       this,
       element_type_def,
@@ -15113,7 +15425,7 @@ CORBA_ArrayDef_var::operator const ::CORBA_ArrayDef_ptr &() const // cast
   return this->ptr_;
 }
 
-CORBA_ArrayDef_var::operator ::CORBA_ArrayDef_ptr &() // cast 
+CORBA_ArrayDef_var::operator ::CORBA_ArrayDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -15189,7 +15501,7 @@ CORBA_ArrayDef_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class CORBA_ArrayDef_out
+// Operations for class CORBA_ArrayDef_out
 // *************************************************************
 
 CORBA_ArrayDef_out::CORBA_ArrayDef_out (CORBA_ArrayDef_ptr &p)
@@ -15255,24 +15567,24 @@ public:
   TAO_ClientRequestInfo_CORBA_ArrayDef_length_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -15289,7 +15601,7 @@ private:
 TAO_ClientRequestInfo_CORBA_ArrayDef_length_get::TAO_ClientRequestInfo_CORBA_ArrayDef_length_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -15302,7 +15614,7 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_length_get::arguments (CORBA::Environment &
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -15314,12 +15626,12 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_length_get::exceptions (CORBA::Environment
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ArrayDef_length_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -15328,17 +15640,17 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_length_get::result (CORBA::Environment &ACE
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ArrayDef_length_get::result (CORBA::ULong result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -15349,24 +15661,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::ULong & length,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -15376,14 +15688,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_ArrayDef_length_set &);
 
   const CORBA::ULong & length_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::TAO_ClientRequestInfo_CORBA_ArrayDef_length_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA::ULong & length,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     length_ (length)
@@ -15397,14 +15709,16 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::arguments (CORBA::Environment &
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_length = parameter_list->length ();
-  parameter_list->length (length_length + 1);
-  (*parameter_list)[length_length].argument <<= length_;
-  (*parameter_list)[length_length].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= length_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -15416,12 +15730,12 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::exceptions (CORBA::Environment
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -15430,7 +15744,7 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::result (CORBA::Environment &ACE
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -15440,24 +15754,24 @@ public:
   TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -15474,7 +15788,7 @@ private:
 TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get::TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -15487,7 +15801,7 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get::arguments (CORBA::Environ
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -15499,12 +15813,12 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get::exceptions (CORBA::Enviro
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -15513,17 +15827,17 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get::result (CORBA::Environmen
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get::result (CORBA::TypeCode_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -15533,24 +15847,24 @@ public:
   TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -15567,7 +15881,7 @@ private:
 TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -15580,7 +15894,7 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::arguments (CORBA::Env
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -15592,12 +15906,12 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::exceptions (CORBA::En
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -15606,17 +15920,17 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::result (CORBA::Enviro
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::result (CORBA_IDLType_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -15627,24 +15941,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA_IDLType_ptr element_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -15654,14 +15968,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set &);
 
   CORBA_IDLType_ptr element_type_def_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     CORBA_IDLType_ptr element_type_def,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     element_type_def_ (element_type_def)
@@ -15675,15 +15989,16 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::arguments (CORBA::Env
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_element_type_def = parameter_list->length ();
-  parameter_list->length (length_element_type_def + 1);
-  (*parameter_list)[length_element_type_def].argument <<=  this->element_type_def_;
-  
-  (*parameter_list)[length_element_type_def].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<=  this->element_type_def_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -15695,12 +16010,12 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::exceptions (CORBA::En
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -15709,14 +16024,14 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::result (CORBA::Enviro
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 _TAO_CORBA_ArrayDef_Proxy_Impl::_TAO_CORBA_ArrayDef_Proxy_Impl (void)
@@ -15735,15 +16050,15 @@ CORBA::ULong _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA::ULong _tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_length",
@@ -15752,17 +16067,21 @@ CORBA::ULong _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ArrayDef_length_get ri (
         &_tao_call,
@@ -15770,43 +16089,66 @@ CORBA::ULong _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN  (_tao_retval);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_retval)
@@ -15816,73 +16158,54 @@ CORBA::ULong _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA::ULong  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA::ULong _tao_retval_info = _tao_retval;
+          ri.result (_tao_retval_info);
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN  (_tao_retval);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_retval;
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN  (_tao_retval);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_retval;
 }
 
 void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
@@ -15894,15 +16217,15 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_length",
@@ -15911,17 +16234,21 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ArrayDef_length_set ri (
         &_tao_call,
@@ -15930,31 +16257,40 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << length)
@@ -15962,79 +16298,76 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type (
@@ -16045,16 +16378,16 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
   CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_element_type",
@@ -16063,17 +16396,21 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get ri (
         &_tao_call,
@@ -16081,43 +16418,66 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -16127,74 +16487,55 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
@@ -16205,16 +16546,16 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_IDLType_ptr _tao_retval = CORBA_IDLType::_nil ();
   CORBA_IDLType_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_element_type_def",
@@ -16223,17 +16564,21 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get ri (
         &_tao_call,
@@ -16241,43 +16586,66 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -16287,74 +16655,55 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
@@ -16366,15 +16715,15 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_element_type_def",
@@ -16383,17 +16732,21 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set ri (
         &_tao_call,
@@ -16402,31 +16755,40 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << element_type_def)
@@ -16434,84 +16796,81 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -16581,13 +16940,13 @@ CORBA_ArrayDef::CORBA_ArrayDef_setup_collocation (int collocated)
   else
     this->the_TAO_CORBA_ArrayDef_Proxy_Broker_ =
       ::_TAO_CORBA_ArrayDef_Remote_Proxy_Broker::the_TAO_CORBA_ArrayDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_IDLType_setup_collocation (collocated);
 }
 
-void CORBA_ArrayDef::_tao_any_destructor (void *x)
+void CORBA_ArrayDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_ArrayDef *tmp = ACE_static_cast (CORBA_ArrayDef*,x);
+  CORBA_ArrayDef *tmp = ACE_static_cast (CORBA_ArrayDef*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -16634,14 +16993,14 @@ CORBA_ArrayDef_ptr CORBA_ArrayDef::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           CORBA_ArrayDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::CORBA_ArrayDef (stub, 0, obj->_servant ()), CORBA_ArrayDef::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -16711,7 +17070,7 @@ void *CORBA_ArrayDef::_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;
@@ -16729,10 +17088,10 @@ CORBA::ULong CORBA_ArrayDef::length (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ArrayDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ArrayDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.length (
       this,
       ACE_TRY_ENV
@@ -16747,10 +17106,10 @@ void CORBA_ArrayDef::length (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ArrayDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ArrayDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.length (
       this,
       length,
@@ -16765,10 +17124,10 @@ CORBA::TypeCode_ptr CORBA_ArrayDef::element_type (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ArrayDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ArrayDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.element_type (
       this,
       ACE_TRY_ENV
@@ -16782,10 +17141,10 @@ CORBA_IDLType_ptr CORBA_ArrayDef::element_type_def (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ArrayDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ArrayDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.element_type_def (
       this,
       ACE_TRY_ENV
@@ -16800,10 +17159,10 @@ void CORBA_ArrayDef::element_type_def (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ArrayDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ArrayDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.element_type_def (
       this,
       element_type_def,
@@ -16902,7 +17261,7 @@ CORBA_ExceptionDef_var::operator const ::CORBA_ExceptionDef_ptr &() const // cas
   return this->ptr_;
 }
 
-CORBA_ExceptionDef_var::operator ::CORBA_ExceptionDef_ptr &() // cast 
+CORBA_ExceptionDef_var::operator ::CORBA_ExceptionDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -16978,7 +17337,7 @@ CORBA_ExceptionDef_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class CORBA_ExceptionDef_out
+// Operations for class CORBA_ExceptionDef_out
 // *************************************************************
 
 CORBA_ExceptionDef_out::CORBA_ExceptionDef_out (CORBA_ExceptionDef_ptr &p)
@@ -17044,24 +17403,24 @@ public:
   TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -17078,7 +17437,7 @@ private:
 TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get::TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -17091,7 +17450,7 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get::arguments (CORBA::Environment
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -17103,12 +17462,12 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get::exceptions (CORBA::Environmen
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -17117,17 +17476,17 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get::result (CORBA::Environment &A
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get::result (CORBA::TypeCode_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -17137,24 +17496,24 @@ public:
   TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -17171,7 +17530,7 @@ private:
 TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -17184,7 +17543,7 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::arguments (CORBA::Environm
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -17196,12 +17555,12 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::exceptions (CORBA::Environ
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -17210,17 +17569,17 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::result (CORBA::Environment
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::result (CORBA_StructMemberSeq * result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -17231,24 +17590,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -17258,14 +17617,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set &);
 
   const CORBA_StructMemberSeq & members_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA_StructMemberSeq & members,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     members_ (members)
@@ -17279,15 +17638,16 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::arguments (CORBA::Environm
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_members = parameter_list->length ();
-  parameter_list->length (length_members + 1);
-  (*parameter_list)[length_members].argument <<=  this->members_;
-  
-  (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<=  this->members_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -17299,12 +17659,12 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::exceptions (CORBA::Environ
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -17313,14 +17673,14 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::result (CORBA::Environment
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 _TAO_CORBA_ExceptionDef_Proxy_Impl::_TAO_CORBA_ExceptionDef_Proxy_Impl (void)
@@ -17339,16 +17699,16 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::type (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
   CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_type",
@@ -17357,17 +17717,21 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::type (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get ri (
         &_tao_call,
@@ -17375,43 +17739,66 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::type (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -17421,74 +17808,55 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::type (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
@@ -17499,15 +17867,15 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_StructMemberSeq *_tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   ACE_NEW_RETURN (_tao_retval, CORBA_StructMemberSeq, _tao_retval);
   CORBA_StructMemberSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -17518,17 +17886,21 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get ri (
         &_tao_call,
@@ -17536,43 +17908,66 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -17582,74 +17977,55 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_StructMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_StructMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 void _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
@@ -17661,15 +18037,15 @@ void _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_members",
@@ -17678,17 +18054,21 @@ void _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set ri (
         &_tao_call,
@@ -17697,31 +18077,40 @@ void _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << members)
@@ -17729,84 +18118,81 @@ void _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -17876,15 +18262,15 @@ CORBA_ExceptionDef::CORBA_ExceptionDef_setup_collocation (int collocated)
   else
     this->the_TAO_CORBA_ExceptionDef_Proxy_Broker_ =
       ::_TAO_CORBA_ExceptionDef_Remote_Proxy_Broker::the_TAO_CORBA_ExceptionDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_Contained_setup_collocation (collocated);
-  
+
   this->CORBA_Container_setup_collocation (collocated);
 }
 
-void CORBA_ExceptionDef::_tao_any_destructor (void *x)
+void CORBA_ExceptionDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_ExceptionDef *tmp = ACE_static_cast (CORBA_ExceptionDef*,x);
+  CORBA_ExceptionDef *tmp = ACE_static_cast (CORBA_ExceptionDef*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -17931,14 +18317,14 @@ CORBA_ExceptionDef_ptr CORBA_ExceptionDef::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           CORBA_ExceptionDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::CORBA_ExceptionDef (stub, 0, obj->_servant ()), CORBA_ExceptionDef::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -18021,7 +18407,7 @@ void *CORBA_ExceptionDef::_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;
@@ -18039,10 +18425,10 @@ CORBA::TypeCode_ptr CORBA_ExceptionDef::type (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ExceptionDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ExceptionDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ExceptionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.type (
       this,
       ACE_TRY_ENV
@@ -18056,10 +18442,10 @@ CORBA_StructMemberSeq * CORBA_ExceptionDef::members (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ExceptionDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ExceptionDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ExceptionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.members (
       this,
       ACE_TRY_ENV
@@ -18074,10 +18460,10 @@ void CORBA_ExceptionDef::members (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ExceptionDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ExceptionDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ExceptionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.members (
       this,
       members,
@@ -18085,105 +18471,105 @@ void CORBA_ExceptionDef::members (
     );
 }
 
-void CORBA_ExceptionDescription::_tao_any_destructor (void *x)
+void CORBA_ExceptionDescription::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_ExceptionDescription *tmp = ACE_static_cast (CORBA_ExceptionDescription*,x);
+  CORBA_ExceptionDescription *tmp = ACE_static_cast (CORBA_ExceptionDescription*, _tao_void_pointer);
   delete tmp;
 }
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXCEPTIONDEFSEQ_CS_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXCEPTIONDEFSEQ_CS_
 
-  // The Base_Sequence functions, please see tao/Sequence.h
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA_ExceptionDef **tmp = 0;
-    tmp = _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA_ExceptionDef **old = ACE_reinterpret_cast (CORBA_ExceptionDef**, this->buffer_);
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = CORBA_ExceptionDef::_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete[] old;
-        }
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_deallocate_buffer (void)
+// The Base_Sequence functions, please see tao/Sequence.h
+void
+_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_allocate_buffer (CORBA::ULong length)
+{
+  CORBA_ExceptionDef **tmp = 0;
+  tmp = _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::allocbuf (length);
+
+  if (this->buffer_ != 0)
   {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    CORBA_ExceptionDef **tmp = ACE_reinterpret_cast (CORBA_ExceptionDef**, this->buffer_);
-    
+    CORBA_ExceptionDef **old = ACE_reinterpret_cast (CORBA_ExceptionDef**, this->buffer_);
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
-        CORBA::release (tmp[i]);
-        tmp[i] = CORBA_ExceptionDef::_nil ();
+        if (!this->release_)
+          {
+            tmp[i] = CORBA_ExceptionDef::_duplicate (old[i]);
+          }
+        else
+          {
+            tmp[i] = old[i];
+          }
       }
-    
-    _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  }
-  
-  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq (void)
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-  {
-    CORBA_ExceptionDef **tmp = ACE_reinterpret_cast (CORBA_ExceptionDef**, this->buffer_);
-    
-    for (CORBA::ULong i = nl; i < ol; ++i)
+
+    if (this->release_)
       {
-        CORBA::release (tmp[i]);
-        tmp[i] = CORBA_ExceptionDef::_nil ();
+        delete[] old;
       }
   }
-  
-  void 
-  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_downcast (
-      void* target,
-      CORBA_Object *src,
-      CORBA_Environment &ACE_TRY_ENV
-    )
-  {
-    CORBA_ExceptionDef **tmp = ACE_static_cast (CORBA_ExceptionDef**, target);
-    *tmp = CORBA_ExceptionDef::_narrow (src, ACE_TRY_ENV);
-    ACE_CHECK;
-  }
+  this->buffer_ = tmp;
+}
+
+void
+_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    return;
+  CORBA_ExceptionDef **tmp = ACE_reinterpret_cast (CORBA_ExceptionDef**, this->buffer_);
+
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      CORBA::release (tmp[i]);
+      tmp[i] = CORBA_ExceptionDef::_nil ();
+    }
+
+  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::freebuf (tmp);
+  this->buffer_ = 0;
+}
+
+_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq (void)
+{
+  this->_deallocate_buffer ();
+}
+
+void
+_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+{
+  CORBA_ExceptionDef **tmp = ACE_reinterpret_cast (CORBA_ExceptionDef**, this->buffer_);
+
+  for (CORBA::ULong i = nl; i < ol; ++i)
+    {
+      CORBA::release (tmp[i]);
+      tmp[i] = CORBA_ExceptionDef::_nil ();
+    }
+}
+
+void
+_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_downcast (
+    void* target,
+    CORBA_Object *src,
+    CORBA_Environment &ACE_TRY_ENV
+  )
+{
+  CORBA_ExceptionDef **tmp = ACE_static_cast (CORBA_ExceptionDef**, target);
+  *tmp = CORBA_ExceptionDef::_narrow (src, ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+CORBA_Object*
+_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_upcast (void *src) const
+{
+  CORBA_ExceptionDef **tmp = ACE_static_cast (CORBA_ExceptionDef**, src);
+  return *tmp;
+}
 
-  CORBA_Object*
-  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_upcast (void *src) const
-  {
-    CORBA_ExceptionDef **tmp = ACE_static_cast (CORBA_ExceptionDef**, src);
-    return *tmp;
-  }
-  
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ_CS_)
 #define _CORBA_EXCEPTIONDEFSEQ_CS_
@@ -18195,37 +18581,37 @@ void CORBA_ExceptionDescription::_tao_any_destructor (void *x)
 CORBA_ExceptionDefSeq::CORBA_ExceptionDefSeq (void)
 {}
 CORBA_ExceptionDefSeq::CORBA_ExceptionDefSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq
+_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA_ExceptionDef,CORBA_ExceptionDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Object_Sequence<CORBA_ExceptionDef,CORBA_ExceptionDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 CORBA_ExceptionDefSeq::CORBA_ExceptionDefSeq (CORBA::ULong max, CORBA::ULong length, CORBA_ExceptionDef_ptr *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq
+_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA_ExceptionDef,CORBA_ExceptionDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Object_Sequence<CORBA_ExceptionDef,CORBA_ExceptionDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 CORBA_ExceptionDefSeq::CORBA_ExceptionDefSeq (const CORBA_ExceptionDefSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq
+_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA_ExceptionDef,CORBA_ExceptionDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Object_Sequence<CORBA_ExceptionDef,CORBA_ExceptionDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 CORBA_ExceptionDefSeq::~CORBA_ExceptionDefSeq (void) // dtor
 {}
-void CORBA_ExceptionDefSeq::_tao_any_destructor (void *x)
+void CORBA_ExceptionDefSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_ExceptionDefSeq *tmp = ACE_static_cast (CORBA_ExceptionDefSeq*,x);
+  CORBA_ExceptionDefSeq *tmp = ACE_static_cast (CORBA_ExceptionDefSeq*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -18233,52 +18619,52 @@ void CORBA_ExceptionDefSeq::_tao_any_destructor (void *x)
 #endif /* end #if !defined */
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_EXCDESCRIPTIONSEQ_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_EXCDESCRIPTIONSEQ_CS_
 
-  void
-  _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA_ExceptionDescription* tmp = 0;
-    tmp = _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA_ExceptionDescription *old = ACE_reinterpret_cast (CORBA_ExceptionDescription *,this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-      
-      if (this->release_)
-        _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::freebuf (old);
-      
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    
-    CORBA_ExceptionDescription *tmp = ACE_reinterpret_cast (CORBA_ExceptionDescription *,this->buffer_);
-    
-    _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  } 
-  
-  _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (void) // Dtor.
+void
+_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::_allocate_buffer (CORBA::ULong length)
+{
+  CORBA_ExceptionDescription* tmp = 0;
+  tmp = _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (length);
+
+  if (this->buffer_ != 0)
   {
-    this->_deallocate_buffer ();
+    CORBA_ExceptionDescription *old = ACE_reinterpret_cast (CORBA_ExceptionDescription *,this->buffer_);
+
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
+      tmp[i] = old[i];
+
+    if (this->release_)
+      _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::freebuf (old);
+
   }
-  
-  
+  this->buffer_ = tmp;
+}
+
+void
+_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    return;
+
+  CORBA_ExceptionDescription *tmp = ACE_reinterpret_cast (CORBA_ExceptionDescription *,this->buffer_);
+
+  _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::freebuf (tmp);
+  this->buffer_ = 0;
+}
+
+_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (void) // Dtor.
+{
+  this->_deallocate_buffer ();
+}
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_EXCDESCRIPTIONSEQ_CS_)
 #define _CORBA_EXCDESCRIPTIONSEQ_CS_
@@ -18290,37 +18676,37 @@ void CORBA_ExceptionDefSeq::_tao_any_destructor (void *x)
 CORBA_ExcDescriptionSeq::CORBA_ExcDescriptionSeq (void)
 {}
 CORBA_ExcDescriptionSeq::CORBA_ExcDescriptionSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq
+_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_ExceptionDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Sequence<CORBA_ExceptionDescription>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 CORBA_ExcDescriptionSeq::CORBA_ExcDescriptionSeq (CORBA::ULong max, CORBA::ULong length, CORBA_ExceptionDescription *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq
+_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_ExceptionDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Sequence<CORBA_ExceptionDescription>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 CORBA_ExcDescriptionSeq::CORBA_ExcDescriptionSeq (const CORBA_ExcDescriptionSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq
+_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_ExceptionDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Sequence<CORBA_ExceptionDescription>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 CORBA_ExcDescriptionSeq::~CORBA_ExcDescriptionSeq (void) // dtor
 {}
-void CORBA_ExcDescriptionSeq::_tao_any_destructor (void *x)
+void CORBA_ExcDescriptionSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_ExcDescriptionSeq *tmp = ACE_static_cast (CORBA_ExcDescriptionSeq*,x);
+  CORBA_ExcDescriptionSeq *tmp = ACE_static_cast (CORBA_ExcDescriptionSeq*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -18418,7 +18804,7 @@ CORBA_AttributeDef_var::operator const ::CORBA_AttributeDef_ptr &() const // cas
   return this->ptr_;
 }
 
-CORBA_AttributeDef_var::operator ::CORBA_AttributeDef_ptr &() // cast 
+CORBA_AttributeDef_var::operator ::CORBA_AttributeDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -18494,7 +18880,7 @@ CORBA_AttributeDef_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class CORBA_AttributeDef_out
+// Operations for class CORBA_AttributeDef_out
 // *************************************************************
 
 CORBA_AttributeDef_out::CORBA_AttributeDef_out (CORBA_AttributeDef_ptr &p)
@@ -18560,24 +18946,24 @@ public:
   TAO_ClientRequestInfo_CORBA_AttributeDef_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -18594,7 +18980,7 @@ private:
 TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::TAO_ClientRequestInfo_CORBA_AttributeDef_type_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -18607,7 +18993,7 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::arguments (CORBA::Environment
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -18619,12 +19005,12 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::exceptions (CORBA::Environmen
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -18633,17 +19019,17 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::result (CORBA::Environment &A
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::result (CORBA::TypeCode_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -18653,24 +19039,24 @@ public:
   TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -18687,7 +19073,7 @@ private:
 TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -18700,7 +19086,7 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::arguments (CORBA::Environ
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -18712,12 +19098,12 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::exceptions (CORBA::Enviro
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -18726,17 +19112,17 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::result (CORBA::Environmen
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::result (CORBA_IDLType_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -18747,24 +19133,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -18774,14 +19160,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set &);
 
   CORBA_IDLType_ptr type_def_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     CORBA_IDLType_ptr type_def,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     type_def_ (type_def)
@@ -18795,15 +19181,16 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::arguments (CORBA::Environ
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_type_def = parameter_list->length ();
-  parameter_list->length (length_type_def + 1);
-  (*parameter_list)[length_type_def].argument <<=  this->type_def_;
-  
-  (*parameter_list)[length_type_def].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<=  this->type_def_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -18815,12 +19202,12 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::exceptions (CORBA::Enviro
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -18829,7 +19216,7 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::result (CORBA::Environmen
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -18839,24 +19226,24 @@ public:
   TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -18873,7 +19260,7 @@ private:
 TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get::TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -18886,7 +19273,7 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get::arguments (CORBA::Environment
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -18898,12 +19285,12 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get::exceptions (CORBA::Environmen
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -18912,17 +19299,17 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get::result (CORBA::Environment &A
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get::result (CORBA::AttributeMode result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -18933,24 +19320,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::AttributeMode & mode,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -18960,14 +19347,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set &);
 
   const CORBA::AttributeMode & mode_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     CORBA::AttributeMode & mode,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     mode_ (mode)
@@ -18981,15 +19368,16 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::arguments (CORBA::Environment
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_mode = parameter_list->length ();
-  parameter_list->length (length_mode + 1);
-  (*parameter_list)[length_mode].argument <<=  this->mode_;
-  
-  (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<=  this->mode_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -19001,12 +19389,12 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::exceptions (CORBA::Environmen
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -19015,14 +19403,14 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::result (CORBA::Environment &A
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 _TAO_CORBA_AttributeDef_Proxy_Impl::_TAO_CORBA_AttributeDef_Proxy_Impl (void)
@@ -19041,16 +19429,16 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
   CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_type",
@@ -19059,17 +19447,21 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_AttributeDef_type_get ri (
         &_tao_call,
@@ -19077,43 +19469,66 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -19123,74 +19538,55 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
@@ -19201,16 +19597,16 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_IDLType_ptr _tao_retval = CORBA_IDLType::_nil ();
   CORBA_IDLType_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_type_def",
@@ -19219,17 +19615,21 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get ri (
         &_tao_call,
@@ -19237,43 +19637,66 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -19283,74 +19706,55 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
@@ -19362,15 +19766,15 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_type_def",
@@ -19379,17 +19783,21 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set ri (
         &_tao_call,
@@ -19398,31 +19806,40 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << type_def)
@@ -19430,79 +19847,76 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 CORBA::AttributeMode _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
@@ -19513,15 +19927,15 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA::AttributeMode _tao_retval = (CORBA::AttributeMode)0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_mode",
@@ -19530,17 +19944,21 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get ri (
         &_tao_call,
@@ -19548,43 +19966,66 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN  (_tao_retval);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_retval)
@@ -19594,73 +20035,54 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA::AttributeMode  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA::AttributeMode _tao_retval_info = _tao_retval;
+          ri.result (_tao_retval_info);
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN  (_tao_retval);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_retval;
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN  (_tao_retval);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_retval;
 }
 
 void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
@@ -19672,15 +20094,15 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_mode",
@@ -19689,17 +20111,21 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set ri (
         &_tao_call,
@@ -19708,31 +20134,40 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << mode)
@@ -19740,84 +20175,81 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -19887,13 +20319,13 @@ CORBA_AttributeDef::CORBA_AttributeDef_setup_collocation (int collocated)
   else
     this->the_TAO_CORBA_AttributeDef_Proxy_Broker_ =
       ::_TAO_CORBA_AttributeDef_Remote_Proxy_Broker::the_TAO_CORBA_AttributeDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_Contained_setup_collocation (collocated);
 }
 
-void CORBA_AttributeDef::_tao_any_destructor (void *x)
+void CORBA_AttributeDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_AttributeDef *tmp = ACE_static_cast (CORBA_AttributeDef*,x);
+  CORBA_AttributeDef *tmp = ACE_static_cast (CORBA_AttributeDef*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -19940,14 +20372,14 @@ CORBA_AttributeDef_ptr CORBA_AttributeDef::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           CORBA_AttributeDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::CORBA_AttributeDef (stub, 0, obj->_servant ()), CORBA_AttributeDef::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -20017,7 +20449,7 @@ void *CORBA_AttributeDef::_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;
@@ -20035,10 +20467,10 @@ CORBA::TypeCode_ptr CORBA_AttributeDef::type (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_AttributeDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_AttributeDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.type (
       this,
       ACE_TRY_ENV
@@ -20052,10 +20484,10 @@ CORBA_IDLType_ptr CORBA_AttributeDef::type_def (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_AttributeDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_AttributeDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.type_def (
       this,
       ACE_TRY_ENV
@@ -20070,10 +20502,10 @@ void CORBA_AttributeDef::type_def (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_AttributeDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_AttributeDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.type_def (
       this,
       type_def,
@@ -20088,10 +20520,10 @@ CORBA::AttributeMode CORBA_AttributeDef::mode (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_AttributeDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_AttributeDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN ((CORBA::AttributeMode)0);
-  
+
   return proxy.mode (
       this,
       ACE_TRY_ENV
@@ -20106,10 +20538,10 @@ void CORBA_AttributeDef::mode (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_AttributeDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_AttributeDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.mode (
       this,
       mode,
@@ -20117,66 +20549,67 @@ void CORBA_AttributeDef::mode (
     );
 }
 
-void CORBA_AttributeDescription::_tao_any_destructor (void *x)
+void CORBA_AttributeDescription::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_AttributeDescription *tmp = ACE_static_cast (CORBA_AttributeDescription*,x);
+  CORBA_AttributeDescription *tmp = ACE_static_cast (CORBA_AttributeDescription*, _tao_void_pointer);
   delete tmp;
 }
 
-void CORBA_ParameterDescription::_tao_any_destructor (void *x)
+
+void CORBA_ParameterDescription::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_ParameterDescription *tmp = ACE_static_cast (CORBA_ParameterDescription*,x);
+  CORBA_ParameterDescription *tmp = ACE_static_cast (CORBA_ParameterDescription*, _tao_void_pointer);
   delete tmp;
 }
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_PARDESCRIPTIONSEQ_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_PARDESCRIPTIONSEQ_CS_
 
-  void
-  _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA_ParameterDescription* tmp = 0;
-    tmp = _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA_ParameterDescription *old = ACE_reinterpret_cast (CORBA_ParameterDescription *,this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-      
-      if (this->release_)
-        _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::freebuf (old);
-      
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    
-    CORBA_ParameterDescription *tmp = ACE_reinterpret_cast (CORBA_ParameterDescription *,this->buffer_);
-    
-    _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  } 
-  
-  _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (void) // Dtor.
+void
+_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::_allocate_buffer (CORBA::ULong length)
+{
+  CORBA_ParameterDescription* tmp = 0;
+  tmp = _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::allocbuf (length);
+
+  if (this->buffer_ != 0)
   {
-    this->_deallocate_buffer ();
+    CORBA_ParameterDescription *old = ACE_reinterpret_cast (CORBA_ParameterDescription *,this->buffer_);
+
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
+      tmp[i] = old[i];
+
+    if (this->release_)
+      _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::freebuf (old);
+
   }
-  
-  
+  this->buffer_ = tmp;
+}
+
+void
+_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    return;
+
+  CORBA_ParameterDescription *tmp = ACE_reinterpret_cast (CORBA_ParameterDescription *,this->buffer_);
+
+  _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::freebuf (tmp);
+  this->buffer_ = 0;
+}
+
+_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (void) // Dtor.
+{
+  this->_deallocate_buffer ();
+}
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_PARDESCRIPTIONSEQ_CS_)
 #define _CORBA_PARDESCRIPTIONSEQ_CS_
@@ -20188,37 +20621,37 @@ void CORBA_ParameterDescription::_tao_any_destructor (void *x)
 CORBA_ParDescriptionSeq::CORBA_ParDescriptionSeq (void)
 {}
 CORBA_ParDescriptionSeq::CORBA_ParDescriptionSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq
+_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_ParameterDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Sequence<CORBA_ParameterDescription>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 CORBA_ParDescriptionSeq::CORBA_ParDescriptionSeq (CORBA::ULong max, CORBA::ULong length, CORBA_ParameterDescription *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq
+_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_ParameterDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Sequence<CORBA_ParameterDescription>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 CORBA_ParDescriptionSeq::CORBA_ParDescriptionSeq (const CORBA_ParDescriptionSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq
+_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_ParameterDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Sequence<CORBA_ParameterDescription>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 CORBA_ParDescriptionSeq::~CORBA_ParDescriptionSeq (void) // dtor
 {}
-void CORBA_ParDescriptionSeq::_tao_any_destructor (void *x)
+void CORBA_ParDescriptionSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_ParDescriptionSeq *tmp = ACE_static_cast (CORBA_ParDescriptionSeq*,x);
+  CORBA_ParDescriptionSeq *tmp = ACE_static_cast (CORBA_ParDescriptionSeq*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -20235,37 +20668,37 @@ void CORBA_ParDescriptionSeq::_tao_any_destructor (void *x)
 CORBA_ContextIdSeq::CORBA_ContextIdSeq (void)
 {}
 CORBA_ContextIdSeq::CORBA_ContextIdSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
+TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_String_Sequence
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 CORBA_ContextIdSeq::CORBA_ContextIdSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
+TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_String_Sequence
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 CORBA_ContextIdSeq::CORBA_ContextIdSeq (const CORBA_ContextIdSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
+TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_String_Sequence
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 CORBA_ContextIdSeq::~CORBA_ContextIdSeq (void) // dtor
 {}
-void CORBA_ContextIdSeq::_tao_any_destructor (void *x)
+void CORBA_ContextIdSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_ContextIdSeq *tmp = ACE_static_cast (CORBA_ContextIdSeq*,x);
+  CORBA_ContextIdSeq *tmp = ACE_static_cast (CORBA_ContextIdSeq*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -20363,7 +20796,7 @@ CORBA_OperationDef_var::operator const ::CORBA_OperationDef_ptr &() const // cas
   return this->ptr_;
 }
 
-CORBA_OperationDef_var::operator ::CORBA_OperationDef_ptr &() // cast 
+CORBA_OperationDef_var::operator ::CORBA_OperationDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -20439,7 +20872,7 @@ CORBA_OperationDef_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class CORBA_OperationDef_out
+// Operations for class CORBA_OperationDef_out
 // *************************************************************
 
 CORBA_OperationDef_out::CORBA_OperationDef_out (CORBA_OperationDef_ptr &p)
@@ -20505,24 +20938,24 @@ public:
   TAO_ClientRequestInfo_CORBA_OperationDef_result_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -20539,7 +20972,7 @@ private:
 TAO_ClientRequestInfo_CORBA_OperationDef_result_get::TAO_ClientRequestInfo_CORBA_OperationDef_result_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -20552,7 +20985,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_get::arguments (CORBA::Environme
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -20564,12 +20997,12 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_get::exceptions (CORBA::Environm
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_OperationDef_result_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -20578,17 +21011,17 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_get::result (CORBA::Environment
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_OperationDef_result_get::result (CORBA::TypeCode_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -20598,24 +21031,24 @@ public:
   TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -20632,7 +21065,7 @@ private:
 TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -20645,7 +21078,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::arguments (CORBA::Envir
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -20657,12 +21090,12 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::exceptions (CORBA::Envi
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -20671,17 +21104,17 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::result (CORBA::Environm
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::result (CORBA_IDLType_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -20692,24 +21125,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA_IDLType_ptr result_def,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -20719,14 +21152,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set &);
 
   CORBA_IDLType_ptr result_def_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     CORBA_IDLType_ptr result_def,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     result_def_ (result_def)
@@ -20740,15 +21173,16 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::arguments (CORBA::Envir
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_result_def = parameter_list->length ();
-  parameter_list->length (length_result_def + 1);
-  (*parameter_list)[length_result_def].argument <<=  this->result_def_;
-  
-  (*parameter_list)[length_result_def].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<=  this->result_def_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -20760,12 +21194,12 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::exceptions (CORBA::Envi
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -20774,7 +21208,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::result (CORBA::Environm
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -20784,24 +21218,24 @@ public:
   TAO_ClientRequestInfo_CORBA_OperationDef_params_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -20818,7 +21252,7 @@ private:
 TAO_ClientRequestInfo_CORBA_OperationDef_params_get::TAO_ClientRequestInfo_CORBA_OperationDef_params_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -20831,7 +21265,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_params_get::arguments (CORBA::Environme
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -20843,12 +21277,12 @@ TAO_ClientRequestInfo_CORBA_OperationDef_params_get::exceptions (CORBA::Environm
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_OperationDef_params_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -20857,17 +21291,17 @@ TAO_ClientRequestInfo_CORBA_OperationDef_params_get::result (CORBA::Environment
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_OperationDef_params_get::result (CORBA_ParDescriptionSeq * result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -20878,24 +21312,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA_ParDescriptionSeq & params,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -20905,14 +21339,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_OperationDef_params_set &);
 
   const CORBA_ParDescriptionSeq & params_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_OperationDef_params_set::TAO_ClientRequestInfo_CORBA_OperationDef_params_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA_ParDescriptionSeq & params,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     params_ (params)
@@ -20926,15 +21360,16 @@ TAO_ClientRequestInfo_CORBA_OperationDef_params_set::arguments (CORBA::Environme
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_params = parameter_list->length ();
-  parameter_list->length (length_params + 1);
-  (*parameter_list)[length_params].argument <<=  this->params_;
-  
-  (*parameter_list)[length_params].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<=  this->params_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -20946,12 +21381,12 @@ TAO_ClientRequestInfo_CORBA_OperationDef_params_set::exceptions (CORBA::Environm
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_OperationDef_params_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -20960,7 +21395,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_params_set::result (CORBA::Environment
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -20970,24 +21405,24 @@ public:
   TAO_ClientRequestInfo_CORBA_OperationDef_mode_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -21004,7 +21439,7 @@ private:
 TAO_ClientRequestInfo_CORBA_OperationDef_mode_get::TAO_ClientRequestInfo_CORBA_OperationDef_mode_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -21017,7 +21452,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_mode_get::arguments (CORBA::Environment
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -21029,12 +21464,12 @@ TAO_ClientRequestInfo_CORBA_OperationDef_mode_get::exceptions (CORBA::Environmen
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_OperationDef_mode_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -21043,17 +21478,17 @@ TAO_ClientRequestInfo_CORBA_OperationDef_mode_get::result (CORBA::Environment &A
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_OperationDef_mode_get::result (CORBA::OperationMode result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -21064,24 +21499,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::OperationMode & mode,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -21091,14 +21526,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_OperationDef_mode_set &);
 
   const CORBA::OperationMode & mode_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::TAO_ClientRequestInfo_CORBA_OperationDef_mode_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     CORBA::OperationMode & mode,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     mode_ (mode)
@@ -21112,15 +21547,16 @@ TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::arguments (CORBA::Environment
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_mode = parameter_list->length ();
-  parameter_list->length (length_mode + 1);
-  (*parameter_list)[length_mode].argument <<=  this->mode_;
-  
-  (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<=  this->mode_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -21132,12 +21568,12 @@ TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::exceptions (CORBA::Environmen
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -21146,7 +21582,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::result (CORBA::Environment &A
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -21156,24 +21592,24 @@ public:
   TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -21190,7 +21626,7 @@ private:
 TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -21203,7 +21639,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::arguments (CORBA::Environ
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -21215,12 +21651,12 @@ TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::exceptions (CORBA::Enviro
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -21229,17 +21665,17 @@ TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::result (CORBA::Environmen
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::result (CORBA_ContextIdSeq * result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -21250,24 +21686,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -21277,14 +21713,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set &);
 
   const CORBA_ContextIdSeq & contexts_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     contexts_ (contexts)
@@ -21298,15 +21734,16 @@ TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::arguments (CORBA::Environ
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_contexts = parameter_list->length ();
-  parameter_list->length (length_contexts + 1);
-  (*parameter_list)[length_contexts].argument <<=  this->contexts_;
-  
-  (*parameter_list)[length_contexts].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<=  this->contexts_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -21318,12 +21755,12 @@ TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::exceptions (CORBA::Enviro
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -21332,7 +21769,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::result (CORBA::Environmen
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -21342,24 +21779,24 @@ public:
   TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -21376,7 +21813,7 @@ private:
 TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -21389,7 +21826,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::arguments (CORBA::Envir
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -21401,12 +21838,12 @@ TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::exceptions (CORBA::Envi
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -21415,17 +21852,17 @@ TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::result (CORBA::Environm
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::result (CORBA_ExceptionDefSeq * result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -21436,24 +21873,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA_ExceptionDefSeq & exceptions,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -21463,14 +21900,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set &);
 
   const CORBA_ExceptionDefSeq & exceptions_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA_ExceptionDefSeq & exceptions,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     exceptions_ (exceptions)
@@ -21484,15 +21921,16 @@ TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::arguments (CORBA::Envir
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_exceptions = parameter_list->length ();
-  parameter_list->length (length_exceptions + 1);
-  (*parameter_list)[length_exceptions].argument <<=  this->exceptions_;
-  
-  (*parameter_list)[length_exceptions].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<=  this->exceptions_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -21504,12 +21942,12 @@ TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::exceptions (CORBA::Envi
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -21518,14 +21956,14 @@ TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::result (CORBA::Environm
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 _TAO_CORBA_OperationDef_Proxy_Impl::_TAO_CORBA_OperationDef_Proxy_Impl (void)
@@ -21544,16 +21982,16 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
   CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_result",
@@ -21562,17 +22000,21 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_OperationDef_result_get ri (
         &_tao_call,
@@ -21580,43 +22022,66 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -21626,74 +22091,55 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
@@ -21704,16 +22150,16 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_IDLType_ptr _tao_retval = CORBA_IDLType::_nil ();
   CORBA_IDLType_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_result_def",
@@ -21722,17 +22168,21 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get ri (
         &_tao_call,
@@ -21740,43 +22190,66 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -21786,74 +22259,55 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
@@ -21865,15 +22319,15 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_result_def",
@@ -21882,17 +22336,21 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set ri (
         &_tao_call,
@@ -21901,31 +22359,40 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << result_def)
@@ -21933,79 +22400,76 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
@@ -22016,15 +22480,15 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_ParDescriptionSeq *_tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   ACE_NEW_RETURN (_tao_retval, CORBA_ParDescriptionSeq, _tao_retval);
   CORBA_ParDescriptionSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -22035,17 +22499,21 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_OperationDef_params_get ri (
         &_tao_call,
@@ -22053,43 +22521,66 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -22099,74 +22590,55 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_ParDescriptionSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_ParDescriptionSeq * _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
@@ -22178,15 +22650,15 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_params",
@@ -22195,17 +22667,21 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_OperationDef_params_set ri (
         &_tao_call,
@@ -22214,31 +22690,40 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << params)
@@ -22246,79 +22731,76 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 CORBA::OperationMode _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
@@ -22329,15 +22811,15 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA::OperationMode _tao_retval = (CORBA::OperationMode)0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_mode",
@@ -22346,17 +22828,21 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_OperationDef_mode_get ri (
         &_tao_call,
@@ -22364,43 +22850,66 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN  (_tao_retval);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_retval)
@@ -22410,73 +22919,54 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA::OperationMode  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA::OperationMode _tao_retval_info = _tao_retval;
+          ri.result (_tao_retval_info);
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN  (_tao_retval);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_retval;
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN  (_tao_retval);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_retval;
 }
 
 void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
@@ -22488,15 +22978,15 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_mode",
@@ -22505,17 +22995,21 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_OperationDef_mode_set ri (
         &_tao_call,
@@ -22524,31 +23018,40 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << mode)
@@ -22556,79 +23059,76 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
@@ -22639,15 +23139,15 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_ContextIdSeq *_tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   ACE_NEW_RETURN (_tao_retval, CORBA_ContextIdSeq, _tao_retval);
   CORBA_ContextIdSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -22658,17 +23158,21 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get ri (
         &_tao_call,
@@ -22676,43 +23180,66 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -22722,74 +23249,55 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_ContextIdSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_ContextIdSeq * _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
@@ -22801,15 +23309,15 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_contexts",
@@ -22818,17 +23326,21 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set ri (
         &_tao_call,
@@ -22837,31 +23349,40 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << contexts)
@@ -22869,79 +23390,76 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
@@ -22952,15 +23470,15 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_ExceptionDefSeq *_tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   ACE_NEW_RETURN (_tao_retval, CORBA_ExceptionDefSeq, _tao_retval);
   CORBA_ExceptionDefSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -22971,17 +23489,21 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get ri (
         &_tao_call,
@@ -22989,43 +23511,66 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -23035,74 +23580,55 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_ExceptionDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_ExceptionDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
@@ -23114,15 +23640,15 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_exceptions",
@@ -23131,17 +23657,21 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set ri (
         &_tao_call,
@@ -23150,31 +23680,40 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << exceptions)
@@ -23182,84 +23721,81 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -23329,13 +23865,13 @@ CORBA_OperationDef::CORBA_OperationDef_setup_collocation (int collocated)
   else
     this->the_TAO_CORBA_OperationDef_Proxy_Broker_ =
       ::_TAO_CORBA_OperationDef_Remote_Proxy_Broker::the_TAO_CORBA_OperationDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_Contained_setup_collocation (collocated);
 }
 
-void CORBA_OperationDef::_tao_any_destructor (void *x)
+void CORBA_OperationDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_OperationDef *tmp = ACE_static_cast (CORBA_OperationDef*,x);
+  CORBA_OperationDef *tmp = ACE_static_cast (CORBA_OperationDef*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -23382,14 +23918,14 @@ CORBA_OperationDef_ptr CORBA_OperationDef::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           CORBA_OperationDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::CORBA_OperationDef (stub, 0, obj->_servant ()), CORBA_OperationDef::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -23459,7 +23995,7 @@ void *CORBA_OperationDef::_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;
@@ -23477,10 +24013,10 @@ CORBA::TypeCode_ptr CORBA_OperationDef::result (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_OperationDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_OperationDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.result (
       this,
       ACE_TRY_ENV
@@ -23494,10 +24030,10 @@ CORBA_IDLType_ptr CORBA_OperationDef::result_def (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_OperationDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_OperationDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.result_def (
       this,
       ACE_TRY_ENV
@@ -23512,10 +24048,10 @@ void CORBA_OperationDef::result_def (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_OperationDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_OperationDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.result_def (
       this,
       result_def,
@@ -23530,10 +24066,10 @@ CORBA_ParDescriptionSeq * CORBA_OperationDef::params (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_OperationDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_OperationDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.params (
       this,
       ACE_TRY_ENV
@@ -23548,10 +24084,10 @@ void CORBA_OperationDef::params (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_OperationDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_OperationDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.params (
       this,
       params,
@@ -23566,10 +24102,10 @@ CORBA::OperationMode CORBA_OperationDef::mode (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_OperationDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_OperationDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN ((CORBA::OperationMode)0);
-  
+
   return proxy.mode (
       this,
       ACE_TRY_ENV
@@ -23584,10 +24120,10 @@ void CORBA_OperationDef::mode (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_OperationDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_OperationDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.mode (
       this,
       mode,
@@ -23602,10 +24138,10 @@ CORBA_ContextIdSeq * CORBA_OperationDef::contexts (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_OperationDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_OperationDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.contexts (
       this,
       ACE_TRY_ENV
@@ -23620,10 +24156,10 @@ void CORBA_OperationDef::contexts (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_OperationDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_OperationDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.contexts (
       this,
       contexts,
@@ -23638,10 +24174,10 @@ CORBA_ExceptionDefSeq * CORBA_OperationDef::exceptions (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_OperationDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_OperationDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.exceptions (
       this,
       ACE_TRY_ENV
@@ -23656,10 +24192,10 @@ void CORBA_OperationDef::exceptions (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_OperationDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_OperationDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.exceptions (
       this,
       exceptions,
@@ -23667,9 +24203,10 @@ void CORBA_OperationDef::exceptions (
     );
 }
 
-void CORBA_OperationDescription::_tao_any_destructor (void *x)
+
+void CORBA_OperationDescription::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_OperationDescription *tmp = ACE_static_cast (CORBA_OperationDescription*,x);
+  CORBA_OperationDescription *tmp = ACE_static_cast (CORBA_OperationDescription*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -23684,90 +24221,91 @@ void CORBA_OperationDescription::_tao_any_destructor (void *x)
 CORBA_RepositoryIdSeq::CORBA_RepositoryIdSeq (void)
 {}
 CORBA_RepositoryIdSeq::CORBA_RepositoryIdSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
+TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_String_Sequence
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 CORBA_RepositoryIdSeq::CORBA_RepositoryIdSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
+TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_String_Sequence
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 CORBA_RepositoryIdSeq::CORBA_RepositoryIdSeq (const CORBA_RepositoryIdSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
+TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_String_Sequence
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 CORBA_RepositoryIdSeq::~CORBA_RepositoryIdSeq (void) // dtor
 {}
-void CORBA_RepositoryIdSeq::_tao_any_destructor (void *x)
+void CORBA_RepositoryIdSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_RepositoryIdSeq *tmp = ACE_static_cast (CORBA_RepositoryIdSeq*,x);
+  CORBA_RepositoryIdSeq *tmp = ACE_static_cast (CORBA_RepositoryIdSeq*, _tao_void_pointer);
   delete tmp;
 }
 
 
 #endif /* end #if !defined */
 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_OPDESCRIPTIONSEQ_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_OPDESCRIPTIONSEQ_CS_
 
-  void
-  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA_OperationDescription* tmp = 0;
-    tmp = _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA_OperationDescription *old = ACE_reinterpret_cast (CORBA_OperationDescription *,this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-      
-      if (this->release_)
-        _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::freebuf (old);
-      
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    
-    CORBA_OperationDescription *tmp = ACE_reinterpret_cast (CORBA_OperationDescription *,this->buffer_);
-    
-    _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  } 
-  
-  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (void) // Dtor.
+void
+_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::_allocate_buffer (CORBA::ULong length)
+{
+  CORBA_OperationDescription* tmp = 0;
+  tmp = _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::allocbuf (length);
+
+  if (this->buffer_ != 0)
   {
-    this->_deallocate_buffer ();
+    CORBA_OperationDescription *old = ACE_reinterpret_cast (CORBA_OperationDescription *,this->buffer_);
+
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
+      tmp[i] = old[i];
+
+    if (this->release_)
+      _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::freebuf (old);
+
   }
-  
-  
+  this->buffer_ = tmp;
+}
+
+void
+_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    return;
+
+  CORBA_OperationDescription *tmp = ACE_reinterpret_cast (CORBA_OperationDescription *,this->buffer_);
+
+  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::freebuf (tmp);
+  this->buffer_ = 0;
+}
+
+_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (void) // Dtor.
+{
+  this->_deallocate_buffer ();
+}
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_OPDESCRIPTIONSEQ_CS_)
 #define _CORBA_OPDESCRIPTIONSEQ_CS_
@@ -23779,90 +24317,91 @@ void CORBA_RepositoryIdSeq::_tao_any_destructor (void *x)
 CORBA_OpDescriptionSeq::CORBA_OpDescriptionSeq (void)
 {}
 CORBA_OpDescriptionSeq::CORBA_OpDescriptionSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq
+_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_OperationDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Sequence<CORBA_OperationDescription>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 CORBA_OpDescriptionSeq::CORBA_OpDescriptionSeq (CORBA::ULong max, CORBA::ULong length, CORBA_OperationDescription *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq
+_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_OperationDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Sequence<CORBA_OperationDescription>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 CORBA_OpDescriptionSeq::CORBA_OpDescriptionSeq (const CORBA_OpDescriptionSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq
+_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_OperationDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Sequence<CORBA_OperationDescription>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 CORBA_OpDescriptionSeq::~CORBA_OpDescriptionSeq (void) // dtor
 {}
-void CORBA_OpDescriptionSeq::_tao_any_destructor (void *x)
+void CORBA_OpDescriptionSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_OpDescriptionSeq *tmp = ACE_static_cast (CORBA_OpDescriptionSeq*,x);
+  CORBA_OpDescriptionSeq *tmp = ACE_static_cast (CORBA_OpDescriptionSeq*, _tao_void_pointer);
   delete tmp;
 }
 
 
 #endif /* end #if !defined */
 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_ATTRDESCRIPTIONSEQ_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_ATTRDESCRIPTIONSEQ_CS_
 
-  void
-  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA_AttributeDescription* tmp = 0;
-    tmp = _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA_AttributeDescription *old = ACE_reinterpret_cast (CORBA_AttributeDescription *,this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-      
-      if (this->release_)
-        _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::freebuf (old);
-      
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    
-    CORBA_AttributeDescription *tmp = ACE_reinterpret_cast (CORBA_AttributeDescription *,this->buffer_);
-    
-    _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  } 
-  
-  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (void) // Dtor.
+void
+_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::_allocate_buffer (CORBA::ULong length)
+{
+  CORBA_AttributeDescription* tmp = 0;
+  tmp = _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::allocbuf (length);
+
+  if (this->buffer_ != 0)
   {
-    this->_deallocate_buffer ();
+    CORBA_AttributeDescription *old = ACE_reinterpret_cast (CORBA_AttributeDescription *,this->buffer_);
+
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
+      tmp[i] = old[i];
+
+    if (this->release_)
+      _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::freebuf (old);
+
   }
-  
-  
+  this->buffer_ = tmp;
+}
+
+void
+_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    return;
+
+  CORBA_AttributeDescription *tmp = ACE_reinterpret_cast (CORBA_AttributeDescription *,this->buffer_);
+
+  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::freebuf (tmp);
+  this->buffer_ = 0;
+}
+
+_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (void) // Dtor.
+{
+  this->_deallocate_buffer ();
+}
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_ATTRDESCRIPTIONSEQ_CS_)
 #define _CORBA_ATTRDESCRIPTIONSEQ_CS_
@@ -23874,43 +24413,44 @@ void CORBA_OpDescriptionSeq::_tao_any_destructor (void *x)
 CORBA_AttrDescriptionSeq::CORBA_AttrDescriptionSeq (void)
 {}
 CORBA_AttrDescriptionSeq::CORBA_AttrDescriptionSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq
+_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_AttributeDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Sequence<CORBA_AttributeDescription>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 CORBA_AttrDescriptionSeq::CORBA_AttrDescriptionSeq (CORBA::ULong max, CORBA::ULong length, CORBA_AttributeDescription *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq
+_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_AttributeDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Sequence<CORBA_AttributeDescription>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 CORBA_AttrDescriptionSeq::CORBA_AttrDescriptionSeq (const CORBA_AttrDescriptionSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq
+_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_AttributeDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Sequence<CORBA_AttributeDescription>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 CORBA_AttrDescriptionSeq::~CORBA_AttrDescriptionSeq (void) // dtor
 {}
-void CORBA_AttrDescriptionSeq::_tao_any_destructor (void *x)
+void CORBA_AttrDescriptionSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_AttrDescriptionSeq *tmp = ACE_static_cast (CORBA_AttrDescriptionSeq*,x);
+  CORBA_AttrDescriptionSeq *tmp = ACE_static_cast (CORBA_AttrDescriptionSeq*, _tao_void_pointer);
   delete tmp;
 }
 
 
 #endif /* end #if !defined */
 
+
 CORBA_InterfaceDef_ptr
 tao_CORBA_InterfaceDef_duplicate (
     CORBA_InterfaceDef_ptr p
@@ -24002,7 +24542,7 @@ CORBA_InterfaceDef_var::operator const ::CORBA_InterfaceDef_ptr &() const // cas
   return this->ptr_;
 }
 
-CORBA_InterfaceDef_var::operator ::CORBA_InterfaceDef_ptr &() // cast 
+CORBA_InterfaceDef_var::operator ::CORBA_InterfaceDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -24078,7 +24618,7 @@ CORBA_InterfaceDef_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class CORBA_InterfaceDef_out
+// Operations for class CORBA_InterfaceDef_out
 // *************************************************************
 
 CORBA_InterfaceDef_out::CORBA_InterfaceDef_out (CORBA_InterfaceDef_ptr &p)
@@ -24144,24 +24684,24 @@ public:
   TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -24178,7 +24718,7 @@ private:
 TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -24191,7 +24731,7 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::arguments (CORBA::
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -24203,12 +24743,12 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::exceptions (CORBA:
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -24217,17 +24757,17 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (CORBA::Env
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (CORBA_InterfaceDefSeq * result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -24238,24 +24778,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -24265,14 +24805,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set &);
 
   const CORBA_InterfaceDefSeq & base_interfaces_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     base_interfaces_ (base_interfaces)
@@ -24286,15 +24826,16 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::arguments (CORBA::
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_base_interfaces = parameter_list->length ();
-  parameter_list->length (length_base_interfaces + 1);
-  (*parameter_list)[length_base_interfaces].argument <<=  this->base_interfaces_;
-  
-  (*parameter_list)[length_base_interfaces].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<=  this->base_interfaces_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -24306,12 +24847,12 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::exceptions (CORBA:
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -24320,7 +24861,7 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::result (CORBA::Env
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -24331,24 +24872,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * interface_id,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -24367,7 +24908,7 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::TAO_ClientRequestInfo_CORBA_Inter
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const char * interface_id,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     interface_id_ (interface_id)
@@ -24381,14 +24922,16 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::arguments (CORBA::Environment &AC
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_interface_id = parameter_list->length ();
-  parameter_list->length (length_interface_id + 1);
-  (*parameter_list)[length_interface_id].argument <<= interface_id_;
-  (*parameter_list)[length_interface_id].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= interface_id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -24400,12 +24943,12 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::exceptions (CORBA::Environment &A
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -24414,17 +24957,17 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::result (CORBA::Environment &ACE_T
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= CORBA::Any::from_boolean (this->_result);
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::result (CORBA::Boolean result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -24434,24 +24977,24 @@ public:
   TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -24468,7 +25011,7 @@ private:
 TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -24481,7 +25024,7 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::arguments (CORBA::E
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -24493,12 +25036,12 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::exceptions (CORBA::
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -24507,17 +25050,17 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::result (CORBA::Envi
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::result (CORBA_InterfaceDef::FullInterfaceDescription * result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -24532,24 +25075,24 @@ public:
       const char * version,
       CORBA_IDLType_ptr type,
       CORBA::AttributeMode & mode,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -24576,7 +25119,7 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::TAO_ClientRequestInfo
     const char * version,
     CORBA_IDLType_ptr type,
     CORBA::AttributeMode & mode,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -24594,36 +25137,28 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::arguments (CORBA::Env
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_type = parameter_list->length ();
-  parameter_list->length (length_type + 1);
-  (*parameter_list)[length_type].argument <<=  this->type_;
-  
-  (*parameter_list)[length_type].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_mode = parameter_list->length ();
-  parameter_list->length (length_mode + 1);
-  (*parameter_list)[length_mode].argument <<=  this->mode_;
-  
-  (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (5);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= version_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->type_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->mode_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -24635,12 +25170,12 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::exceptions (CORBA::En
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -24649,17 +25184,17 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::result (CORBA::Enviro
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::result (CORBA_AttributeDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -24677,24 +25212,24 @@ public:
       const CORBA_ParDescriptionSeq & params,
       const CORBA_ExceptionDefSeq & exceptions,
       const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -24727,7 +25262,7 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::TAO_ClientRequestInfo
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
     const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -24748,54 +25283,37 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::arguments (CORBA::Env
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_result = parameter_list->length ();
-  parameter_list->length (length_result + 1);
-  (*parameter_list)[length_result].argument <<=  this->result_;
-  
-  (*parameter_list)[length_result].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_mode = parameter_list->length ();
-  parameter_list->length (length_mode + 1);
-  (*parameter_list)[length_mode].argument <<=  this->mode_;
-  
-  (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_params = parameter_list->length ();
-  parameter_list->length (length_params + 1);
-  (*parameter_list)[length_params].argument <<=  this->params_;
-  
-  (*parameter_list)[length_params].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_exceptions = parameter_list->length ();
-  parameter_list->length (length_exceptions + 1);
-  (*parameter_list)[length_exceptions].argument <<=  this->exceptions_;
-  
-  (*parameter_list)[length_exceptions].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_contexts = parameter_list->length ();
-  parameter_list->length (length_contexts + 1);
-  (*parameter_list)[length_contexts].argument <<=  this->contexts_;
-  
-  (*parameter_list)[length_contexts].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (8);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= version_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->result_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->mode_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->params_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->exceptions_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->contexts_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -24807,12 +25325,12 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::exceptions (CORBA::En
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -24821,24 +25339,24 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::result (CORBA::Enviro
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::result (CORBA_OperationDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 _TAO_CORBA_InterfaceDef_Proxy_Impl::_TAO_CORBA_InterfaceDef_Proxy_Impl (void)
@@ -24857,15 +25375,15 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfac
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_InterfaceDefSeq *_tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   ACE_NEW_RETURN (_tao_retval, CORBA_InterfaceDefSeq, _tao_retval);
   CORBA_InterfaceDefSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -24876,17 +25394,21 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfac
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get ri (
         &_tao_call,
@@ -24894,43 +25416,66 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfac
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -24940,74 +25485,55 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfac
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_InterfaceDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_InterfaceDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
@@ -25019,15 +25545,15 @@ void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_base_interfaces",
@@ -25036,17 +25562,21 @@ void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set ri (
         &_tao_call,
@@ -25055,31 +25585,40 @@ void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << base_interfaces)
@@ -25087,79 +25626,76 @@ void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 CORBA::Boolean _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::is_a (
@@ -25171,15 +25707,15 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::is_a (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA::Boolean _tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "is_a",
@@ -25188,17 +25724,21 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::is_a (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a ri (
         &_tao_call,
@@ -25207,31 +25747,40 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::is_a (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN  (_tao_retval);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << interface_id)
@@ -25240,20 +25789,33 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::is_a (
               CORBA::MARSHAL (),
               _tao_retval
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
@@ -25263,73 +25825,54 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::is_a (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA::Boolean  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA::Boolean _tao_retval_info = _tao_retval;
+          ri.result (_tao_retval_info);
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN  (_tao_retval);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_retval;
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN  (_tao_retval);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_retval;
 }
 
 CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::describe_interface (
@@ -25340,14 +25883,14 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_Remote_Pr
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_InterfaceDef::FullInterfaceDescription *_tao_retval = 0;
-  
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   ACE_NEW_RETURN (_tao_retval, CORBA_InterfaceDef::FullInterfaceDescription, _tao_retval);
   CORBA_InterfaceDef::FullInterfaceDescription_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -25358,17 +25901,21 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_Remote_Pr
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface ri (
         &_tao_call,
@@ -25376,43 +25923,66 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_Remote_Pr
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -25422,74 +25992,55 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_Remote_Pr
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_InterfaceDef::FullInterfaceDescription * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_InterfaceDef::FullInterfaceDescription * _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_attribute (
@@ -25505,16 +26056,16 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_attribu
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_AttributeDef_ptr _tao_retval = CORBA_AttributeDef::_nil ();
   CORBA_AttributeDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_attribute",
@@ -25523,17 +26074,21 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_attribu
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute ri (
         &_tao_call,
@@ -25546,31 +26101,40 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_attribu
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << id) &&
@@ -25583,20 +26147,33 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_attribu
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -25606,74 +26183,55 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_attribu
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_AttributeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_AttributeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_operation (
@@ -25692,16 +26250,16 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_operati
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_OperationDef_ptr _tao_retval = CORBA_OperationDef::_nil ();
   CORBA_OperationDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_operation",
@@ -25710,17 +26268,21 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_operati
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation ri (
         &_tao_call,
@@ -25736,31 +26298,40 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_operati
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << id) &&
@@ -25776,20 +26347,33 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_operati
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -25799,79 +26383,60 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_operati
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_OperationDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_OperationDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -25941,17 +26506,17 @@ CORBA_InterfaceDef::CORBA_InterfaceDef_setup_collocation (int collocated)
   else
     this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_ =
       ::_TAO_CORBA_InterfaceDef_Remote_Proxy_Broker::the_TAO_CORBA_InterfaceDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_Container_setup_collocation (collocated);
-  
+
   this->CORBA_Contained_setup_collocation (collocated);
-  
+
   this->CORBA_IDLType_setup_collocation (collocated);
 }
 
-void CORBA_InterfaceDef::_tao_any_destructor (void *x)
+void CORBA_InterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_InterfaceDef *tmp = ACE_static_cast (CORBA_InterfaceDef*,x);
+  CORBA_InterfaceDef *tmp = ACE_static_cast (CORBA_InterfaceDef*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -25998,14 +26563,14 @@ CORBA_InterfaceDef_ptr CORBA_InterfaceDef::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           CORBA_InterfaceDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::CORBA_InterfaceDef (stub, 0, obj->_servant ()), CORBA_InterfaceDef::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -26101,7 +26666,7 @@ void *CORBA_InterfaceDef::_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;
@@ -26119,10 +26684,10 @@ CORBA_InterfaceDefSeq * CORBA_InterfaceDef::base_interfaces (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.base_interfaces (
       this,
       ACE_TRY_ENV
@@ -26137,10 +26702,10 @@ void CORBA_InterfaceDef::base_interfaces (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.base_interfaces (
       this,
       base_interfaces,
@@ -26156,10 +26721,10 @@ CORBA::Boolean CORBA_InterfaceDef::is_a (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.is_a (
       this,
       interface_id,
@@ -26171,51 +26736,51 @@ static const CORBA::Long _oc_CORBA_InterfaceDef_FullInterfaceDescription[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   60,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f496e), 
-  ACE_NTOHL (0x74657266), 
-  ACE_NTOHL (0x61636544), 
-  ACE_NTOHL (0x65662f46), 
-  ACE_NTOHL (0x756c6c49), 
-  ACE_NTOHL (0x6e746572), 
-  ACE_NTOHL (0x66616365), 
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
-  ACE_NTOHL (0x696f6e3a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f496e),
+  ACE_NTOHL (0x74657266),
+  ACE_NTOHL (0x61636544),
+  ACE_NTOHL (0x65662f46),
+  ACE_NTOHL (0x756c6c49),
+  ACE_NTOHL (0x6e746572),
+  ACE_NTOHL (0x66616365),
+  ACE_NTOHL (0x44657363),
+  ACE_NTOHL (0x72697074),
+  ACE_NTOHL (0x696f6e3a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef/FullInterfaceDescription:1.0
   25,
-  ACE_NTOHL (0x46756c6c), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72666163), 
-  ACE_NTOHL (0x65446573), 
-  ACE_NTOHL (0x63726970), 
-  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x46756c6c),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72666163),
+  ACE_NTOHL (0x65446573),
+  ACE_NTOHL (0x63726970),
+  ACE_NTOHL (0x74696f6e),
   ACE_NTOHL (0x0),  // name = FullInterfaceDescription
   8, // member count
   5,
-  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x6e616d65),
   ACE_NTOHL (0x0),  // name = name
   CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4964), 
-    ACE_NTOHL (0x656e7469), 
-    ACE_NTOHL (0x66696572), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4964),
+    ACE_NTOHL (0x656e7469),
+    ACE_NTOHL (0x66696572),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
     11,
-    ACE_NTOHL (0x4964656e), 
-    ACE_NTOHL (0x74696669), 
+    ACE_NTOHL (0x4964656e),
+    ACE_NTOHL (0x74696669),
     ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
   3,
@@ -26224,94 +26789,94 @@ static const CORBA::Long _oc_CORBA_InterfaceDef_FullInterfaceDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49643a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x49643a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
     13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669), 
-  ACE_NTOHL (0x6e65645f), 
+  ACE_NTOHL (0x64656669),
+  ACE_NTOHL (0x6e65645f),
   ACE_NTOHL (0x696e0000),  // name = defined_in
   CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49643a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x49643a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
     13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
   8,
-  ACE_NTOHL (0x76657273), 
+  ACE_NTOHL (0x76657273),
   ACE_NTOHL (0x696f6e00),  // name = version
   CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5665), 
-    ACE_NTOHL (0x7273696f), 
-    ACE_NTOHL (0x6e537065), 
-    ACE_NTOHL (0x633a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5665),
+    ACE_NTOHL (0x7273696f),
+    ACE_NTOHL (0x6e537065),
+    ACE_NTOHL (0x633a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
     12,
-    ACE_NTOHL (0x56657273), 
-    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x56657273),
+    ACE_NTOHL (0x696f6e53),
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
   11,
-  ACE_NTOHL (0x6f706572), 
-  ACE_NTOHL (0x6174696f), 
+  ACE_NTOHL (0x6f706572),
+  ACE_NTOHL (0x6174696f),
   ACE_NTOHL (0x6e730000),  // name = operations
   CORBA::tk_alias, // typecode kind for typedefs
   2036, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     39,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4f70), 
-    ACE_NTOHL (0x44657363), 
-    ACE_NTOHL (0x72697074), 
-    ACE_NTOHL (0x696f6e53), 
-    ACE_NTOHL (0x65713a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4f70),
+    ACE_NTOHL (0x44657363),
+    ACE_NTOHL (0x72697074),
+    ACE_NTOHL (0x696f6e53),
+    ACE_NTOHL (0x65713a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OpDescriptionSeq:1.0
     17,
-    ACE_NTOHL (0x4f704465), 
-    ACE_NTOHL (0x73637269), 
-    ACE_NTOHL (0x7074696f), 
-    ACE_NTOHL (0x6e536571), 
+    ACE_NTOHL (0x4f704465),
+    ACE_NTOHL (0x73637269),
+    ACE_NTOHL (0x7074696f),
+    ACE_NTOHL (0x6e536571),
     ACE_NTOHL (0x0),  // name = OpDescriptionSeq
     CORBA::tk_sequence, // typecode kind
     1956, // encapsulation length
@@ -26320,46 +26885,46 @@ static const CORBA::Long _oc_CORBA_InterfaceDef_FullInterfaceDescription[] =
       1940, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4f70), 
-        ACE_NTOHL (0x65726174), 
-        ACE_NTOHL (0x696f6e44), 
-        ACE_NTOHL (0x65736372), 
-        ACE_NTOHL (0x69707469), 
-        ACE_NTOHL (0x6f6e3a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4f70),
+        ACE_NTOHL (0x65726174),
+        ACE_NTOHL (0x696f6e44),
+        ACE_NTOHL (0x65736372),
+        ACE_NTOHL (0x69707469),
+        ACE_NTOHL (0x6f6e3a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
         21,
-        ACE_NTOHL (0x4f706572), 
-        ACE_NTOHL (0x6174696f), 
-        ACE_NTOHL (0x6e446573), 
-        ACE_NTOHL (0x63726970), 
-        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x4f706572),
+        ACE_NTOHL (0x6174696f),
+        ACE_NTOHL (0x6e446573),
+        ACE_NTOHL (0x63726970),
+        ACE_NTOHL (0x74696f6e),
         ACE_NTOHL (0x0),  // name = OperationDescription
         9, // member count
         5,
-        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x6e616d65),
         ACE_NTOHL (0x0),  // name = name
         CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4964), 
-          ACE_NTOHL (0x656e7469), 
-          ACE_NTOHL (0x66696572), 
-          ACE_NTOHL (0x3a312e30), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4964),
+          ACE_NTOHL (0x656e7469),
+          ACE_NTOHL (0x66696572),
+          ACE_NTOHL (0x3a312e30),
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
           11,
-          ACE_NTOHL (0x4964656e), 
-          ACE_NTOHL (0x74696669), 
+          ACE_NTOHL (0x4964656e),
+          ACE_NTOHL (0x74696669),
           ACE_NTOHL (0x65720000),  // name = Identifier
-          CORBA::tk_string, 
+          CORBA::tk_string,
           0U, // string length
 
         3,
@@ -26368,128 +26933,128 @@ static const CORBA::Long _oc_CORBA_InterfaceDef_FullInterfaceDescription[] =
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5265), 
-          ACE_NTOHL (0x706f7369), 
-          ACE_NTOHL (0x746f7279), 
-          ACE_NTOHL (0x49643a31), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5265),
+          ACE_NTOHL (0x706f7369),
+          ACE_NTOHL (0x746f7279),
+          ACE_NTOHL (0x49643a31),
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
           13,
-          ACE_NTOHL (0x5265706f), 
-          ACE_NTOHL (0x7369746f), 
-          ACE_NTOHL (0x72794964), 
+          ACE_NTOHL (0x5265706f),
+          ACE_NTOHL (0x7369746f),
+          ACE_NTOHL (0x72794964),
           ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
+          CORBA::tk_string,
           0U, // string length
 
         11,
-        ACE_NTOHL (0x64656669), 
-        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x64656669),
+        ACE_NTOHL (0x6e65645f),
         ACE_NTOHL (0x696e0000),  // name = defined_in
         CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5265), 
-          ACE_NTOHL (0x706f7369), 
-          ACE_NTOHL (0x746f7279), 
-          ACE_NTOHL (0x49643a31), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5265),
+          ACE_NTOHL (0x706f7369),
+          ACE_NTOHL (0x746f7279),
+          ACE_NTOHL (0x49643a31),
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
           13,
-          ACE_NTOHL (0x5265706f), 
-          ACE_NTOHL (0x7369746f), 
-          ACE_NTOHL (0x72794964), 
+          ACE_NTOHL (0x5265706f),
+          ACE_NTOHL (0x7369746f),
+          ACE_NTOHL (0x72794964),
           ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
+          CORBA::tk_string,
           0U, // string length
 
         8,
-        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x76657273),
         ACE_NTOHL (0x696f6e00),  // name = version
         CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           34,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5665), 
-          ACE_NTOHL (0x7273696f), 
-          ACE_NTOHL (0x6e537065), 
-          ACE_NTOHL (0x633a312e), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5665),
+          ACE_NTOHL (0x7273696f),
+          ACE_NTOHL (0x6e537065),
+          ACE_NTOHL (0x633a312e),
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
           12,
-          ACE_NTOHL (0x56657273), 
-          ACE_NTOHL (0x696f6e53), 
+          ACE_NTOHL (0x56657273),
+          ACE_NTOHL (0x696f6e53),
           ACE_NTOHL (0x70656300),  // name = VersionSpec
-          CORBA::tk_string, 
+          CORBA::tk_string,
           0U, // string length
 
         7,
-        ACE_NTOHL (0x72657375), 
+        ACE_NTOHL (0x72657375),
         ACE_NTOHL (0x6c740000),  // name = result
         CORBA::tk_TypeCode,
 
         5,
-        ACE_NTOHL (0x6d6f6465), 
+        ACE_NTOHL (0x6d6f6465),
         ACE_NTOHL (0x0),  // name = mode
         CORBA::tk_enum, // typecode kind
         100, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           36,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4f70), 
-          ACE_NTOHL (0x65726174), 
-          ACE_NTOHL (0x696f6e4d), 
-          ACE_NTOHL (0x6f64653a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4f70),
+          ACE_NTOHL (0x65726174),
+          ACE_NTOHL (0x696f6e4d),
+          ACE_NTOHL (0x6f64653a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
           14,
-          ACE_NTOHL (0x4f706572), 
-          ACE_NTOHL (0x6174696f), 
-          ACE_NTOHL (0x6e4d6f64), 
+          ACE_NTOHL (0x4f706572),
+          ACE_NTOHL (0x6174696f),
+          ACE_NTOHL (0x6e4d6f64),
           ACE_NTOHL (0x65000000),  // name = OperationMode
           2, // member count
           10,
-          ACE_NTOHL (0x4f505f4e), 
-          ACE_NTOHL (0x4f524d41), 
+          ACE_NTOHL (0x4f505f4e),
+          ACE_NTOHL (0x4f524d41),
           ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
           10,
-          ACE_NTOHL (0x4f505f4f), 
-          ACE_NTOHL (0x4e455741), 
+          ACE_NTOHL (0x4f505f4f),
+          ACE_NTOHL (0x4e455741),
           ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
 
         9,
-        ACE_NTOHL (0x636f6e74), 
-        ACE_NTOHL (0x65787473), 
+        ACE_NTOHL (0x636f6e74),
+        ACE_NTOHL (0x65787473),
         ACE_NTOHL (0x0),  // name = contexts
         CORBA::tk_alias, // typecode kind for typedefs
         236, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f436f), 
-          ACE_NTOHL (0x6e746578), 
-          ACE_NTOHL (0x74496453), 
-          ACE_NTOHL (0x65713a31), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f436f),
+          ACE_NTOHL (0x6e746578),
+          ACE_NTOHL (0x74496453),
+          ACE_NTOHL (0x65713a31),
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
           13,
-          ACE_NTOHL (0x436f6e74), 
-          ACE_NTOHL (0x65787449), 
-          ACE_NTOHL (0x64536571), 
+          ACE_NTOHL (0x436f6e74),
+          ACE_NTOHL (0x65787449),
+          ACE_NTOHL (0x64536571),
           ACE_NTOHL (0x0),  // name = ContextIdSeq
           CORBA::tk_sequence, // typecode kind
           164, // encapsulation length
@@ -26498,40 +27063,40 @@ static const CORBA::Long _oc_CORBA_InterfaceDef_FullInterfaceDescription[] =
             148, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               40,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f436f), 
-              ACE_NTOHL (0x6e746578), 
-              ACE_NTOHL (0x74496465), 
-              ACE_NTOHL (0x6e746966), 
-              ACE_NTOHL (0x6965723a), 
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x6f6d672e),
+              ACE_NTOHL (0x6f72672f),
+              ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f436f),
+              ACE_NTOHL (0x6e746578),
+              ACE_NTOHL (0x74496465),
+              ACE_NTOHL (0x6e746966),
+              ACE_NTOHL (0x6965723a),
               ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
               18,
-              ACE_NTOHL (0x436f6e74), 
-              ACE_NTOHL (0x65787449), 
-              ACE_NTOHL (0x64656e74), 
-              ACE_NTOHL (0x69666965), 
+              ACE_NTOHL (0x436f6e74),
+              ACE_NTOHL (0x65787449),
+              ACE_NTOHL (0x64656e74),
+              ACE_NTOHL (0x69666965),
               ACE_NTOHL (0x72000000),  // name = ContextIdentifier
               CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f4964), 
-                ACE_NTOHL (0x656e7469), 
-                ACE_NTOHL (0x66696572), 
-                ACE_NTOHL (0x3a312e30), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f4964),
+                ACE_NTOHL (0x656e7469),
+                ACE_NTOHL (0x66696572),
+                ACE_NTOHL (0x3a312e30),
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-                ACE_NTOHL (0x4964656e), 
-                ACE_NTOHL (0x74696669), 
+                ACE_NTOHL (0x4964656e),
+                ACE_NTOHL (0x74696669),
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
+                CORBA::tk_string,
                 0U, // string length
 
 
@@ -26539,28 +27104,28 @@ static const CORBA::Long _oc_CORBA_InterfaceDef_FullInterfaceDescription[] =
 
 
         11,
-        ACE_NTOHL (0x70617261), 
-        ACE_NTOHL (0x6d657465), 
+        ACE_NTOHL (0x70617261),
+        ACE_NTOHL (0x6d657465),
         ACE_NTOHL (0x72730000),  // name = parameters
         CORBA::tk_alias, // typecode kind for typedefs
         496, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5061), 
-          ACE_NTOHL (0x72446573), 
-          ACE_NTOHL (0x63726970), 
-          ACE_NTOHL (0x74696f6e), 
-          ACE_NTOHL (0x5365713a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5061),
+          ACE_NTOHL (0x72446573),
+          ACE_NTOHL (0x63726970),
+          ACE_NTOHL (0x74696f6e),
+          ACE_NTOHL (0x5365713a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
           18,
-          ACE_NTOHL (0x50617244), 
-          ACE_NTOHL (0x65736372), 
-          ACE_NTOHL (0x69707469), 
-          ACE_NTOHL (0x6f6e5365), 
+          ACE_NTOHL (0x50617244),
+          ACE_NTOHL (0x65736372),
+          ACE_NTOHL (0x69707469),
+          ACE_NTOHL (0x6f6e5365),
           ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
           CORBA::tk_sequence, // typecode kind
           416, // encapsulation length
@@ -26569,106 +27134,106 @@ static const CORBA::Long _oc_CORBA_InterfaceDef_FullInterfaceDescription[] =
             400, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f5061), 
-              ACE_NTOHL (0x72616d65), 
-              ACE_NTOHL (0x74657244), 
-              ACE_NTOHL (0x65736372), 
-              ACE_NTOHL (0x69707469), 
-              ACE_NTOHL (0x6f6e3a31), 
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x6f6d672e),
+              ACE_NTOHL (0x6f72672f),
+              ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f5061),
+              ACE_NTOHL (0x72616d65),
+              ACE_NTOHL (0x74657244),
+              ACE_NTOHL (0x65736372),
+              ACE_NTOHL (0x69707469),
+              ACE_NTOHL (0x6f6e3a31),
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
               21,
-              ACE_NTOHL (0x50617261), 
-              ACE_NTOHL (0x6d657465), 
-              ACE_NTOHL (0x72446573), 
-              ACE_NTOHL (0x63726970), 
-              ACE_NTOHL (0x74696f6e), 
+              ACE_NTOHL (0x50617261),
+              ACE_NTOHL (0x6d657465),
+              ACE_NTOHL (0x72446573),
+              ACE_NTOHL (0x63726970),
+              ACE_NTOHL (0x74696f6e),
               ACE_NTOHL (0x0),  // name = ParameterDescription
               4, // member count
               5,
-              ACE_NTOHL (0x6e616d65), 
+              ACE_NTOHL (0x6e616d65),
               ACE_NTOHL (0x0),  // name = name
               CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f4964), 
-                ACE_NTOHL (0x656e7469), 
-                ACE_NTOHL (0x66696572), 
-                ACE_NTOHL (0x3a312e30), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f4964),
+                ACE_NTOHL (0x656e7469),
+                ACE_NTOHL (0x66696572),
+                ACE_NTOHL (0x3a312e30),
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-                ACE_NTOHL (0x4964656e), 
-                ACE_NTOHL (0x74696669), 
+                ACE_NTOHL (0x4964656e),
+                ACE_NTOHL (0x74696669),
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
+                CORBA::tk_string,
                 0U, // string length
 
               5,
-              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x74797065),
               ACE_NTOHL (0x0),  // name = type
               CORBA::tk_TypeCode,
 
               9,
-              ACE_NTOHL (0x74797065), 
-              ACE_NTOHL (0x5f646566), 
+              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x5f646566),
               ACE_NTOHL (0x0),  // name = type_def
               CORBA::tk_objref, // typecode kind
               52, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 30,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f4944), 
-                ACE_NTOHL (0x4c547970), 
-                ACE_NTOHL (0x653a312e), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f4944),
+                ACE_NTOHL (0x4c547970),
+                ACE_NTOHL (0x653a312e),
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
                 8,
-                ACE_NTOHL (0x49444c54), 
+                ACE_NTOHL (0x49444c54),
                 ACE_NTOHL (0x79706500),  // name = IDLType
 
               5,
-              ACE_NTOHL (0x6d6f6465), 
+              ACE_NTOHL (0x6d6f6465),
               ACE_NTOHL (0x0),  // name = mode
               CORBA::tk_enum, // typecode kind
               116, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 36,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f5061), 
-                ACE_NTOHL (0x72616d65), 
-                ACE_NTOHL (0x7465724d), 
-                ACE_NTOHL (0x6f64653a), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f5061),
+                ACE_NTOHL (0x72616d65),
+                ACE_NTOHL (0x7465724d),
+                ACE_NTOHL (0x6f64653a),
                 ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
                 14,
-                ACE_NTOHL (0x50617261), 
-                ACE_NTOHL (0x6d657465), 
-                ACE_NTOHL (0x724d6f64), 
+                ACE_NTOHL (0x50617261),
+                ACE_NTOHL (0x6d657465),
+                ACE_NTOHL (0x724d6f64),
                 ACE_NTOHL (0x65000000),  // name = ParameterMode
                 3, // member count
                 9,
-                ACE_NTOHL (0x50415241), 
-                ACE_NTOHL (0x4d5f494e), 
+                ACE_NTOHL (0x50415241),
+                ACE_NTOHL (0x4d5f494e),
                 ACE_NTOHL (0x0),  // name = PARAM_IN
                 10,
-                ACE_NTOHL (0x50415241), 
-                ACE_NTOHL (0x4d5f4f55), 
+                ACE_NTOHL (0x50415241),
+                ACE_NTOHL (0x4d5f4f55),
                 ACE_NTOHL (0x54000000),  // name = PARAM_OUT
                 12,
-                ACE_NTOHL (0x50415241), 
-                ACE_NTOHL (0x4d5f494e), 
+                ACE_NTOHL (0x50415241),
+                ACE_NTOHL (0x4d5f494e),
                 ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
 
 
@@ -26676,28 +27241,28 @@ static const CORBA::Long _oc_CORBA_InterfaceDef_FullInterfaceDescription[] =
 
 
         11,
-        ACE_NTOHL (0x65786365), 
-        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x65786365),
+        ACE_NTOHL (0x7074696f),
         ACE_NTOHL (0x6e730000),  // name = exceptions
         CORBA::tk_alias, // typecode kind for typedefs
         556, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4578), 
-          ACE_NTOHL (0x63446573), 
-          ACE_NTOHL (0x63726970), 
-          ACE_NTOHL (0x74696f6e), 
-          ACE_NTOHL (0x5365713a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4578),
+          ACE_NTOHL (0x63446573),
+          ACE_NTOHL (0x63726970),
+          ACE_NTOHL (0x74696f6e),
+          ACE_NTOHL (0x5365713a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
           18,
-          ACE_NTOHL (0x45786344), 
-          ACE_NTOHL (0x65736372), 
-          ACE_NTOHL (0x69707469), 
-          ACE_NTOHL (0x6f6e5365), 
+          ACE_NTOHL (0x45786344),
+          ACE_NTOHL (0x65736372),
+          ACE_NTOHL (0x69707469),
+          ACE_NTOHL (0x6f6e5365),
           ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
           CORBA::tk_sequence, // typecode kind
           476, // encapsulation length
@@ -26706,46 +27271,46 @@ static const CORBA::Long _oc_CORBA_InterfaceDef_FullInterfaceDescription[] =
             460, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f4578), 
-              ACE_NTOHL (0x63657074), 
-              ACE_NTOHL (0x696f6e44), 
-              ACE_NTOHL (0x65736372), 
-              ACE_NTOHL (0x69707469), 
-              ACE_NTOHL (0x6f6e3a31), 
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x6f6d672e),
+              ACE_NTOHL (0x6f72672f),
+              ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f4578),
+              ACE_NTOHL (0x63657074),
+              ACE_NTOHL (0x696f6e44),
+              ACE_NTOHL (0x65736372),
+              ACE_NTOHL (0x69707469),
+              ACE_NTOHL (0x6f6e3a31),
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
               21,
-              ACE_NTOHL (0x45786365), 
-              ACE_NTOHL (0x7074696f), 
-              ACE_NTOHL (0x6e446573), 
-              ACE_NTOHL (0x63726970), 
-              ACE_NTOHL (0x74696f6e), 
+              ACE_NTOHL (0x45786365),
+              ACE_NTOHL (0x7074696f),
+              ACE_NTOHL (0x6e446573),
+              ACE_NTOHL (0x63726970),
+              ACE_NTOHL (0x74696f6e),
               ACE_NTOHL (0x0),  // name = ExceptionDescription
               5, // member count
               5,
-              ACE_NTOHL (0x6e616d65), 
+              ACE_NTOHL (0x6e616d65),
               ACE_NTOHL (0x0),  // name = name
               CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f4964), 
-                ACE_NTOHL (0x656e7469), 
-                ACE_NTOHL (0x66696572), 
-                ACE_NTOHL (0x3a312e30), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f4964),
+                ACE_NTOHL (0x656e7469),
+                ACE_NTOHL (0x66696572),
+                ACE_NTOHL (0x3a312e30),
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-                ACE_NTOHL (0x4964656e), 
-                ACE_NTOHL (0x74696669), 
+                ACE_NTOHL (0x4964656e),
+                ACE_NTOHL (0x74696669),
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
+                CORBA::tk_string,
                 0U, // string length
 
               3,
@@ -26754,73 +27319,73 @@ static const CORBA::Long _oc_CORBA_InterfaceDef_FullInterfaceDescription[] =
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f5265), 
-                ACE_NTOHL (0x706f7369), 
-                ACE_NTOHL (0x746f7279), 
-                ACE_NTOHL (0x49643a31), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f5265),
+                ACE_NTOHL (0x706f7369),
+                ACE_NTOHL (0x746f7279),
+                ACE_NTOHL (0x49643a31),
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-                ACE_NTOHL (0x5265706f), 
-                ACE_NTOHL (0x7369746f), 
-                ACE_NTOHL (0x72794964), 
+                ACE_NTOHL (0x5265706f),
+                ACE_NTOHL (0x7369746f),
+                ACE_NTOHL (0x72794964),
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string, 
+                CORBA::tk_string,
                 0U, // string length
 
               11,
-              ACE_NTOHL (0x64656669), 
-              ACE_NTOHL (0x6e65645f), 
+              ACE_NTOHL (0x64656669),
+              ACE_NTOHL (0x6e65645f),
               ACE_NTOHL (0x696e0000),  // name = defined_in
               CORBA::tk_alias, // typecode kind for typedefs
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f5265), 
-                ACE_NTOHL (0x706f7369), 
-                ACE_NTOHL (0x746f7279), 
-                ACE_NTOHL (0x49643a31), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f5265),
+                ACE_NTOHL (0x706f7369),
+                ACE_NTOHL (0x746f7279),
+                ACE_NTOHL (0x49643a31),
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-                ACE_NTOHL (0x5265706f), 
-                ACE_NTOHL (0x7369746f), 
-                ACE_NTOHL (0x72794964), 
+                ACE_NTOHL (0x5265706f),
+                ACE_NTOHL (0x7369746f),
+                ACE_NTOHL (0x72794964),
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string, 
+                CORBA::tk_string,
                 0U, // string length
 
               8,
-              ACE_NTOHL (0x76657273), 
+              ACE_NTOHL (0x76657273),
               ACE_NTOHL (0x696f6e00),  // name = version
               CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 34,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f5665), 
-                ACE_NTOHL (0x7273696f), 
-                ACE_NTOHL (0x6e537065), 
-                ACE_NTOHL (0x633a312e), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f5665),
+                ACE_NTOHL (0x7273696f),
+                ACE_NTOHL (0x6e537065),
+                ACE_NTOHL (0x633a312e),
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                 12,
-                ACE_NTOHL (0x56657273), 
-                ACE_NTOHL (0x696f6e53), 
+                ACE_NTOHL (0x56657273),
+                ACE_NTOHL (0x696f6e53),
                 ACE_NTOHL (0x70656300),  // name = VersionSpec
-                CORBA::tk_string, 
+                CORBA::tk_string,
                 0U, // string length
 
               5,
-              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x74797065),
               ACE_NTOHL (0x0),  // name = type
               CORBA::tk_TypeCode,
 
@@ -26833,29 +27398,29 @@ static const CORBA::Long _oc_CORBA_InterfaceDef_FullInterfaceDescription[] =
 
 
   11,
-  ACE_NTOHL (0x61747472), 
-  ACE_NTOHL (0x69627574), 
+  ACE_NTOHL (0x61747472),
+  ACE_NTOHL (0x69627574),
   ACE_NTOHL (0x65730000),  // name = attributes
   CORBA::tk_alias, // typecode kind for typedefs
   684, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     41,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4174), 
-    ACE_NTOHL (0x74724465), 
-    ACE_NTOHL (0x73637269), 
-    ACE_NTOHL (0x7074696f), 
-    ACE_NTOHL (0x6e536571), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4174),
+    ACE_NTOHL (0x74724465),
+    ACE_NTOHL (0x73637269),
+    ACE_NTOHL (0x7074696f),
+    ACE_NTOHL (0x6e536571),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/AttrDescriptionSeq:1.0
     19,
-    ACE_NTOHL (0x41747472), 
-    ACE_NTOHL (0x44657363), 
-    ACE_NTOHL (0x72697074), 
-    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x41747472),
+    ACE_NTOHL (0x44657363),
+    ACE_NTOHL (0x72697074),
+    ACE_NTOHL (0x696f6e53),
     ACE_NTOHL (0x65710000),  // name = AttrDescriptionSeq
     CORBA::tk_sequence, // typecode kind
     600, // encapsulation length
@@ -26864,46 +27429,46 @@ static const CORBA::Long _oc_CORBA_InterfaceDef_FullInterfaceDescription[] =
       584, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4174), 
-        ACE_NTOHL (0x74726962), 
-        ACE_NTOHL (0x75746544), 
-        ACE_NTOHL (0x65736372), 
-        ACE_NTOHL (0x69707469), 
-        ACE_NTOHL (0x6f6e3a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4174),
+        ACE_NTOHL (0x74726962),
+        ACE_NTOHL (0x75746544),
+        ACE_NTOHL (0x65736372),
+        ACE_NTOHL (0x69707469),
+        ACE_NTOHL (0x6f6e3a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDescription:1.0
         21,
-        ACE_NTOHL (0x41747472), 
-        ACE_NTOHL (0x69627574), 
-        ACE_NTOHL (0x65446573), 
-        ACE_NTOHL (0x63726970), 
-        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x41747472),
+        ACE_NTOHL (0x69627574),
+        ACE_NTOHL (0x65446573),
+        ACE_NTOHL (0x63726970),
+        ACE_NTOHL (0x74696f6e),
         ACE_NTOHL (0x0),  // name = AttributeDescription
         6, // member count
         5,
-        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x6e616d65),
         ACE_NTOHL (0x0),  // name = name
         CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4964), 
-          ACE_NTOHL (0x656e7469), 
-          ACE_NTOHL (0x66696572), 
-          ACE_NTOHL (0x3a312e30), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4964),
+          ACE_NTOHL (0x656e7469),
+          ACE_NTOHL (0x66696572),
+          ACE_NTOHL (0x3a312e30),
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
           11,
-          ACE_NTOHL (0x4964656e), 
-          ACE_NTOHL (0x74696669), 
+          ACE_NTOHL (0x4964656e),
+          ACE_NTOHL (0x74696669),
           ACE_NTOHL (0x65720000),  // name = Identifier
-          CORBA::tk_string, 
+          CORBA::tk_string,
           0U, // string length
 
         3,
@@ -26912,106 +27477,106 @@ static const CORBA::Long _oc_CORBA_InterfaceDef_FullInterfaceDescription[] =
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5265), 
-          ACE_NTOHL (0x706f7369), 
-          ACE_NTOHL (0x746f7279), 
-          ACE_NTOHL (0x49643a31), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5265),
+          ACE_NTOHL (0x706f7369),
+          ACE_NTOHL (0x746f7279),
+          ACE_NTOHL (0x49643a31),
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
           13,
-          ACE_NTOHL (0x5265706f), 
-          ACE_NTOHL (0x7369746f), 
-          ACE_NTOHL (0x72794964), 
+          ACE_NTOHL (0x5265706f),
+          ACE_NTOHL (0x7369746f),
+          ACE_NTOHL (0x72794964),
           ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
+          CORBA::tk_string,
           0U, // string length
 
         11,
-        ACE_NTOHL (0x64656669), 
-        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x64656669),
+        ACE_NTOHL (0x6e65645f),
         ACE_NTOHL (0x696e0000),  // name = defined_in
         CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5265), 
-          ACE_NTOHL (0x706f7369), 
-          ACE_NTOHL (0x746f7279), 
-          ACE_NTOHL (0x49643a31), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5265),
+          ACE_NTOHL (0x706f7369),
+          ACE_NTOHL (0x746f7279),
+          ACE_NTOHL (0x49643a31),
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
           13,
-          ACE_NTOHL (0x5265706f), 
-          ACE_NTOHL (0x7369746f), 
-          ACE_NTOHL (0x72794964), 
+          ACE_NTOHL (0x5265706f),
+          ACE_NTOHL (0x7369746f),
+          ACE_NTOHL (0x72794964),
           ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
+          CORBA::tk_string,
           0U, // string length
 
         8,
-        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x76657273),
         ACE_NTOHL (0x696f6e00),  // name = version
         CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           34,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5665), 
-          ACE_NTOHL (0x7273696f), 
-          ACE_NTOHL (0x6e537065), 
-          ACE_NTOHL (0x633a312e), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5665),
+          ACE_NTOHL (0x7273696f),
+          ACE_NTOHL (0x6e537065),
+          ACE_NTOHL (0x633a312e),
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
           12,
-          ACE_NTOHL (0x56657273), 
-          ACE_NTOHL (0x696f6e53), 
+          ACE_NTOHL (0x56657273),
+          ACE_NTOHL (0x696f6e53),
           ACE_NTOHL (0x70656300),  // name = VersionSpec
-          CORBA::tk_string, 
+          CORBA::tk_string,
           0U, // string length
 
         5,
-        ACE_NTOHL (0x74797065), 
+        ACE_NTOHL (0x74797065),
         ACE_NTOHL (0x0),  // name = type
         CORBA::tk_TypeCode,
 
         5,
-        ACE_NTOHL (0x6d6f6465), 
+        ACE_NTOHL (0x6d6f6465),
         ACE_NTOHL (0x0),  // name = mode
         CORBA::tk_enum, // typecode kind
         104, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           36,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4174), 
-          ACE_NTOHL (0x74726962), 
-          ACE_NTOHL (0x7574654d), 
-          ACE_NTOHL (0x6f64653a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4174),
+          ACE_NTOHL (0x74726962),
+          ACE_NTOHL (0x7574654d),
+          ACE_NTOHL (0x6f64653a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
           14,
-          ACE_NTOHL (0x41747472), 
-          ACE_NTOHL (0x69627574), 
-          ACE_NTOHL (0x654d6f64), 
+          ACE_NTOHL (0x41747472),
+          ACE_NTOHL (0x69627574),
+          ACE_NTOHL (0x654d6f64),
           ACE_NTOHL (0x65000000),  // name = AttributeMode
           2, // member count
           12,
-          ACE_NTOHL (0x41545452), 
-          ACE_NTOHL (0x5f4e4f52), 
+          ACE_NTOHL (0x41545452),
+          ACE_NTOHL (0x5f4e4f52),
           ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
           14,
-          ACE_NTOHL (0x41545452), 
-          ACE_NTOHL (0x5f524541), 
-          ACE_NTOHL (0x444f4e4c), 
+          ACE_NTOHL (0x41545452),
+          ACE_NTOHL (0x5f524541),
+          ACE_NTOHL (0x444f4e4c),
           ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
 
 
@@ -27019,28 +27584,28 @@ static const CORBA::Long _oc_CORBA_InterfaceDef_FullInterfaceDescription[] =
 
 
   16,
-  ACE_NTOHL (0x62617365), 
-  ACE_NTOHL (0x5f696e74), 
-  ACE_NTOHL (0x65726661), 
+  ACE_NTOHL (0x62617365),
+  ACE_NTOHL (0x5f696e74),
+  ACE_NTOHL (0x65726661),
   ACE_NTOHL (0x63657300),  // name = base_interfaces
   CORBA::tk_alias, // typecode kind for typedefs
   164, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49645365), 
-    ACE_NTOHL (0x713a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x49645365),
+    ACE_NTOHL (0x713a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
     16,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
     CORBA::tk_sequence, // typecode kind
     88, // encapsulation length
@@ -27049,28 +27614,28 @@ static const CORBA::Long _oc_CORBA_InterfaceDef_FullInterfaceDescription[] =
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5265), 
-        ACE_NTOHL (0x706f7369), 
-        ACE_NTOHL (0x746f7279), 
-        ACE_NTOHL (0x49643a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f5265),
+        ACE_NTOHL (0x706f7369),
+        ACE_NTOHL (0x746f7279),
+        ACE_NTOHL (0x49643a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-        ACE_NTOHL (0x5265706f), 
-        ACE_NTOHL (0x7369746f), 
-        ACE_NTOHL (0x72794964), 
+        ACE_NTOHL (0x5265706f),
+        ACE_NTOHL (0x7369746f),
+        ACE_NTOHL (0x72794964),
         ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
+        CORBA::tk_string,
         0U, // string length
 
       0U,
 
 
   5,
-  ACE_NTOHL (0x74797065), 
+  ACE_NTOHL (0x74797065),
   ACE_NTOHL (0x0),  // name = type
   CORBA::tk_TypeCode,
 
@@ -27087,9 +27652,9 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_InterfaceDef_FullInterfaceDescription (
 CORBA::TypeCode_ptr CORBA_InterfaceDef::_tc_FullInterfaceDescription =
   &_tc_TAO_tc_CORBA_InterfaceDef_FullInterfaceDescription;
 
-void CORBA_InterfaceDef::FullInterfaceDescription::_tao_any_destructor (void *x)
+void CORBA_InterfaceDef::FullInterfaceDescription::_tao_any_destructor (void *_tao_void_pointer)
 {
-  FullInterfaceDescription *tmp = ACE_static_cast (FullInterfaceDescription*,x);
+  FullInterfaceDescription *tmp = ACE_static_cast (FullInterfaceDescription*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -27100,10 +27665,10 @@ CORBA_InterfaceDef::FullInterfaceDescription * CORBA_InterfaceDef::describe_inte
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.describe_interface (
       this,
       ACE_TRY_ENV
@@ -27122,10 +27687,10 @@ CORBA_AttributeDef_ptr CORBA_InterfaceDef::create_attribute (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_attribute (
       this,
       id,
@@ -27152,10 +27717,10 @@ CORBA_OperationDef_ptr CORBA_InterfaceDef::create_operation (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_operation (
       this,
       id,
@@ -27167,12 +27732,12 @@ CORBA_OperationDef_ptr CORBA_InterfaceDef::create_operation (
       exceptions,
       contexts,
       ACE_TRY_ENV
-    );
+  );
 }
 
-void CORBA_InterfaceDescription::_tao_any_destructor (void *x)
+void CORBA_InterfaceDescription::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_InterfaceDescription *tmp = ACE_static_cast (CORBA_InterfaceDescription*,x);
+  CORBA_InterfaceDescription *tmp = ACE_static_cast (CORBA_InterfaceDescription*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -27267,7 +27832,7 @@ CORBA_AbstractInterfaceDef_var::operator const ::CORBA_AbstractInterfaceDef_ptr
   return this->ptr_;
 }
 
-CORBA_AbstractInterfaceDef_var::operator ::CORBA_AbstractInterfaceDef_ptr &() // cast 
+CORBA_AbstractInterfaceDef_var::operator ::CORBA_AbstractInterfaceDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -27343,7 +27908,7 @@ CORBA_AbstractInterfaceDef_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class CORBA_AbstractInterfaceDef_out
+// Operations for class CORBA_AbstractInterfaceDef_out
 // *************************************************************
 
 CORBA_AbstractInterfaceDef_out::CORBA_AbstractInterfaceDef_out (CORBA_AbstractInterfaceDef_ptr &p)
@@ -27406,7 +27971,7 @@ CORBA_AbstractInterfaceDef_out::operator-> (void)
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 _TAO_CORBA_AbstractInterfaceDef_Proxy_Impl::_TAO_CORBA_AbstractInterfaceDef_Proxy_Impl (void)
@@ -27419,7 +27984,7 @@ _TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Impl::_TAO_CORBA_AbstractInterfaceD
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -27489,13 +28054,13 @@ CORBA_AbstractInterfaceDef::CORBA_AbstractInterfaceDef_setup_collocation (int co
   else
     this->the_TAO_CORBA_AbstractInterfaceDef_Proxy_Broker_ =
       ::_TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker::the_TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_InterfaceDef_setup_collocation (collocated);
 }
 
-void CORBA_AbstractInterfaceDef::_tao_any_destructor (void *x)
+void CORBA_AbstractInterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_AbstractInterfaceDef *tmp = ACE_static_cast (CORBA_AbstractInterfaceDef*,x);
+  CORBA_AbstractInterfaceDef *tmp = ACE_static_cast (CORBA_AbstractInterfaceDef*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -27542,14 +28107,14 @@ CORBA_AbstractInterfaceDef_ptr CORBA_AbstractInterfaceDef::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           CORBA_AbstractInterfaceDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::CORBA_AbstractInterfaceDef (stub, 0, obj->_servant ()), CORBA_AbstractInterfaceDef::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -27658,7 +28223,7 @@ void *CORBA_AbstractInterfaceDef::_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;
@@ -27760,7 +28325,7 @@ CORBA_LocalInterfaceDef_var::operator const ::CORBA_LocalInterfaceDef_ptr &() co
   return this->ptr_;
 }
 
-CORBA_LocalInterfaceDef_var::operator ::CORBA_LocalInterfaceDef_ptr &() // cast 
+CORBA_LocalInterfaceDef_var::operator ::CORBA_LocalInterfaceDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -27836,7 +28401,7 @@ CORBA_LocalInterfaceDef_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class CORBA_LocalInterfaceDef_out
+// Operations for class CORBA_LocalInterfaceDef_out
 // *************************************************************
 
 CORBA_LocalInterfaceDef_out::CORBA_LocalInterfaceDef_out (CORBA_LocalInterfaceDef_ptr &p)
@@ -27899,7 +28464,7 @@ CORBA_LocalInterfaceDef_out::operator-> (void)
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 _TAO_CORBA_LocalInterfaceDef_Proxy_Impl::_TAO_CORBA_LocalInterfaceDef_Proxy_Impl (void)
@@ -27912,7 +28477,7 @@ _TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Impl::_TAO_CORBA_LocalInterfaceDef_Rem
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -27982,13 +28547,13 @@ CORBA_LocalInterfaceDef::CORBA_LocalInterfaceDef_setup_collocation (int collocat
   else
     this->the_TAO_CORBA_LocalInterfaceDef_Proxy_Broker_ =
       ::_TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker::the_TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_InterfaceDef_setup_collocation (collocated);
 }
 
-void CORBA_LocalInterfaceDef::_tao_any_destructor (void *x)
+void CORBA_LocalInterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_LocalInterfaceDef *tmp = ACE_static_cast (CORBA_LocalInterfaceDef*,x);
+  CORBA_LocalInterfaceDef *tmp = ACE_static_cast (CORBA_LocalInterfaceDef*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -28035,14 +28600,14 @@ CORBA_LocalInterfaceDef_ptr CORBA_LocalInterfaceDef::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           CORBA_LocalInterfaceDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::CORBA_LocalInterfaceDef (stub, 0, obj->_servant ()), CORBA_LocalInterfaceDef::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -28151,7 +28716,7 @@ void *CORBA_LocalInterfaceDef::_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;
@@ -28178,13 +28743,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PrimitiveKind &_t
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_PrimitiveKind, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -28208,7 +28773,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_Repository_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        CORBA::_tc_Repository, 
+        CORBA::_tc_Repository,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -28224,13 +28789,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_Repository_ptr &_t
   {
     _tao_elem = CORBA_Repository::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_Repository, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -28269,7 +28834,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_ModuleDef_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        CORBA::_tc_ModuleDef, 
+        CORBA::_tc_ModuleDef,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -28285,13 +28850,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ModuleDef_ptr &_ta
   {
     _tao_elem = CORBA_ModuleDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_ModuleDef, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -28360,13 +28925,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ModuleDescri
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_ModuleDescription, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -28413,7 +28978,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_ConstantDef_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        CORBA::_tc_ConstantDef, 
+        CORBA::_tc_ConstantDef,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -28429,13 +28994,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ConstantDef_ptr &_
   {
     _tao_elem = CORBA_ConstantDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_ConstantDef, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -28504,13 +29069,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ConstantDesc
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_ConstantDescription, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -28557,7 +29122,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_StructDef_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        CORBA::_tc_StructDef, 
+        CORBA::_tc_StructDef,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -28573,13 +29138,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_StructDef_ptr &_ta
   {
     _tao_elem = CORBA_StructDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_StructDef, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -28618,7 +29183,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_UnionDef_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        CORBA::_tc_UnionDef, 
+        CORBA::_tc_UnionDef,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -28634,13 +29199,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_UnionDef_ptr &_tao
   {
     _tao_elem = CORBA_UnionDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_UnionDef, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -28679,7 +29244,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_EnumDef_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        CORBA::_tc_EnumDef, 
+        CORBA::_tc_EnumDef,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -28695,13 +29260,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_EnumDef_ptr &_tao_
   {
     _tao_elem = CORBA_EnumDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_EnumDef, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -28740,7 +29305,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_AliasDef_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        CORBA::_tc_AliasDef, 
+        CORBA::_tc_AliasDef,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -28756,13 +29321,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_AliasDef_ptr &_tao
   {
     _tao_elem = CORBA_AliasDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_AliasDef, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -28801,7 +29366,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_NativeDef_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        CORBA::_tc_NativeDef, 
+        CORBA::_tc_NativeDef,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -28817,13 +29382,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_NativeDef_ptr &_ta
   {
     _tao_elem = CORBA_NativeDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_NativeDef, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -28862,7 +29427,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_PrimitiveDef_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        CORBA::_tc_PrimitiveDef, 
+        CORBA::_tc_PrimitiveDef,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -28878,13 +29443,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_PrimitiveDef_ptr &
   {
     _tao_elem = CORBA_PrimitiveDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_PrimitiveDef, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -28923,7 +29488,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_StringDef_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        CORBA::_tc_StringDef, 
+        CORBA::_tc_StringDef,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -28939,13 +29504,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_StringDef_ptr &_ta
   {
     _tao_elem = CORBA_StringDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_StringDef, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -28984,7 +29549,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_WstringDef_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        CORBA::_tc_WstringDef, 
+        CORBA::_tc_WstringDef,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -29000,13 +29565,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_WstringDef_ptr &_t
   {
     _tao_elem = CORBA_WstringDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_WstringDef, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -29045,7 +29610,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_SequenceDef_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        CORBA::_tc_SequenceDef, 
+        CORBA::_tc_SequenceDef,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -29061,13 +29626,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_SequenceDef_ptr &_
   {
     _tao_elem = CORBA_SequenceDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_SequenceDef, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -29106,7 +29671,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_ArrayDef_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        CORBA::_tc_ArrayDef, 
+        CORBA::_tc_ArrayDef,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -29122,13 +29687,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ArrayDef_ptr &_tao
   {
     _tao_elem = CORBA_ArrayDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_ArrayDef, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -29167,7 +29732,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_ExceptionDef_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        CORBA::_tc_ExceptionDef, 
+        CORBA::_tc_ExceptionDef,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -29183,13 +29748,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ExceptionDef_ptr &
   {
     _tao_elem = CORBA_ExceptionDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_ExceptionDef, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -29258,13 +29823,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ExceptionDes
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_ExceptionDescription, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -29349,13 +29914,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ExceptionDef
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_ExceptionDefSeq, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -29440,13 +30005,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ExcDescripti
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_ExcDescriptionSeq, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -29503,13 +30068,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::AttributeMode &_t
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_AttributeMode, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -29533,7 +30098,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_AttributeDef_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        CORBA::_tc_AttributeDef, 
+        CORBA::_tc_AttributeDef,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -29549,13 +30114,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_AttributeDef_ptr &
   {
     _tao_elem = CORBA_AttributeDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_AttributeDef, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -29624,13 +30189,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_AttributeDes
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_AttributeDescription, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -29687,13 +30252,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::OperationMode &_t
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_OperationMode, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -29727,13 +30292,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ParameterMode &_t
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_ParameterMode, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -29787,13 +30352,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ParameterDes
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_ParameterDescription, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -29878,13 +30443,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ParDescripti
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_ParDescriptionSeq, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -29969,13 +30534,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ContextIdSeq
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_ContextIdSeq, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -30022,7 +30587,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_OperationDef_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        CORBA::_tc_OperationDef, 
+        CORBA::_tc_OperationDef,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -30038,13 +30603,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_OperationDef_ptr &
   {
     _tao_elem = CORBA_OperationDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_OperationDef, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -30113,13 +30678,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_OperationDes
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_OperationDescription, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -30204,13 +30769,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_RepositoryId
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_RepositoryIdSeq, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -30295,13 +30860,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_OpDescriptio
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_OpDescriptionSeq, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -30386,13 +30951,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_AttrDescript
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_AttrDescriptionSeq, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -30439,7 +31004,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_InterfaceDef_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        CORBA::_tc_InterfaceDef, 
+        CORBA::_tc_InterfaceDef,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -30455,13 +31020,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_InterfaceDef_ptr &
   {
     _tao_elem = CORBA_InterfaceDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_InterfaceDef, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -30530,13 +31095,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_InterfaceDef
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA_InterfaceDef::_tc_FullInterfaceDescription, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -30613,13 +31178,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_InterfaceDes
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_InterfaceDescription, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -30666,7 +31231,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_AbstractInterfaceDef_ptr _tao_elem
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        CORBA::_tc_AbstractInterfaceDef, 
+        CORBA::_tc_AbstractInterfaceDef,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -30682,13 +31247,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_AbstractInterfaceD
   {
     _tao_elem = CORBA_AbstractInterfaceDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_AbstractInterfaceDef, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -30727,7 +31292,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_LocalInterfaceDef_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        CORBA::_tc_LocalInterfaceDef, 
+        CORBA::_tc_LocalInterfaceDef,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -30743,13 +31308,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_LocalInterfaceDef_
   {
     _tao_elem = CORBA_LocalInterfaceDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_LocalInterfaceDef, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -31315,7 +31880,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;
@@ -31357,7 +31922,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;
@@ -31435,7 +32000,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;
@@ -31477,7 +32042,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;
@@ -31555,7 +32120,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;
@@ -31597,7 +32162,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;
@@ -31639,7 +32204,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;
@@ -31759,4 +32324,3 @@ CORBA::Boolean operator>> (
   ACE_ENDTRY;
   return 0;
 }
-
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.h b/TAO/tao/IFR_Client/IFR_BasicC.h
index 0642bd52acd..953148d447a 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.h
+++ b/TAO/tao/IFR_Client/IFR_BasicC.h
@@ -52,6 +52,7 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+
 class CORBA_PrimitiveDef;
 
 #if !defined (_CORBA_PRIMITIVEDEF___PTR_CH_)
@@ -69,33 +70,36 @@ class TAO_IFR_Client_Export CORBA_PrimitiveDef_var : public TAO_Base_var
 {
 public:
   CORBA_PrimitiveDef_var (void); // default constructor
-  CORBA_PrimitiveDef_var (CORBA::PrimitiveDef_ptr p) : ptr_ (p) {} 
+  CORBA_PrimitiveDef_var (CORBA_PrimitiveDef_ptr p) : ptr_ (p) {}
   CORBA_PrimitiveDef_var (const CORBA_PrimitiveDef_var &); // copy constructor
   ~CORBA_PrimitiveDef_var (void); // destructor
-  
-  CORBA_PrimitiveDef_var &operator= (CORBA::PrimitiveDef_ptr);
+
+  CORBA_PrimitiveDef_var &operator= (CORBA_PrimitiveDef_ptr);
   CORBA_PrimitiveDef_var &operator= (const CORBA_PrimitiveDef_var &);
-  CORBA::PrimitiveDef_ptr operator-> (void) const;
-  
-  operator const CORBA::PrimitiveDef_ptr &() const;
-  operator CORBA::PrimitiveDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA::PrimitiveDef_ptr in (void) const;
-  CORBA::PrimitiveDef_ptr &inout (void);
-  CORBA::PrimitiveDef_ptr &out (void);
-  CORBA::PrimitiveDef_ptr _retn (void);
-  CORBA::PrimitiveDef_ptr ptr (void) const;
-  
+  CORBA_PrimitiveDef_ptr operator-> (void) const;
+
+  operator const CORBA_PrimitiveDef_ptr &() const;
+  operator CORBA_PrimitiveDef_ptr &();
+  // in, inout, out, _retn
+  CORBA_PrimitiveDef_ptr in (void) const;
+  CORBA_PrimitiveDef_ptr &inout (void);
+  CORBA_PrimitiveDef_ptr &out (void);
+  CORBA_PrimitiveDef_ptr _retn (void);
+  CORBA_PrimitiveDef_ptr ptr (void) const;
+
   // Hooks used by template sequence and object manager classes
   // for non-defined forward declared interfaces.
-  static CORBA::PrimitiveDef_ptr duplicate (CORBA::PrimitiveDef_ptr);
-  static void release (CORBA::PrimitiveDef_ptr);
-  static CORBA::PrimitiveDef_ptr nil (void);
-  static CORBA::PrimitiveDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA_PrimitiveDef_ptr duplicate (CORBA_PrimitiveDef_ptr);
+  static void release (CORBA_PrimitiveDef_ptr);
+  static CORBA_PrimitiveDef_ptr nil (void);
+  static CORBA_PrimitiveDef_ptr narrow (
+      CORBA::Object *,
+      CORBA::Environment &
+    );
   static CORBA::Object * upcast (void *);
 
 private:
-  CORBA::PrimitiveDef_ptr ptr_;
+  CORBA_PrimitiveDef_ptr ptr_;
   // Unimplemented - prevents widening assignment.
   CORBA_PrimitiveDef_var (const TAO_Base_var &rhs);
   CORBA_PrimitiveDef_var &operator= (const TAO_Base_var &rhs);
@@ -145,29 +149,32 @@ class TAO_IFR_Client_Export CORBA_StringDef_var : public TAO_Base_var
 {
 public:
   CORBA_StringDef_var (void); // default constructor
-  CORBA_StringDef_var (CORBA_StringDef_ptr p) : ptr_ (p) {} 
+  CORBA_StringDef_var (CORBA_StringDef_ptr p) : ptr_ (p) {}
   CORBA_StringDef_var (const CORBA_StringDef_var &); // copy constructor
   ~CORBA_StringDef_var (void); // destructor
-  
+
   CORBA_StringDef_var &operator= (CORBA_StringDef_ptr);
   CORBA_StringDef_var &operator= (const CORBA_StringDef_var &);
   CORBA_StringDef_ptr operator-> (void) const;
-  
+
   operator const CORBA_StringDef_ptr &() const;
   operator CORBA_StringDef_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   CORBA_StringDef_ptr in (void) const;
   CORBA_StringDef_ptr &inout (void);
   CORBA_StringDef_ptr &out (void);
   CORBA_StringDef_ptr _retn (void);
   CORBA_StringDef_ptr ptr (void) const;
-  
+
   // Hooks used by template sequence and object manager classes
   // for non-defined forward declared interfaces.
   static CORBA_StringDef_ptr duplicate (CORBA_StringDef_ptr);
   static void release (CORBA_StringDef_ptr);
   static CORBA_StringDef_ptr nil (void);
-  static CORBA_StringDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA_StringDef_ptr narrow (
+      CORBA::Object *,
+      CORBA::Environment &
+    );
   static CORBA::Object * upcast (void *);
 
 private:
@@ -221,29 +228,32 @@ class TAO_IFR_Client_Export CORBA_SequenceDef_var : public TAO_Base_var
 {
 public:
   CORBA_SequenceDef_var (void); // default constructor
-  CORBA_SequenceDef_var (CORBA_SequenceDef_ptr p) : ptr_ (p) {} 
+  CORBA_SequenceDef_var (CORBA_SequenceDef_ptr p) : ptr_ (p) {}
   CORBA_SequenceDef_var (const CORBA_SequenceDef_var &); // copy constructor
   ~CORBA_SequenceDef_var (void); // destructor
-  
+
   CORBA_SequenceDef_var &operator= (CORBA_SequenceDef_ptr);
   CORBA_SequenceDef_var &operator= (const CORBA_SequenceDef_var &);
   CORBA_SequenceDef_ptr operator-> (void) const;
-  
+
   operator const CORBA_SequenceDef_ptr &() const;
   operator CORBA_SequenceDef_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   CORBA_SequenceDef_ptr in (void) const;
   CORBA_SequenceDef_ptr &inout (void);
   CORBA_SequenceDef_ptr &out (void);
   CORBA_SequenceDef_ptr _retn (void);
   CORBA_SequenceDef_ptr ptr (void) const;
-  
+
   // Hooks used by template sequence and object manager classes
   // for non-defined forward declared interfaces.
   static CORBA_SequenceDef_ptr duplicate (CORBA_SequenceDef_ptr);
   static void release (CORBA_SequenceDef_ptr);
   static CORBA_SequenceDef_ptr nil (void);
-  static CORBA_SequenceDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA_SequenceDef_ptr narrow (
+      CORBA::Object *,
+      CORBA::Environment &
+    );
   static CORBA::Object * upcast (void *);
 
 private:
@@ -297,29 +307,32 @@ class TAO_IFR_Client_Export CORBA_ArrayDef_var : public TAO_Base_var
 {
 public:
   CORBA_ArrayDef_var (void); // default constructor
-  CORBA_ArrayDef_var (CORBA_ArrayDef_ptr p) : ptr_ (p) {} 
+  CORBA_ArrayDef_var (CORBA_ArrayDef_ptr p) : ptr_ (p) {}
   CORBA_ArrayDef_var (const CORBA_ArrayDef_var &); // copy constructor
   ~CORBA_ArrayDef_var (void); // destructor
-  
+
   CORBA_ArrayDef_var &operator= (CORBA_ArrayDef_ptr);
   CORBA_ArrayDef_var &operator= (const CORBA_ArrayDef_var &);
   CORBA_ArrayDef_ptr operator-> (void) const;
-  
+
   operator const CORBA_ArrayDef_ptr &() const;
   operator CORBA_ArrayDef_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   CORBA_ArrayDef_ptr in (void) const;
   CORBA_ArrayDef_ptr &inout (void);
   CORBA_ArrayDef_ptr &out (void);
   CORBA_ArrayDef_ptr _retn (void);
   CORBA_ArrayDef_ptr ptr (void) const;
-  
+
   // Hooks used by template sequence and object manager classes
   // for non-defined forward declared interfaces.
   static CORBA_ArrayDef_ptr duplicate (CORBA_ArrayDef_ptr);
   static void release (CORBA_ArrayDef_ptr);
   static CORBA_ArrayDef_ptr nil (void);
-  static CORBA_ArrayDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA_ArrayDef_ptr narrow (
+      CORBA::Object *,
+      CORBA::Environment &
+    );
   static CORBA::Object * upcast (void *);
 
 private:
@@ -373,29 +386,32 @@ class TAO_IFR_Client_Export CORBA_WstringDef_var : public TAO_Base_var
 {
 public:
   CORBA_WstringDef_var (void); // default constructor
-  CORBA_WstringDef_var (CORBA_WstringDef_ptr p) : ptr_ (p) {} 
+  CORBA_WstringDef_var (CORBA_WstringDef_ptr p) : ptr_ (p) {}
   CORBA_WstringDef_var (const CORBA_WstringDef_var &); // copy constructor
   ~CORBA_WstringDef_var (void); // destructor
-  
+
   CORBA_WstringDef_var &operator= (CORBA_WstringDef_ptr);
   CORBA_WstringDef_var &operator= (const CORBA_WstringDef_var &);
   CORBA_WstringDef_ptr operator-> (void) const;
-  
+
   operator const CORBA_WstringDef_ptr &() const;
   operator CORBA_WstringDef_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   CORBA_WstringDef_ptr in (void) const;
   CORBA_WstringDef_ptr &inout (void);
   CORBA_WstringDef_ptr &out (void);
   CORBA_WstringDef_ptr _retn (void);
   CORBA_WstringDef_ptr ptr (void) const;
-  
+
   // Hooks used by template sequence and object manager classes
   // for non-defined forward declared interfaces.
   static CORBA_WstringDef_ptr duplicate (CORBA_WstringDef_ptr);
   static void release (CORBA_WstringDef_ptr);
   static CORBA_WstringDef_ptr nil (void);
-  static CORBA_WstringDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA_WstringDef_ptr narrow (
+      CORBA::Object *,
+      CORBA::Environment &
+    );
   static CORBA::Object * upcast (void *);
 
 private:
@@ -449,29 +465,32 @@ class TAO_IFR_Client_Export CORBA_FixedDef_var : public TAO_Base_var
 {
 public:
   CORBA_FixedDef_var (void); // default constructor
-  CORBA_FixedDef_var (CORBA_FixedDef_ptr p) : ptr_ (p) {} 
+  CORBA_FixedDef_var (CORBA_FixedDef_ptr p) : ptr_ (p) {}
   CORBA_FixedDef_var (const CORBA_FixedDef_var &); // copy constructor
   ~CORBA_FixedDef_var (void); // destructor
-  
+
   CORBA_FixedDef_var &operator= (CORBA_FixedDef_ptr);
   CORBA_FixedDef_var &operator= (const CORBA_FixedDef_var &);
   CORBA_FixedDef_ptr operator-> (void) const;
-  
+
   operator const CORBA_FixedDef_ptr &() const;
   operator CORBA_FixedDef_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   CORBA_FixedDef_ptr in (void) const;
   CORBA_FixedDef_ptr &inout (void);
   CORBA_FixedDef_ptr &out (void);
   CORBA_FixedDef_ptr _retn (void);
   CORBA_FixedDef_ptr ptr (void) const;
-  
+
   // Hooks used by template sequence and object manager classes
   // for non-defined forward declared interfaces.
   static CORBA_FixedDef_ptr duplicate (CORBA_FixedDef_ptr);
   static void release (CORBA_FixedDef_ptr);
   static CORBA_FixedDef_ptr nil (void);
-  static CORBA_FixedDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA_FixedDef_ptr narrow (
+      CORBA::Object *,
+      CORBA::Environment &
+    );
   static CORBA::Object * upcast (void *);
 
 private:
@@ -524,29 +543,32 @@ class TAO_IFR_Client_Export CORBA_Repository_var : public TAO_Base_var
 {
 public:
   CORBA_Repository_var (void); // default constructor
-  CORBA_Repository_var (CORBA_Repository_ptr p) : ptr_ (p) {} 
+  CORBA_Repository_var (CORBA_Repository_ptr p) : ptr_ (p) {}
   CORBA_Repository_var (const CORBA_Repository_var &); // copy constructor
   ~CORBA_Repository_var (void); // destructor
-  
+
   CORBA_Repository_var &operator= (CORBA_Repository_ptr);
   CORBA_Repository_var &operator= (const CORBA_Repository_var &);
   CORBA_Repository_ptr operator-> (void) const;
-  
+
   operator const CORBA_Repository_ptr &() const;
   operator CORBA_Repository_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   CORBA_Repository_ptr in (void) const;
   CORBA_Repository_ptr &inout (void);
   CORBA_Repository_ptr &out (void);
   CORBA_Repository_ptr _retn (void);
   CORBA_Repository_ptr ptr (void) const;
-  
+
   // Hooks used by template sequence and object manager classes
   // for non-defined forward declared interfaces.
   static CORBA_Repository_ptr duplicate (CORBA_Repository_ptr);
   static void release (CORBA_Repository_ptr);
   static CORBA_Repository_ptr nil (void);
-  static CORBA_Repository_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA_Repository_ptr narrow (
+      CORBA::Object *,
+      CORBA::Environment &
+    );
   static CORBA::Object * upcast (void *);
 
 private:
@@ -593,7 +615,8 @@ class _TAO_CORBA_Repository_Remote_Proxy_Impl;
 class _TAO_CORBA_Repository_Proxy_Broker;
 class _TAO_CORBA_Repository_Remote_Proxy_Broker;
 
-class TAO_IFR_Client_Export CORBA_Repository: public virtual CORBA_Container
+class TAO_IFR_Client_Export CORBA_Repository
+  : public virtual CORBA_Container
 {
 public:
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -603,16 +626,19 @@ public:
 
   // the static operations
   static CORBA_Repository_ptr _duplicate (CORBA_Repository_ptr obj);
+
   static CORBA_Repository_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
   static CORBA_Repository_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
   static CORBA_Repository_ptr _nil (void)
     {
       return (CORBA_Repository_ptr)0;
@@ -622,7 +648,7 @@ public:
 
   virtual CORBA_Contained_ptr lookup_id (
       const char * search_id,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -631,16 +657,16 @@ public:
 
   virtual CORBA::TypeCode_ptr get_canonical_typecode (
       CORBA::TypeCode_ptr tc,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::PrimitiveDef_ptr get_primitive (
+  virtual CORBA_PrimitiveDef_ptr get_primitive (
       CORBA::PrimitiveKind kind,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -649,7 +675,7 @@ public:
 
   virtual CORBA_StringDef_ptr create_string (
       CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -658,7 +684,7 @@ public:
 
   virtual CORBA_WstringDef_ptr create_wstring (
       CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -668,7 +694,7 @@ public:
   virtual CORBA_SequenceDef_ptr create_sequence (
       CORBA::ULong bound,
       CORBA_IDLType_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -678,7 +704,7 @@ public:
   virtual CORBA_ArrayDef_ptr create_array (
       CORBA::ULong length,
       CORBA_IDLType_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -688,7 +714,7 @@ public:
   virtual CORBA_FixedDef_ptr create_fixed (
       CORBA::UShort digits,
       CORBA::Short scale,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -696,58 +722,57 @@ public:
     ));
 
   virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
+      const CORBA::Char *type_id,
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
   virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
+
   virtual const char* _interface_repository_id (void) const;
 
 private:
   _TAO_CORBA_Repository_Proxy_Broker *the_TAO_CORBA_Repository_Proxy_Broker_;
-  
+
 protected:
   CORBA_Repository (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void CORBA_Repository_setup_collocation (int collocated);
-    
-    CORBA_Repository (
-      TAO_Stub *objref, 
+
+  // This methods travese the inheritance tree and set the
+  // parents piece of the given class in the right mode
+  virtual void CORBA_Repository_setup_collocation (int collocated);
+
+  CORBA_Repository (
+      TAO_Stub *objref,
       CORBA::Boolean _tao_collocated = 0,
       TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_CORBA_Repository_Remote_Proxy_Impl;
-    friend class _TAO_CORBA_Repository_ThruPOA_Proxy_Impl;
-    friend class _TAO_CORBA_Repository_Direct_Proxy_Impl;
-  
+    );
+
+  friend class _TAO_CORBA_Repository_Remote_Proxy_Impl;
+  friend class _TAO_CORBA_Repository_ThruPOA_Proxy_Impl;
+  friend class _TAO_CORBA_Repository_Direct_Proxy_Impl;
+
   virtual ~CORBA_Repository (void);
+
 private:
   CORBA_Repository (const CORBA_Repository &);
   void operator= (const CORBA_Repository &);
 };
 
-
 // The Proxy Implementations are used by each interface to
 // perform a call. Each different implementation encapsulate
 // an invocation logics.
 
 
 ///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
+//                    Base Proxy Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_CORBA_Repository_Proxy_Impl : 
-  public virtual _TAO_CORBA_Container_Proxy_Impl
+class TAO_IFR_Client_Export _TAO_CORBA_Repository_Proxy_Impl
+  : public virtual _TAO_CORBA_Container_Proxy_Impl
 {
 public:
   virtual ~_TAO_CORBA_Repository_Proxy_Impl (void) { }
-  
-    virtual CORBA_Contained_ptr lookup_id (
+  virtual CORBA_Contained_ptr lookup_id (
       CORBA_Object *_collocated_tao_target_,
       const char * search_id,
       CORBA::Environment &ACE_TRY_ENV
@@ -765,7 +790,7 @@ public:
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::PrimitiveDef_ptr get_primitive (
+  virtual CORBA_PrimitiveDef_ptr get_primitive (
       CORBA_Object *_collocated_tao_target_,
       CORBA::PrimitiveKind kind,
       CORBA::Environment &ACE_TRY_ENV
@@ -822,31 +847,30 @@ public:
       CORBA::SystemException
     )) = 0;
 
+
 protected:
   _TAO_CORBA_Repository_Proxy_Impl (void);
-
 };
+
 //
-//                Base  Proxy Impl. Declaration
+//               End Base Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
 ///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
+//                Remote Proxy Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_CORBA_Repository_Remote_Proxy_Impl : 
-  public virtual _TAO_CORBA_Repository_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_Container_Remote_Proxy_Impl
-  
+class TAO_IFR_Client_Export _TAO_CORBA_Repository_Remote_Proxy_Impl
+  : public virtual _TAO_CORBA_Repository_Proxy_Impl,
+    public virtual TAO_Remote_Object_Proxy_Impl,
+    public virtual _TAO_CORBA_Container_Remote_Proxy_Impl
 {
 public:
   _TAO_CORBA_Repository_Remote_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_Repository_Remote_Proxy_Impl (void) { }
-  
-    virtual CORBA_Contained_ptr lookup_id (
+  virtual CORBA_Contained_ptr lookup_id (
       CORBA_Object *_collocated_tao_target_,
       const char * search_id,
       CORBA::Environment &ACE_TRY_ENV
@@ -864,7 +888,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::PrimitiveDef_ptr get_primitive (
+  virtual CORBA_PrimitiveDef_ptr get_primitive (
       CORBA_Object *_collocated_tao_target_,
       CORBA::PrimitiveKind kind,
       CORBA::Environment &ACE_TRY_ENV
@@ -921,22 +945,21 @@ public:
       CORBA::SystemException
     ));
 
+
 };
 
 //
-//                Base  Proxy Impl. Declaration
+//             End Remote Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
 // The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
+// the right proxy for performing a call. In the new
 // collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
-
+// a call by call basis.
 
 
 ///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
+//                 Base Proxy Broker Declaration
 //
 
 class TAO_IFR_Client_Export _TAO_CORBA_Repository_Proxy_Broker
@@ -944,50 +967,50 @@ class TAO_IFR_Client_Export _TAO_CORBA_Repository_Proxy_Broker
 public:
   virtual ~_TAO_CORBA_Repository_Proxy_Broker (void);
   virtual _TAO_CORBA_Repository_Proxy_Impl &select_proxy (
-    CORBA_Repository *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
+      CORBA_Repository *object,
+      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+    ) = 0;
 
 protected:
   _TAO_CORBA_Repository_Proxy_Broker (void);
-  
+
 };
 
 //
-//              End Base Proxy Broker Declaration 
+//              End Base Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
 ///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
+//                 Remote Proxy Broker Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_CORBA_Repository_Remote_Proxy_Broker : public virtual _TAO_CORBA_Repository_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_Repository_Remote_Proxy_Broker
+  : public virtual _TAO_CORBA_Repository_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_Repository_Remote_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_Repository_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_CORBA_Repository_Proxy_Impl &select_proxy (
-    CORBA_Repository *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
 
-private:
-  _TAO_CORBA_Repository_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
+  virtual _TAO_CORBA_Repository_Proxy_Impl &select_proxy (
+      CORBA_Repository *object,
+      CORBA_Environment &ACE_TRY_ENV
+    );
 
-public:
-  static _TAO_CORBA_Repository_Remote_Proxy_Broker *the_TAO_CORBA_Repository_Remote_Proxy_Broker (void);
-};
+  private:
+    _TAO_CORBA_Repository_Remote_Proxy_Impl remote_proxy_impl_;
 
+  public:
+    // This member function is used to get an handle to the unique instance
+    // of the Remote Proxy Broker that is available for a given
+    // interface.
+    static _TAO_CORBA_Repository_Remote_Proxy_Broker *the_TAO_CORBA_Repository_Remote_Proxy_Broker (void);
+  };
 
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+  //
+  //              End Remote Proxy Broker Declaration
+  ///////////////////////////////////////////////////////////////////////
 
 
 #endif /* end #if !defined */
@@ -996,8 +1019,8 @@ public:
 #if !defined (_CORBA_MODULEDEF___PTR_CH_)
 #define _CORBA_MODULEDEF___PTR_CH_
 
-class CORBA_ModuleDef;
-typedef CORBA_ModuleDef *CORBA_ModuleDef_ptr;
+  class CORBA_ModuleDef;
+  typedef CORBA_ModuleDef *CORBA_ModuleDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -1005,41 +1028,44 @@ typedef CORBA_ModuleDef *CORBA_ModuleDef_ptr;
 #if !defined (_CORBA_MODULEDEF___VAR_CH_)
 #define _CORBA_MODULEDEF___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_ModuleDef_var : public TAO_Base_var
-{
-public:
-  CORBA_ModuleDef_var (void); // default constructor
-  CORBA_ModuleDef_var (CORBA_ModuleDef_ptr p) : ptr_ (p) {} 
-  CORBA_ModuleDef_var (const CORBA_ModuleDef_var &); // copy constructor
-  ~CORBA_ModuleDef_var (void); // destructor
-  
-  CORBA_ModuleDef_var &operator= (CORBA_ModuleDef_ptr);
-  CORBA_ModuleDef_var &operator= (const CORBA_ModuleDef_var &);
-  CORBA_ModuleDef_ptr operator-> (void) const;
-  
-  operator const CORBA_ModuleDef_ptr &() const;
-  operator CORBA_ModuleDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_ModuleDef_ptr in (void) const;
-  CORBA_ModuleDef_ptr &inout (void);
-  CORBA_ModuleDef_ptr &out (void);
-  CORBA_ModuleDef_ptr _retn (void);
-  CORBA_ModuleDef_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_ModuleDef_ptr duplicate (CORBA_ModuleDef_ptr);
-  static void release (CORBA_ModuleDef_ptr);
-  static CORBA_ModuleDef_ptr nil (void);
-  static CORBA_ModuleDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
+  class TAO_IFR_Client_Export CORBA_ModuleDef_var : public TAO_Base_var
+  {
+  public:
+    CORBA_ModuleDef_var (void); // default constructor
+    CORBA_ModuleDef_var (CORBA_ModuleDef_ptr p) : ptr_ (p) {}
+    CORBA_ModuleDef_var (const CORBA_ModuleDef_var &); // copy constructor
+    ~CORBA_ModuleDef_var (void); // destructor
+
+    CORBA_ModuleDef_var &operator= (CORBA_ModuleDef_ptr);
+    CORBA_ModuleDef_var &operator= (const CORBA_ModuleDef_var &);
+    CORBA_ModuleDef_ptr operator-> (void) const;
+
+    operator const CORBA_ModuleDef_ptr &() const;
+    operator CORBA_ModuleDef_ptr &();
+    // in, inout, out, _retn
+    CORBA_ModuleDef_ptr in (void) const;
+    CORBA_ModuleDef_ptr &inout (void);
+    CORBA_ModuleDef_ptr &out (void);
+    CORBA_ModuleDef_ptr _retn (void);
+    CORBA_ModuleDef_ptr ptr (void) const;
+
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static CORBA_ModuleDef_ptr duplicate (CORBA_ModuleDef_ptr);
+    static void release (CORBA_ModuleDef_ptr);
+    static CORBA_ModuleDef_ptr nil (void);
+    static CORBA_ModuleDef_ptr narrow (
+        CORBA::Object *,
+        CORBA::Environment &
+      );
+    static CORBA::Object * upcast (void *);
 
-private:
-  CORBA_ModuleDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_ModuleDef_var (const TAO_Base_var &rhs);
-  CORBA_ModuleDef_var &operator= (const TAO_Base_var &rhs);
-};
+  private:
+    CORBA_ModuleDef_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    CORBA_ModuleDef_var (const TAO_Base_var &rhs);
+    CORBA_ModuleDef_var &operator= (const TAO_Base_var &rhs);
+  };
 
 
 #endif /* end #if !defined */
@@ -1048,22 +1074,22 @@ private:
 #if !defined (_CORBA_MODULEDEF___OUT_CH_)
 #define _CORBA_MODULEDEF___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_ModuleDef_out
-{
-public:
-  CORBA_ModuleDef_out (CORBA_ModuleDef_ptr &);
-  CORBA_ModuleDef_out (CORBA_ModuleDef_var &);
-  CORBA_ModuleDef_out (const CORBA_ModuleDef_out &);
-  CORBA_ModuleDef_out &operator= (const CORBA_ModuleDef_out &);
-  CORBA_ModuleDef_out &operator= (const CORBA_ModuleDef_var &);
-  CORBA_ModuleDef_out &operator= (CORBA_ModuleDef_ptr);
-  operator CORBA_ModuleDef_ptr &();
-  CORBA_ModuleDef_ptr &ptr (void);
-  CORBA_ModuleDef_ptr operator-> (void);
+  class TAO_IFR_Client_Export CORBA_ModuleDef_out
+  {
+  public:
+    CORBA_ModuleDef_out (CORBA_ModuleDef_ptr &);
+    CORBA_ModuleDef_out (CORBA_ModuleDef_var &);
+    CORBA_ModuleDef_out (const CORBA_ModuleDef_out &);
+    CORBA_ModuleDef_out &operator= (const CORBA_ModuleDef_out &);
+    CORBA_ModuleDef_out &operator= (const CORBA_ModuleDef_var &);
+    CORBA_ModuleDef_out &operator= (CORBA_ModuleDef_ptr);
+    operator CORBA_ModuleDef_ptr &();
+    CORBA_ModuleDef_ptr &ptr (void);
+    CORBA_ModuleDef_ptr operator-> (void);
 
-private:
-  CORBA_ModuleDef_ptr &ptr_;
-};
+  private:
+    CORBA_ModuleDef_ptr &ptr_;
+  };
 
 
 #endif /* end #if !defined */
@@ -1072,259 +1098,263 @@ private:
 #if !defined (_CORBA_MODULEDEF_CH_)
 #define _CORBA_MODULEDEF_CH_
 
-// Forward Classes Declaration
-class _TAO_CORBA_ModuleDef_Proxy_Impl;
-class _TAO_CORBA_ModuleDef_Remote_Proxy_Impl;
-class _TAO_CORBA_ModuleDef_Proxy_Broker;
-class _TAO_CORBA_ModuleDef_Remote_Proxy_Broker;
+  // Forward Classes Declaration
+  class _TAO_CORBA_ModuleDef_Proxy_Impl;
+  class _TAO_CORBA_ModuleDef_Remote_Proxy_Impl;
+  class _TAO_CORBA_ModuleDef_Proxy_Broker;
+  class _TAO_CORBA_ModuleDef_Remote_Proxy_Broker;
 
-class TAO_IFR_Client_Export CORBA_ModuleDef: public virtual CORBA_Container, public virtual CORBA_Contained
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_ModuleDef_ptr _ptr_type;
-  typedef CORBA_ModuleDef_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
+  class TAO_IFR_Client_Export CORBA_ModuleDef
+    : public virtual CORBA_Container,
+      public virtual CORBA_Contained
+  {
+  public:
+  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    typedef CORBA_ModuleDef_ptr _ptr_type;
+    typedef CORBA_ModuleDef_var _var_type;
+  #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-  // the static operations
-  static CORBA_ModuleDef_ptr _duplicate (CORBA_ModuleDef_ptr obj);
-  static CORBA_ModuleDef_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_ModuleDef_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_ModuleDef_ptr _nil (void)
-    {
-      return (CORBA_ModuleDef_ptr)0;
-    }
+    // the static operations
+    static CORBA_ModuleDef_ptr _duplicate (CORBA_ModuleDef_ptr obj);
 
-  static void _tao_any_destructor (void*);
+    static CORBA_ModuleDef_ptr _narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
 
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
+    static CORBA_ModuleDef_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
+
+    static CORBA_ModuleDef_ptr _nil (void)
+      {
+        return (CORBA_ModuleDef_ptr)0;
+      }
+
+    static void _tao_any_destructor (void*);
+
+    virtual CORBA::Boolean _is_a (
+        const CORBA::Char *type_id,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
+
+    virtual void *_tao_QueryInterface (ptr_arith_t type);
+
+    virtual const char* _interface_repository_id (void) const;
+
+  private:
+    _TAO_CORBA_ModuleDef_Proxy_Broker *the_TAO_CORBA_ModuleDef_Proxy_Broker_;
 
-private:
-  _TAO_CORBA_ModuleDef_Proxy_Broker *the_TAO_CORBA_ModuleDef_Proxy_Broker_;
-  
-protected:
-  CORBA_ModuleDef (int collocated = 0);
-  
   protected:
+    CORBA_ModuleDef (int collocated = 0);
+
     // This methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode
     virtual void CORBA_ModuleDef_setup_collocation (int collocated);
-    
+
     CORBA_ModuleDef (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
+        TAO_Stub *objref,
+        CORBA::Boolean _tao_collocated = 0,
+        TAO_Abstract_ServantBase *servant = 0
       );
-    
+
     friend class _TAO_CORBA_ModuleDef_Remote_Proxy_Impl;
     friend class _TAO_CORBA_ModuleDef_ThruPOA_Proxy_Impl;
     friend class _TAO_CORBA_ModuleDef_Direct_Proxy_Impl;
-  
-  virtual ~CORBA_ModuleDef (void);
-private:
-  CORBA_ModuleDef (const CORBA_ModuleDef &);
-  void operator= (const CORBA_ModuleDef &);
-};
 
+    virtual ~CORBA_ModuleDef (void);
 
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
+  private:
+    CORBA_ModuleDef (const CORBA_ModuleDef &);
+    void operator= (const CORBA_ModuleDef &);
+  };
 
+  // The Proxy Implementations are used by each interface to
+  // perform a call. Each different implementation encapsulate
+  // an invocation logics.
 
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
 
-class TAO_IFR_Client_Export _TAO_CORBA_ModuleDef_Proxy_Impl : 
-  public virtual _TAO_CORBA_Container_Proxy_Impl, 
-  public virtual _TAO_CORBA_Contained_Proxy_Impl
-{
-public:
-  virtual ~_TAO_CORBA_ModuleDef_Proxy_Impl (void) { }
-  
+  ///////////////////////////////////////////////////////////////////////
+  //                    Base Proxy Impl. Declaration
+  //
+
+  class TAO_IFR_Client_Export _TAO_CORBA_ModuleDef_Proxy_Impl
+    : public virtual _TAO_CORBA_Container_Proxy_Impl,
+      public virtual _TAO_CORBA_Contained_Proxy_Impl
+  {
+  public:
+    virtual ~_TAO_CORBA_ModuleDef_Proxy_Impl (void) { }
+
   protected:
-  _TAO_CORBA_ModuleDef_Proxy_Impl (void);
+    _TAO_CORBA_ModuleDef_Proxy_Impl (void);
+  };
 
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
+  //
+  //               End Base Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
 
 
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
+  ///////////////////////////////////////////////////////////////////////
+  //                Remote Proxy Impl. Declaration
+  //
+
+  class TAO_IFR_Client_Export _TAO_CORBA_ModuleDef_Remote_Proxy_Impl
+    : public virtual _TAO_CORBA_ModuleDef_Proxy_Impl,
+      public virtual TAO_Remote_Object_Proxy_Impl,
+      public virtual _TAO_CORBA_Container_Remote_Proxy_Impl,
+      public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl
+  {
+  public:
+    _TAO_CORBA_ModuleDef_Remote_Proxy_Impl (void);
+
+    virtual ~_TAO_CORBA_ModuleDef_Remote_Proxy_Impl (void) { }
 
-class TAO_IFR_Client_Export _TAO_CORBA_ModuleDef_Remote_Proxy_Impl : 
-  public virtual _TAO_CORBA_ModuleDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_Container_Remote_Proxy_Impl, 
-  public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_CORBA_ModuleDef_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_CORBA_ModuleDef_Remote_Proxy_Impl (void) { }
-  
   };
 
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
+  //
+  //             End Remote Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
 
+  // The Proxy Brokers are used by each interface to get
+  // the right proxy for performing a call. In the new
+  // collocation scheme, the proxy to be used can vary on
+  // a call by call basis.
 
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
 
+  ///////////////////////////////////////////////////////////////////////
+  //                 Base Proxy Broker Declaration
+  //
 
+    class TAO_IFR_Client_Export _TAO_CORBA_ModuleDef_Proxy_Broker
+  {
+  public:
+    virtual ~_TAO_CORBA_ModuleDef_Proxy_Broker (void);
+    virtual _TAO_CORBA_ModuleDef_Proxy_Impl &select_proxy (
+        CORBA_ModuleDef *object,
+        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+      ) = 0;
 
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
+  protected:
+    _TAO_CORBA_ModuleDef_Proxy_Broker (void);
 
-class TAO_IFR_Client_Export _TAO_CORBA_ModuleDef_Proxy_Broker
-{
-public:
-  virtual ~_TAO_CORBA_ModuleDef_Proxy_Broker (void);
-  virtual _TAO_CORBA_ModuleDef_Proxy_Impl &select_proxy (
-    CORBA_ModuleDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
+  };
 
-protected:
-  _TAO_CORBA_ModuleDef_Proxy_Broker (void);
-  
-};
+  //
+  //              End Base Proxy Broker Declaration
+  ///////////////////////////////////////////////////////////////////////
 
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
 
+  ///////////////////////////////////////////////////////////////////////
+  //                 Remote Proxy Broker Declaration
+  //
 
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
+  class TAO_IFR_Client_Export _TAO_CORBA_ModuleDef_Remote_Proxy_Broker
+    : public virtual _TAO_CORBA_ModuleDef_Proxy_Broker
+  {
+  public:
+    _TAO_CORBA_ModuleDef_Remote_Proxy_Broker (void);
 
-class TAO_IFR_Client_Export _TAO_CORBA_ModuleDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_ModuleDef_Proxy_Broker
-{
-public: 
-  _TAO_CORBA_ModuleDef_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_CORBA_ModuleDef_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_CORBA_ModuleDef_Proxy_Impl &select_proxy (
-    CORBA_ModuleDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
+    virtual ~_TAO_CORBA_ModuleDef_Remote_Proxy_Broker (void);
 
-private:
-  _TAO_CORBA_ModuleDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
+    virtual _TAO_CORBA_ModuleDef_Proxy_Impl &select_proxy (
+        CORBA_ModuleDef *object,
+        CORBA_Environment &ACE_TRY_ENV
+      );
 
-public:
-  static _TAO_CORBA_ModuleDef_Remote_Proxy_Broker *the_TAO_CORBA_ModuleDef_Remote_Proxy_Broker (void);
-};
+    private:
+      _TAO_CORBA_ModuleDef_Remote_Proxy_Impl remote_proxy_impl_;
 
+    public:
+      // This member function is used to get an handle to the unique instance
+      // of the Remote Proxy Broker that is available for a given
+      // interface.
+      static _TAO_CORBA_ModuleDef_Remote_Proxy_Broker *the_TAO_CORBA_ModuleDef_Remote_Proxy_Broker (void);
+    };
 
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+    //
+    //              End Remote Proxy Broker Declaration
+    ///////////////////////////////////////////////////////////////////////
 
 
 #endif /* end #if !defined */
 
-struct CORBA_ModuleDescription;
-class CORBA_ModuleDescription_var;
+    struct CORBA_ModuleDescription;
+    class CORBA_ModuleDescription_var;
 
-struct TAO_IFR_Client_Export CORBA_ModuleDescription
-{
+    struct TAO_IFR_Client_Export CORBA_ModuleDescription
+    {
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_ModuleDescription_var _var_type;
+      typedef CORBA_ModuleDescription_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-  static void _tao_any_destructor (void*);
+      static void _tao_any_destructor (void*);
 
-  TAO_String_Manager name;
-  TAO_String_Manager id;
-  TAO_String_Manager defined_in;
-  TAO_String_Manager version;
-};
+      TAO_String_Manager name;
+      TAO_String_Manager id;
+      TAO_String_Manager defined_in;
+      TAO_String_Manager version;
 
-class TAO_IFR_Client_Export CORBA_ModuleDescription_var
-{
-public:
-  CORBA_ModuleDescription_var (void); // default constructor
-  CORBA_ModuleDescription_var (CORBA_ModuleDescription *);
-  CORBA_ModuleDescription_var (const CORBA_ModuleDescription_var &); // copy constructor
-  ~CORBA_ModuleDescription_var (void); // destructor
-  
-  CORBA_ModuleDescription_var &operator= (CORBA_ModuleDescription *);
-  CORBA_ModuleDescription_var &operator= (const CORBA_ModuleDescription_var &);
-  CORBA_ModuleDescription *operator-> (void);
-  const CORBA_ModuleDescription *operator-> (void) const;
-  
-  operator const CORBA_ModuleDescription &() const;
-  operator CORBA_ModuleDescription &();
-  operator CORBA_ModuleDescription &() const;
-  operator CORBA_ModuleDescription *&(); // variable-size types only
-  
-  // in, inout, out, _retn 
-  const CORBA_ModuleDescription &in (void) const;
-  CORBA_ModuleDescription &inout (void);
-  CORBA_ModuleDescription *&out (void);
-  CORBA_ModuleDescription *_retn (void);
-  CORBA_ModuleDescription *ptr (void) const;
-
-private:
-  CORBA_ModuleDescription *ptr_;
-};
+    };
 
-class TAO_IFR_Client_Export CORBA_ModuleDescription_out
-{
-public:
-  CORBA_ModuleDescription_out (CORBA_ModuleDescription *&);
-  CORBA_ModuleDescription_out (CORBA_ModuleDescription_var &);
-  CORBA_ModuleDescription_out (const CORBA_ModuleDescription_out &);
-  CORBA_ModuleDescription_out &operator= (const CORBA_ModuleDescription_out &);
-  CORBA_ModuleDescription_out &operator= (CORBA_ModuleDescription *);
-  operator CORBA_ModuleDescription *&();
-  CORBA_ModuleDescription *&ptr (void);
-  CORBA_ModuleDescription *operator-> (void);
-  
-private:
-  CORBA_ModuleDescription *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_ModuleDescription_var &);
-};
+    class TAO_IFR_Client_Export CORBA_ModuleDescription_var
+    {
+    public:
+      CORBA_ModuleDescription_var (void);
+      CORBA_ModuleDescription_var (CORBA_ModuleDescription *);
+      CORBA_ModuleDescription_var (const CORBA_ModuleDescription_var &);
+      ~CORBA_ModuleDescription_var (void);
+
+      CORBA_ModuleDescription_var &operator= (CORBA_ModuleDescription *);
+      CORBA_ModuleDescription_var &operator= (const CORBA_ModuleDescription_var &);
+      CORBA_ModuleDescription *operator-> (void);
+      const CORBA_ModuleDescription *operator-> (void) const;
+
+      operator const CORBA_ModuleDescription &() const;
+      operator CORBA_ModuleDescription &();
+      operator CORBA_ModuleDescription &() const;
+      // Variable-size types only.
+      operator CORBA_ModuleDescription *&();
+
+      // in, inout, out, _retn
+      const CORBA_ModuleDescription &in (void) const;
+      CORBA_ModuleDescription &inout (void);
+      CORBA_ModuleDescription *&out (void);
+      CORBA_ModuleDescription *_retn (void);
+      CORBA_ModuleDescription *ptr (void) const;
+
+    private:
+      CORBA_ModuleDescription *ptr_;
+    };
+
+    class TAO_IFR_Client_Export CORBA_ModuleDescription_out
+    {
+    public:
+      CORBA_ModuleDescription_out (CORBA_ModuleDescription *&);
+      CORBA_ModuleDescription_out (CORBA_ModuleDescription_var &);
+      CORBA_ModuleDescription_out (const CORBA_ModuleDescription_out &);
+      CORBA_ModuleDescription_out &operator= (const CORBA_ModuleDescription_out &);
+      CORBA_ModuleDescription_out &operator= (CORBA_ModuleDescription *);
+      operator CORBA_ModuleDescription *&();
+      CORBA_ModuleDescription *&ptr (void);
+      CORBA_ModuleDescription *operator-> (void);
+
+    private:
+      CORBA_ModuleDescription *&ptr_;
+      // Assignment from T_var not allowed.
+      void operator= (const CORBA_ModuleDescription_var &);
+    };
 
 
 #if !defined (_CORBA_CONSTANTDEF___PTR_CH_)
 #define _CORBA_CONSTANTDEF___PTR_CH_
 
-class CORBA_ConstantDef;
-typedef CORBA_ConstantDef *CORBA_ConstantDef_ptr;
+    class CORBA_ConstantDef;
+    typedef CORBA_ConstantDef *CORBA_ConstantDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -1332,41 +1362,44 @@ typedef CORBA_ConstantDef *CORBA_ConstantDef_ptr;
 #if !defined (_CORBA_CONSTANTDEF___VAR_CH_)
 #define _CORBA_CONSTANTDEF___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_ConstantDef_var : public TAO_Base_var
-{
-public:
-  CORBA_ConstantDef_var (void); // default constructor
-  CORBA_ConstantDef_var (CORBA_ConstantDef_ptr p) : ptr_ (p) {} 
-  CORBA_ConstantDef_var (const CORBA_ConstantDef_var &); // copy constructor
-  ~CORBA_ConstantDef_var (void); // destructor
-  
-  CORBA_ConstantDef_var &operator= (CORBA_ConstantDef_ptr);
-  CORBA_ConstantDef_var &operator= (const CORBA_ConstantDef_var &);
-  CORBA_ConstantDef_ptr operator-> (void) const;
-  
-  operator const CORBA_ConstantDef_ptr &() const;
-  operator CORBA_ConstantDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_ConstantDef_ptr in (void) const;
-  CORBA_ConstantDef_ptr &inout (void);
-  CORBA_ConstantDef_ptr &out (void);
-  CORBA_ConstantDef_ptr _retn (void);
-  CORBA_ConstantDef_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_ConstantDef_ptr duplicate (CORBA_ConstantDef_ptr);
-  static void release (CORBA_ConstantDef_ptr);
-  static CORBA_ConstantDef_ptr nil (void);
-  static CORBA_ConstantDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
-
-private:
-  CORBA_ConstantDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_ConstantDef_var (const TAO_Base_var &rhs);
-  CORBA_ConstantDef_var &operator= (const TAO_Base_var &rhs);
-};
+    class TAO_IFR_Client_Export CORBA_ConstantDef_var : public TAO_Base_var
+    {
+    public:
+      CORBA_ConstantDef_var (void); // default constructor
+      CORBA_ConstantDef_var (CORBA_ConstantDef_ptr p) : ptr_ (p) {}
+      CORBA_ConstantDef_var (const CORBA_ConstantDef_var &); // copy constructor
+      ~CORBA_ConstantDef_var (void); // destructor
+
+      CORBA_ConstantDef_var &operator= (CORBA_ConstantDef_ptr);
+      CORBA_ConstantDef_var &operator= (const CORBA_ConstantDef_var &);
+      CORBA_ConstantDef_ptr operator-> (void) const;
+
+      operator const CORBA_ConstantDef_ptr &() const;
+      operator CORBA_ConstantDef_ptr &();
+      // in, inout, out, _retn
+      CORBA_ConstantDef_ptr in (void) const;
+      CORBA_ConstantDef_ptr &inout (void);
+      CORBA_ConstantDef_ptr &out (void);
+      CORBA_ConstantDef_ptr _retn (void);
+      CORBA_ConstantDef_ptr ptr (void) const;
+
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static CORBA_ConstantDef_ptr duplicate (CORBA_ConstantDef_ptr);
+      static void release (CORBA_ConstantDef_ptr);
+      static CORBA_ConstantDef_ptr nil (void);
+      static CORBA_ConstantDef_ptr narrow (
+          CORBA::Object *,
+          CORBA::Environment &
+        );
+      static CORBA::Object * upcast (void *);
+
+    private:
+      CORBA_ConstantDef_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      CORBA_ConstantDef_var (const TAO_Base_var &rhs);
+      CORBA_ConstantDef_var &operator= (const TAO_Base_var &rhs);
+    };
 
 
 #endif /* end #if !defined */
@@ -1375,22 +1408,22 @@ private:
 #if !defined (_CORBA_CONSTANTDEF___OUT_CH_)
 #define _CORBA_CONSTANTDEF___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_ConstantDef_out
-{
-public:
-  CORBA_ConstantDef_out (CORBA_ConstantDef_ptr &);
-  CORBA_ConstantDef_out (CORBA_ConstantDef_var &);
-  CORBA_ConstantDef_out (const CORBA_ConstantDef_out &);
-  CORBA_ConstantDef_out &operator= (const CORBA_ConstantDef_out &);
-  CORBA_ConstantDef_out &operator= (const CORBA_ConstantDef_var &);
-  CORBA_ConstantDef_out &operator= (CORBA_ConstantDef_ptr);
-  operator CORBA_ConstantDef_ptr &();
-  CORBA_ConstantDef_ptr &ptr (void);
-  CORBA_ConstantDef_ptr operator-> (void);
-
-private:
-  CORBA_ConstantDef_ptr &ptr_;
-};
+    class TAO_IFR_Client_Export CORBA_ConstantDef_out
+    {
+    public:
+      CORBA_ConstantDef_out (CORBA_ConstantDef_ptr &);
+      CORBA_ConstantDef_out (CORBA_ConstantDef_var &);
+      CORBA_ConstantDef_out (const CORBA_ConstantDef_out &);
+      CORBA_ConstantDef_out &operator= (const CORBA_ConstantDef_out &);
+      CORBA_ConstantDef_out &operator= (const CORBA_ConstantDef_var &);
+      CORBA_ConstantDef_out &operator= (CORBA_ConstantDef_ptr);
+      operator CORBA_ConstantDef_ptr &();
+      CORBA_ConstantDef_ptr &ptr (void);
+      CORBA_ConstantDef_ptr operator-> (void);
+
+    private:
+      CORBA_ConstantDef_ptr &ptr_;
+    };
 
 
 #endif /* end #if !defined */
@@ -1399,385 +1432,390 @@ private:
 #if !defined (_CORBA_CONSTANTDEF_CH_)
 #define _CORBA_CONSTANTDEF_CH_
 
-// Forward Classes Declaration
-class _TAO_CORBA_ConstantDef_Proxy_Impl;
-class _TAO_CORBA_ConstantDef_Remote_Proxy_Impl;
-class _TAO_CORBA_ConstantDef_Proxy_Broker;
-class _TAO_CORBA_ConstantDef_Remote_Proxy_Broker;
-
-class TAO_IFR_Client_Export CORBA_ConstantDef: public virtual CORBA_Contained
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_ConstantDef_ptr _ptr_type;
-  typedef CORBA_ConstantDef_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
+    // Forward Classes Declaration
+    class _TAO_CORBA_ConstantDef_Proxy_Impl;
+    class _TAO_CORBA_ConstantDef_Remote_Proxy_Impl;
+    class _TAO_CORBA_ConstantDef_Proxy_Broker;
+    class _TAO_CORBA_ConstantDef_Remote_Proxy_Broker;
 
-  // the static operations
-  static CORBA_ConstantDef_ptr _duplicate (CORBA_ConstantDef_ptr obj);
-  static CORBA_ConstantDef_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_ConstantDef_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_ConstantDef_ptr _nil (void)
+    class TAO_IFR_Client_Export CORBA_ConstantDef
+      : public virtual CORBA_Contained
     {
-      return (CORBA_ConstantDef_ptr)0;
-    }
-
-  static void _tao_any_destructor (void*);
-
-  virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_IDLType_ptr type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void type_def (
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Any * value (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void value (
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
-
-private:
-  _TAO_CORBA_ConstantDef_Proxy_Broker *the_TAO_CORBA_ConstantDef_Proxy_Broker_;
-  
-protected:
-  CORBA_ConstantDef (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void CORBA_ConstantDef_setup_collocation (int collocated);
-    
-    CORBA_ConstantDef (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_CORBA_ConstantDef_Remote_Proxy_Impl;
-    friend class _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_CORBA_ConstantDef_Direct_Proxy_Impl;
-  
-  virtual ~CORBA_ConstantDef (void);
-private:
-  CORBA_ConstantDef (const CORBA_ConstantDef &);
-  void operator= (const CORBA_ConstantDef &);
-};
-
-
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_ConstantDef_Proxy_Impl : 
-  public virtual _TAO_CORBA_Contained_Proxy_Impl
-{
-public:
-  virtual ~_TAO_CORBA_ConstantDef_Proxy_Impl (void) { }
-  
-    virtual CORBA::TypeCode_ptr type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_IDLType_ptr type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA::Any * value (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void value (
-      CORBA_Object *_collocated_tao_target_,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-protected:
-  _TAO_CORBA_ConstantDef_Proxy_Impl (void);
-
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_ConstantDef_Remote_Proxy_Impl : 
-  public virtual _TAO_CORBA_ConstantDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_CORBA_ConstantDef_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_CORBA_ConstantDef_Remote_Proxy_Impl (void) { }
-  
-    virtual CORBA::TypeCode_ptr type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_IDLType_ptr type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Any * value (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void value (
-      CORBA_Object *_collocated_tao_target_,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-};
-
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
-
+    public:
+    #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+      typedef CORBA_ConstantDef_ptr _ptr_type;
+      typedef CORBA_ConstantDef_var _var_type;
+    #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+      // the static operations
+      static CORBA_ConstantDef_ptr _duplicate (CORBA_ConstantDef_ptr obj);
+
+      static CORBA_ConstantDef_ptr _narrow (
+          CORBA::Object_ptr obj,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        );
+
+      static CORBA_ConstantDef_ptr _unchecked_narrow (
+          CORBA::Object_ptr obj,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        );
+
+      static CORBA_ConstantDef_ptr _nil (void)
+        {
+          return (CORBA_ConstantDef_ptr)0;
+        }
+
+      static void _tao_any_destructor (void*);
+
+      virtual CORBA::TypeCode_ptr type (
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_IDLType_ptr type_def (
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual void type_def (
+          CORBA_IDLType_ptr type_def,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA::Any * value (
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual void value (
+          const CORBA::Any & value,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA::Boolean _is_a (
+          const CORBA::Char *type_id,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        );
+
+      virtual void *_tao_QueryInterface (ptr_arith_t type);
+
+      virtual const char* _interface_repository_id (void) const;
+
+    private:
+      _TAO_CORBA_ConstantDef_Proxy_Broker *the_TAO_CORBA_ConstantDef_Proxy_Broker_;
+
+    protected:
+      CORBA_ConstantDef (int collocated = 0);
+
+      // This methods travese the inheritance tree and set the
+      // parents piece of the given class in the right mode
+      virtual void CORBA_ConstantDef_setup_collocation (int collocated);
+
+      CORBA_ConstantDef (
+          TAO_Stub *objref,
+          CORBA::Boolean _tao_collocated = 0,
+          TAO_Abstract_ServantBase *servant = 0
+        );
+
+      friend class _TAO_CORBA_ConstantDef_Remote_Proxy_Impl;
+      friend class _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl;
+      friend class _TAO_CORBA_ConstantDef_Direct_Proxy_Impl;
+
+      virtual ~CORBA_ConstantDef (void);
+
+    private:
+      CORBA_ConstantDef (const CORBA_ConstantDef &);
+      void operator= (const CORBA_ConstantDef &);
+    };
+
+    // The Proxy Implementations are used by each interface to
+    // perform a call. Each different implementation encapsulate
+    // an invocation logics.
+
+
+    ///////////////////////////////////////////////////////////////////////
+    //                    Base Proxy Impl. Declaration
+    //
+
+    class TAO_IFR_Client_Export _TAO_CORBA_ConstantDef_Proxy_Impl
+      : public virtual _TAO_CORBA_Contained_Proxy_Impl
+    {
+    public:
+      virtual ~_TAO_CORBA_ConstantDef_Proxy_Impl (void) { }
+      virtual CORBA::TypeCode_ptr type (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual CORBA_IDLType_ptr type_def (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual void type_def (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA_IDLType_ptr type_def,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual CORBA::Any * value (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual void value (
+          CORBA_Object *_collocated_tao_target_,
+          const CORBA::Any & value,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+
+    protected:
+      _TAO_CORBA_ConstantDef_Proxy_Impl (void);
+    };
+
+    //
+    //               End Base Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+
+
+    ///////////////////////////////////////////////////////////////////////
+    //                Remote Proxy Impl. Declaration
+    //
+
+    class TAO_IFR_Client_Export _TAO_CORBA_ConstantDef_Remote_Proxy_Impl
+      : public virtual _TAO_CORBA_ConstantDef_Proxy_Impl,
+        public virtual TAO_Remote_Object_Proxy_Impl,
+        public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl
+    {
+    public:
+      _TAO_CORBA_ConstantDef_Remote_Proxy_Impl (void);
+
+      virtual ~_TAO_CORBA_ConstantDef_Remote_Proxy_Impl (void) { }
+      virtual CORBA::TypeCode_ptr type (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_IDLType_ptr type_def (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual void type_def (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA_IDLType_ptr type_def,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA::Any * value (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual void value (
+          CORBA_Object *_collocated_tao_target_,
+          const CORBA::Any & value,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+
+    };
+
+    //
+    //             End Remote Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+
+    // The Proxy Brokers are used by each interface to get
+    // the right proxy for performing a call. In the new
+    // collocation scheme, the proxy to be used can vary on
+    // a call by call basis.
+
+
+    ///////////////////////////////////////////////////////////////////////
+    //                 Base Proxy Broker Declaration
+    //
+
+        class TAO_IFR_Client_Export _TAO_CORBA_ConstantDef_Proxy_Broker
+    {
+    public:
+      virtual ~_TAO_CORBA_ConstantDef_Proxy_Broker (void);
+      virtual _TAO_CORBA_ConstantDef_Proxy_Impl &select_proxy (
+          CORBA_ConstantDef *object,
+          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+        ) = 0;
 
+    protected:
+      _TAO_CORBA_ConstantDef_Proxy_Broker (void);
 
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
+    };
 
-class TAO_IFR_Client_Export _TAO_CORBA_ConstantDef_Proxy_Broker
-{
-public:
-  virtual ~_TAO_CORBA_ConstantDef_Proxy_Broker (void);
-  virtual _TAO_CORBA_ConstantDef_Proxy_Impl &select_proxy (
-    CORBA_ConstantDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
+    //
+    //              End Base Proxy Broker Declaration
+    ///////////////////////////////////////////////////////////////////////
 
-protected:
-  _TAO_CORBA_ConstantDef_Proxy_Broker (void);
-  
-};
-
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
 
+    ///////////////////////////////////////////////////////////////////////
+    //                 Remote Proxy Broker Declaration
+    //
 
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
+    class TAO_IFR_Client_Export _TAO_CORBA_ConstantDef_Remote_Proxy_Broker
+      : public virtual _TAO_CORBA_ConstantDef_Proxy_Broker
+    {
+    public:
+      _TAO_CORBA_ConstantDef_Remote_Proxy_Broker (void);
 
-class TAO_IFR_Client_Export _TAO_CORBA_ConstantDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_ConstantDef_Proxy_Broker
-{
-public: 
-  _TAO_CORBA_ConstantDef_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_CORBA_ConstantDef_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_CORBA_ConstantDef_Proxy_Impl &select_proxy (
-    CORBA_ConstantDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
+      virtual ~_TAO_CORBA_ConstantDef_Remote_Proxy_Broker (void);
 
-private:
-  _TAO_CORBA_ConstantDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
+      virtual _TAO_CORBA_ConstantDef_Proxy_Impl &select_proxy (
+          CORBA_ConstantDef *object,
+          CORBA_Environment &ACE_TRY_ENV
+        );
 
-public:
-  static _TAO_CORBA_ConstantDef_Remote_Proxy_Broker *the_TAO_CORBA_ConstantDef_Remote_Proxy_Broker (void);
-};
+      private:
+        _TAO_CORBA_ConstantDef_Remote_Proxy_Impl remote_proxy_impl_;
 
+      public:
+        // This member function is used to get an handle to the unique instance
+        // of the Remote Proxy Broker that is available for a given
+        // interface.
+        static _TAO_CORBA_ConstantDef_Remote_Proxy_Broker *the_TAO_CORBA_ConstantDef_Remote_Proxy_Broker (void);
+      };
 
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+      //
+      //              End Remote Proxy Broker Declaration
+      ///////////////////////////////////////////////////////////////////////
 
 
 #endif /* end #if !defined */
 
-struct CORBA_ConstantDescription;
-class CORBA_ConstantDescription_var;
 
-struct TAO_IFR_Client_Export CORBA_ConstantDescription
-{
+      struct CORBA_ConstantDescription;
+      class CORBA_ConstantDescription_var;
+
+      struct TAO_IFR_Client_Export CORBA_ConstantDescription
+      {
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_ConstantDescription_var _var_type;
+        typedef CORBA_ConstantDescription_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-  static void _tao_any_destructor (void*);
-
-  TAO_String_Manager name;
-  TAO_String_Manager id;
-  TAO_String_Manager defined_in;
-  TAO_String_Manager version;
-  CORBA::TypeCode_var type;
-  CORBA::Any value;
-};
+        static void _tao_any_destructor (void*);
+
+        TAO_String_Manager name;
+        TAO_String_Manager id;
+        TAO_String_Manager defined_in;
+        TAO_String_Manager version;
+        CORBA::TypeCode_var type;
+        CORBA::Any value;
+
+      };
+
+      class TAO_IFR_Client_Export CORBA_ConstantDescription_var
+      {
+      public:
+        CORBA_ConstantDescription_var (void);
+        CORBA_ConstantDescription_var (CORBA_ConstantDescription *);
+        CORBA_ConstantDescription_var (const CORBA_ConstantDescription_var &);
+        ~CORBA_ConstantDescription_var (void);
+
+        CORBA_ConstantDescription_var &operator= (CORBA_ConstantDescription *);
+        CORBA_ConstantDescription_var &operator= (const CORBA_ConstantDescription_var &);
+        CORBA_ConstantDescription *operator-> (void);
+        const CORBA_ConstantDescription *operator-> (void) const;
+
+        operator const CORBA_ConstantDescription &() const;
+        operator CORBA_ConstantDescription &();
+        operator CORBA_ConstantDescription &() const;
+        // Variable-size types only.
+        operator CORBA_ConstantDescription *&();
+
+        // in, inout, out, _retn
+        const CORBA_ConstantDescription &in (void) const;
+        CORBA_ConstantDescription &inout (void);
+        CORBA_ConstantDescription *&out (void);
+        CORBA_ConstantDescription *_retn (void);
+        CORBA_ConstantDescription *ptr (void) const;
+
+      private:
+        CORBA_ConstantDescription *ptr_;
+      };
+
+      class TAO_IFR_Client_Export CORBA_ConstantDescription_out
+      {
+      public:
+        CORBA_ConstantDescription_out (CORBA_ConstantDescription *&);
+        CORBA_ConstantDescription_out (CORBA_ConstantDescription_var &);
+        CORBA_ConstantDescription_out (const CORBA_ConstantDescription_out &);
+        CORBA_ConstantDescription_out &operator= (const CORBA_ConstantDescription_out &);
+        CORBA_ConstantDescription_out &operator= (CORBA_ConstantDescription *);
+        operator CORBA_ConstantDescription *&();
+        CORBA_ConstantDescription *&ptr (void);
+        CORBA_ConstantDescription *operator-> (void);
+
+      private:
+        CORBA_ConstantDescription *&ptr_;
+        // Assignment from T_var not allowed.
+        void operator= (const CORBA_ConstantDescription_var &);
+      };
 
-class TAO_IFR_Client_Export CORBA_ConstantDescription_var
-{
-public:
-  CORBA_ConstantDescription_var (void); // default constructor
-  CORBA_ConstantDescription_var (CORBA_ConstantDescription *);
-  CORBA_ConstantDescription_var (const CORBA_ConstantDescription_var &); // copy constructor
-  ~CORBA_ConstantDescription_var (void); // destructor
-  
-  CORBA_ConstantDescription_var &operator= (CORBA_ConstantDescription *);
-  CORBA_ConstantDescription_var &operator= (const CORBA_ConstantDescription_var &);
-  CORBA_ConstantDescription *operator-> (void);
-  const CORBA_ConstantDescription *operator-> (void) const;
-  
-  operator const CORBA_ConstantDescription &() const;
-  operator CORBA_ConstantDescription &();
-  operator CORBA_ConstantDescription &() const;
-  operator CORBA_ConstantDescription *&(); // variable-size types only
-  
-  // in, inout, out, _retn 
-  const CORBA_ConstantDescription &in (void) const;
-  CORBA_ConstantDescription &inout (void);
-  CORBA_ConstantDescription *&out (void);
-  CORBA_ConstantDescription *_retn (void);
-  CORBA_ConstantDescription *ptr (void) const;
-
-private:
-  CORBA_ConstantDescription *ptr_;
-};
-
-class TAO_IFR_Client_Export CORBA_ConstantDescription_out
-{
-public:
-  CORBA_ConstantDescription_out (CORBA_ConstantDescription *&);
-  CORBA_ConstantDescription_out (CORBA_ConstantDescription_var &);
-  CORBA_ConstantDescription_out (const CORBA_ConstantDescription_out &);
-  CORBA_ConstantDescription_out &operator= (const CORBA_ConstantDescription_out &);
-  CORBA_ConstantDescription_out &operator= (CORBA_ConstantDescription *);
-  operator CORBA_ConstantDescription *&();
-  CORBA_ConstantDescription *&ptr (void);
-  CORBA_ConstantDescription *operator-> (void);
-  
-private:
-  CORBA_ConstantDescription *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_ConstantDescription_var &);
-};
 
 
 #if !defined (_CORBA_STRUCTDEF___PTR_CH_)
 #define _CORBA_STRUCTDEF___PTR_CH_
 
-class CORBA_StructDef;
-typedef CORBA_StructDef *CORBA_StructDef_ptr;
+      class CORBA_StructDef;
+      typedef CORBA_StructDef *CORBA_StructDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -1785,41 +1823,44 @@ typedef CORBA_StructDef *CORBA_StructDef_ptr;
 #if !defined (_CORBA_STRUCTDEF___VAR_CH_)
 #define _CORBA_STRUCTDEF___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_StructDef_var : public TAO_Base_var
-{
-public:
-  CORBA_StructDef_var (void); // default constructor
-  CORBA_StructDef_var (CORBA_StructDef_ptr p) : ptr_ (p) {} 
-  CORBA_StructDef_var (const CORBA_StructDef_var &); // copy constructor
-  ~CORBA_StructDef_var (void); // destructor
-  
-  CORBA_StructDef_var &operator= (CORBA_StructDef_ptr);
-  CORBA_StructDef_var &operator= (const CORBA_StructDef_var &);
-  CORBA_StructDef_ptr operator-> (void) const;
-  
-  operator const CORBA_StructDef_ptr &() const;
-  operator CORBA_StructDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_StructDef_ptr in (void) const;
-  CORBA_StructDef_ptr &inout (void);
-  CORBA_StructDef_ptr &out (void);
-  CORBA_StructDef_ptr _retn (void);
-  CORBA_StructDef_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_StructDef_ptr duplicate (CORBA_StructDef_ptr);
-  static void release (CORBA_StructDef_ptr);
-  static CORBA_StructDef_ptr nil (void);
-  static CORBA_StructDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
-
-private:
-  CORBA_StructDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_StructDef_var (const TAO_Base_var &rhs);
-  CORBA_StructDef_var &operator= (const TAO_Base_var &rhs);
-};
+      class TAO_IFR_Client_Export CORBA_StructDef_var : public TAO_Base_var
+      {
+      public:
+        CORBA_StructDef_var (void); // default constructor
+        CORBA_StructDef_var (CORBA_StructDef_ptr p) : ptr_ (p) {}
+        CORBA_StructDef_var (const CORBA_StructDef_var &); // copy constructor
+        ~CORBA_StructDef_var (void); // destructor
+
+        CORBA_StructDef_var &operator= (CORBA_StructDef_ptr);
+        CORBA_StructDef_var &operator= (const CORBA_StructDef_var &);
+        CORBA_StructDef_ptr operator-> (void) const;
+
+        operator const CORBA_StructDef_ptr &() const;
+        operator CORBA_StructDef_ptr &();
+        // in, inout, out, _retn
+        CORBA_StructDef_ptr in (void) const;
+        CORBA_StructDef_ptr &inout (void);
+        CORBA_StructDef_ptr &out (void);
+        CORBA_StructDef_ptr _retn (void);
+        CORBA_StructDef_ptr ptr (void) const;
+
+        // Hooks used by template sequence and object manager classes
+        // for non-defined forward declared interfaces.
+        static CORBA_StructDef_ptr duplicate (CORBA_StructDef_ptr);
+        static void release (CORBA_StructDef_ptr);
+        static CORBA_StructDef_ptr nil (void);
+        static CORBA_StructDef_ptr narrow (
+            CORBA::Object *,
+            CORBA::Environment &
+          );
+        static CORBA::Object * upcast (void *);
+
+      private:
+        CORBA_StructDef_ptr ptr_;
+        // Unimplemented - prevents widening assignment.
+        CORBA_StructDef_var (const TAO_Base_var &rhs);
+        CORBA_StructDef_var &operator= (const TAO_Base_var &rhs);
+      };
 
 
 #endif /* end #if !defined */
@@ -1828,22 +1869,22 @@ private:
 #if !defined (_CORBA_STRUCTDEF___OUT_CH_)
 #define _CORBA_STRUCTDEF___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_StructDef_out
-{
-public:
-  CORBA_StructDef_out (CORBA_StructDef_ptr &);
-  CORBA_StructDef_out (CORBA_StructDef_var &);
-  CORBA_StructDef_out (const CORBA_StructDef_out &);
-  CORBA_StructDef_out &operator= (const CORBA_StructDef_out &);
-  CORBA_StructDef_out &operator= (const CORBA_StructDef_var &);
-  CORBA_StructDef_out &operator= (CORBA_StructDef_ptr);
-  operator CORBA_StructDef_ptr &();
-  CORBA_StructDef_ptr &ptr (void);
-  CORBA_StructDef_ptr operator-> (void);
+      class TAO_IFR_Client_Export CORBA_StructDef_out
+      {
+      public:
+        CORBA_StructDef_out (CORBA_StructDef_ptr &);
+        CORBA_StructDef_out (CORBA_StructDef_var &);
+        CORBA_StructDef_out (const CORBA_StructDef_out &);
+        CORBA_StructDef_out &operator= (const CORBA_StructDef_out &);
+        CORBA_StructDef_out &operator= (const CORBA_StructDef_var &);
+        CORBA_StructDef_out &operator= (CORBA_StructDef_ptr);
+        operator CORBA_StructDef_ptr &();
+        CORBA_StructDef_ptr &ptr (void);
+        CORBA_StructDef_ptr operator-> (void);
 
-private:
-  CORBA_StructDef_ptr &ptr_;
-};
+      private:
+        CORBA_StructDef_ptr &ptr_;
+      };
 
 
 #endif /* end #if !defined */
@@ -1852,245 +1893,248 @@ private:
 #if !defined (_CORBA_STRUCTDEF_CH_)
 #define _CORBA_STRUCTDEF_CH_
 
-// Forward Classes Declaration
-class _TAO_CORBA_StructDef_Proxy_Impl;
-class _TAO_CORBA_StructDef_Remote_Proxy_Impl;
-class _TAO_CORBA_StructDef_Proxy_Broker;
-class _TAO_CORBA_StructDef_Remote_Proxy_Broker;
-
-class TAO_IFR_Client_Export CORBA_StructDef: public virtual CORBA_TypedefDef, public virtual CORBA_Container
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_StructDef_ptr _ptr_type;
-  typedef CORBA_StructDef_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static CORBA_StructDef_ptr _duplicate (CORBA_StructDef_ptr obj);
-  static CORBA_StructDef_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_StructDef_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_StructDef_ptr _nil (void)
-    {
-      return (CORBA_StructDef_ptr)0;
-    }
+      // Forward Classes Declaration
+      class _TAO_CORBA_StructDef_Proxy_Impl;
+      class _TAO_CORBA_StructDef_Remote_Proxy_Impl;
+      class _TAO_CORBA_StructDef_Proxy_Broker;
+      class _TAO_CORBA_StructDef_Remote_Proxy_Broker;
+
+      class TAO_IFR_Client_Export CORBA_StructDef
+        : public virtual CORBA_TypedefDef,
+          public virtual CORBA_Container
+      {
+      public:
+      #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+        typedef CORBA_StructDef_ptr _ptr_type;
+        typedef CORBA_StructDef_var _var_type;
+      #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+        // the static operations
+        static CORBA_StructDef_ptr _duplicate (CORBA_StructDef_ptr obj);
+
+        static CORBA_StructDef_ptr _narrow (
+            CORBA::Object_ptr obj,
+            CORBA::Environment &ACE_TRY_ENV =
+              TAO_default_environment ()
+          );
+
+        static CORBA_StructDef_ptr _unchecked_narrow (
+            CORBA::Object_ptr obj,
+            CORBA::Environment &ACE_TRY_ENV =
+              TAO_default_environment ()
+          );
+
+        static CORBA_StructDef_ptr _nil (void)
+          {
+            return (CORBA_StructDef_ptr)0;
+          }
+
+        static void _tao_any_destructor (void*);
+
+        virtual CORBA_StructMemberSeq * members (
+            CORBA::Environment &ACE_TRY_ENV =
+              TAO_default_environment ()
+          )
+          ACE_THROW_SPEC ((
+            CORBA::SystemException
+          ));
+
+        virtual void members (
+            const CORBA_StructMemberSeq & members,
+            CORBA::Environment &ACE_TRY_ENV =
+              TAO_default_environment ()
+          )
+          ACE_THROW_SPEC ((
+            CORBA::SystemException
+          ));
+
+        virtual CORBA::Boolean _is_a (
+            const CORBA::Char *type_id,
+            CORBA::Environment &ACE_TRY_ENV =
+              TAO_default_environment ()
+          );
+
+        virtual void *_tao_QueryInterface (ptr_arith_t type);
+
+        virtual const char* _interface_repository_id (void) const;
+
+      private:
+        _TAO_CORBA_StructDef_Proxy_Broker *the_TAO_CORBA_StructDef_Proxy_Broker_;
+
+      protected:
+        CORBA_StructDef (int collocated = 0);
+
+        // This methods travese the inheritance tree and set the
+        // parents piece of the given class in the right mode
+        virtual void CORBA_StructDef_setup_collocation (int collocated);
+
+        CORBA_StructDef (
+            TAO_Stub *objref,
+            CORBA::Boolean _tao_collocated = 0,
+            TAO_Abstract_ServantBase *servant = 0
+          );
+
+        friend class _TAO_CORBA_StructDef_Remote_Proxy_Impl;
+        friend class _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl;
+        friend class _TAO_CORBA_StructDef_Direct_Proxy_Impl;
+
+        virtual ~CORBA_StructDef (void);
+
+      private:
+        CORBA_StructDef (const CORBA_StructDef &);
+        void operator= (const CORBA_StructDef &);
+      };
+
+      // The Proxy Implementations are used by each interface to
+      // perform a call. Each different implementation encapsulate
+      // an invocation logics.
+
+
+      ///////////////////////////////////////////////////////////////////////
+      //                    Base Proxy Impl. Declaration
+      //
+
+      class TAO_IFR_Client_Export _TAO_CORBA_StructDef_Proxy_Impl
+        : public virtual _TAO_CORBA_TypedefDef_Proxy_Impl,
+          public virtual _TAO_CORBA_Container_Proxy_Impl
+      {
+      public:
+        virtual ~_TAO_CORBA_StructDef_Proxy_Impl (void) { }
+        virtual CORBA_StructMemberSeq * members (
+            CORBA_Object *_collocated_tao_target_,
+            CORBA::Environment &ACE_TRY_ENV
+          )
+          ACE_THROW_SPEC ((
+            CORBA::SystemException
+          )) = 0;
+
+        virtual void members (
+            CORBA_Object *_collocated_tao_target_,
+            const CORBA_StructMemberSeq & members,
+            CORBA::Environment &ACE_TRY_ENV
+          )
+          ACE_THROW_SPEC ((
+            CORBA::SystemException
+          )) = 0;
+
+
+      protected:
+        _TAO_CORBA_StructDef_Proxy_Impl (void);
+      };
+
+      //
+      //               End Base Proxy Impl. Declaration
+      ///////////////////////////////////////////////////////////////////////
+
+
+      ///////////////////////////////////////////////////////////////////////
+      //                Remote Proxy Impl. Declaration
+      //
+
+      class TAO_IFR_Client_Export _TAO_CORBA_StructDef_Remote_Proxy_Impl
+        : public virtual _TAO_CORBA_StructDef_Proxy_Impl,
+          public virtual TAO_Remote_Object_Proxy_Impl,
+          public virtual _TAO_CORBA_TypedefDef_Remote_Proxy_Impl,
+          public virtual _TAO_CORBA_Container_Remote_Proxy_Impl
+      {
+      public:
+        _TAO_CORBA_StructDef_Remote_Proxy_Impl (void);
+
+        virtual ~_TAO_CORBA_StructDef_Remote_Proxy_Impl (void) { }
+        virtual CORBA_StructMemberSeq * members (
+            CORBA_Object *_collocated_tao_target_,
+            CORBA::Environment &ACE_TRY_ENV
+          )
+          ACE_THROW_SPEC ((
+            CORBA::SystemException
+          ));
+
+        virtual void members (
+            CORBA_Object *_collocated_tao_target_,
+            const CORBA_StructMemberSeq & members,
+            CORBA::Environment &ACE_TRY_ENV
+          )
+          ACE_THROW_SPEC ((
+            CORBA::SystemException
+          ));
+
+
+      };
+
+      //
+      //             End Remote Proxy Impl. Declaration
+      ///////////////////////////////////////////////////////////////////////
+
+      // The Proxy Brokers are used by each interface to get
+      // the right proxy for performing a call. In the new
+      // collocation scheme, the proxy to be used can vary on
+      // a call by call basis.
+
+
+      ///////////////////////////////////////////////////////////////////////
+      //                 Base Proxy Broker Declaration
+      //
+
+            class TAO_IFR_Client_Export _TAO_CORBA_StructDef_Proxy_Broker
+      {
+      public:
+        virtual ~_TAO_CORBA_StructDef_Proxy_Broker (void);
+        virtual _TAO_CORBA_StructDef_Proxy_Impl &select_proxy (
+            CORBA_StructDef *object,
+            CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+          ) = 0;
+
+      protected:
+        _TAO_CORBA_StructDef_Proxy_Broker (void);
+
+      };
+
+      //
+      //              End Base Proxy Broker Declaration
+      ///////////////////////////////////////////////////////////////////////
+
+
+      ///////////////////////////////////////////////////////////////////////
+      //                 Remote Proxy Broker Declaration
+      //
+
+      class TAO_IFR_Client_Export _TAO_CORBA_StructDef_Remote_Proxy_Broker
+        : public virtual _TAO_CORBA_StructDef_Proxy_Broker
+      {
+      public:
+        _TAO_CORBA_StructDef_Remote_Proxy_Broker (void);
+
+        virtual ~_TAO_CORBA_StructDef_Remote_Proxy_Broker (void);
+
+        virtual _TAO_CORBA_StructDef_Proxy_Impl &select_proxy (
+            CORBA_StructDef *object,
+            CORBA_Environment &ACE_TRY_ENV
+          );
+
+        private:
+          _TAO_CORBA_StructDef_Remote_Proxy_Impl remote_proxy_impl_;
 
-  static void _tao_any_destructor (void*);
+        public:
+          // This member function is used to get an handle to the unique instance
+          // of the Remote Proxy Broker that is available for a given
+          // interface.
+          static _TAO_CORBA_StructDef_Remote_Proxy_Broker *the_TAO_CORBA_StructDef_Remote_Proxy_Broker (void);
+        };
 
-  virtual CORBA_StructMemberSeq * members (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void members (
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
-
-private:
-  _TAO_CORBA_StructDef_Proxy_Broker *the_TAO_CORBA_StructDef_Proxy_Broker_;
-  
-protected:
-  CORBA_StructDef (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void CORBA_StructDef_setup_collocation (int collocated);
-    
-    CORBA_StructDef (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_CORBA_StructDef_Remote_Proxy_Impl;
-    friend class _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_CORBA_StructDef_Direct_Proxy_Impl;
-  
-  virtual ~CORBA_StructDef (void);
-private:
-  CORBA_StructDef (const CORBA_StructDef &);
-  void operator= (const CORBA_StructDef &);
-};
-
-
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_StructDef_Proxy_Impl : 
-  public virtual _TAO_CORBA_TypedefDef_Proxy_Impl, 
-  public virtual _TAO_CORBA_Container_Proxy_Impl
-{
-public:
-  virtual ~_TAO_CORBA_StructDef_Proxy_Impl (void) { }
-  
-    virtual CORBA_StructMemberSeq * members (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void members (
-      CORBA_Object *_collocated_tao_target_,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-protected:
-  _TAO_CORBA_StructDef_Proxy_Impl (void);
-
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_StructDef_Remote_Proxy_Impl : 
-  public virtual _TAO_CORBA_StructDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_TypedefDef_Remote_Proxy_Impl, 
-  public virtual _TAO_CORBA_Container_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_CORBA_StructDef_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_CORBA_StructDef_Remote_Proxy_Impl (void) { }
-  
-    virtual CORBA_StructMemberSeq * members (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void members (
-      CORBA_Object *_collocated_tao_target_,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-};
-
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
-
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_StructDef_Proxy_Broker
-{
-public:
-  virtual ~_TAO_CORBA_StructDef_Proxy_Broker (void);
-  virtual _TAO_CORBA_StructDef_Proxy_Impl &select_proxy (
-    CORBA_StructDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
-
-protected:
-  _TAO_CORBA_StructDef_Proxy_Broker (void);
-  
-};
-
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_StructDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_StructDef_Proxy_Broker
-{
-public: 
-  _TAO_CORBA_StructDef_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_CORBA_StructDef_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_CORBA_StructDef_Proxy_Impl &select_proxy (
-    CORBA_StructDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
-
-private:
-  _TAO_CORBA_StructDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
-
-public:
-  static _TAO_CORBA_StructDef_Remote_Proxy_Broker *the_TAO_CORBA_StructDef_Remote_Proxy_Broker (void);
-};
-
-
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+        //
+        //              End Remote Proxy Broker Declaration
+        ///////////////////////////////////////////////////////////////////////
 
 
 #endif /* end #if !defined */
 
 
+
 #if !defined (_CORBA_UNIONDEF___PTR_CH_)
 #define _CORBA_UNIONDEF___PTR_CH_
 
-class CORBA_UnionDef;
-typedef CORBA_UnionDef *CORBA_UnionDef_ptr;
+        class CORBA_UnionDef;
+        typedef CORBA_UnionDef *CORBA_UnionDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -2098,41 +2142,44 @@ typedef CORBA_UnionDef *CORBA_UnionDef_ptr;
 #if !defined (_CORBA_UNIONDEF___VAR_CH_)
 #define _CORBA_UNIONDEF___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_UnionDef_var : public TAO_Base_var
-{
-public:
-  CORBA_UnionDef_var (void); // default constructor
-  CORBA_UnionDef_var (CORBA_UnionDef_ptr p) : ptr_ (p) {} 
-  CORBA_UnionDef_var (const CORBA_UnionDef_var &); // copy constructor
-  ~CORBA_UnionDef_var (void); // destructor
-  
-  CORBA_UnionDef_var &operator= (CORBA_UnionDef_ptr);
-  CORBA_UnionDef_var &operator= (const CORBA_UnionDef_var &);
-  CORBA_UnionDef_ptr operator-> (void) const;
-  
-  operator const CORBA_UnionDef_ptr &() const;
-  operator CORBA_UnionDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_UnionDef_ptr in (void) const;
-  CORBA_UnionDef_ptr &inout (void);
-  CORBA_UnionDef_ptr &out (void);
-  CORBA_UnionDef_ptr _retn (void);
-  CORBA_UnionDef_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_UnionDef_ptr duplicate (CORBA_UnionDef_ptr);
-  static void release (CORBA_UnionDef_ptr);
-  static CORBA_UnionDef_ptr nil (void);
-  static CORBA_UnionDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
-
-private:
-  CORBA_UnionDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_UnionDef_var (const TAO_Base_var &rhs);
-  CORBA_UnionDef_var &operator= (const TAO_Base_var &rhs);
-};
+        class TAO_IFR_Client_Export CORBA_UnionDef_var : public TAO_Base_var
+        {
+        public:
+          CORBA_UnionDef_var (void); // default constructor
+          CORBA_UnionDef_var (CORBA_UnionDef_ptr p) : ptr_ (p) {}
+          CORBA_UnionDef_var (const CORBA_UnionDef_var &); // copy constructor
+          ~CORBA_UnionDef_var (void); // destructor
+
+          CORBA_UnionDef_var &operator= (CORBA_UnionDef_ptr);
+          CORBA_UnionDef_var &operator= (const CORBA_UnionDef_var &);
+          CORBA_UnionDef_ptr operator-> (void) const;
+
+          operator const CORBA_UnionDef_ptr &() const;
+          operator CORBA_UnionDef_ptr &();
+          // in, inout, out, _retn
+          CORBA_UnionDef_ptr in (void) const;
+          CORBA_UnionDef_ptr &inout (void);
+          CORBA_UnionDef_ptr &out (void);
+          CORBA_UnionDef_ptr _retn (void);
+          CORBA_UnionDef_ptr ptr (void) const;
+
+          // Hooks used by template sequence and object manager classes
+          // for non-defined forward declared interfaces.
+          static CORBA_UnionDef_ptr duplicate (CORBA_UnionDef_ptr);
+          static void release (CORBA_UnionDef_ptr);
+          static CORBA_UnionDef_ptr nil (void);
+          static CORBA_UnionDef_ptr narrow (
+              CORBA::Object *,
+              CORBA::Environment &
+            );
+          static CORBA::Object * upcast (void *);
+
+        private:
+          CORBA_UnionDef_ptr ptr_;
+          // Unimplemented - prevents widening assignment.
+          CORBA_UnionDef_var (const TAO_Base_var &rhs);
+          CORBA_UnionDef_var &operator= (const TAO_Base_var &rhs);
+        };
 
 
 #endif /* end #if !defined */
@@ -2141,22 +2188,22 @@ private:
 #if !defined (_CORBA_UNIONDEF___OUT_CH_)
 #define _CORBA_UNIONDEF___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_UnionDef_out
-{
-public:
-  CORBA_UnionDef_out (CORBA_UnionDef_ptr &);
-  CORBA_UnionDef_out (CORBA_UnionDef_var &);
-  CORBA_UnionDef_out (const CORBA_UnionDef_out &);
-  CORBA_UnionDef_out &operator= (const CORBA_UnionDef_out &);
-  CORBA_UnionDef_out &operator= (const CORBA_UnionDef_var &);
-  CORBA_UnionDef_out &operator= (CORBA_UnionDef_ptr);
-  operator CORBA_UnionDef_ptr &();
-  CORBA_UnionDef_ptr &ptr (void);
-  CORBA_UnionDef_ptr operator-> (void);
+        class TAO_IFR_Client_Export CORBA_UnionDef_out
+        {
+        public:
+          CORBA_UnionDef_out (CORBA_UnionDef_ptr &);
+          CORBA_UnionDef_out (CORBA_UnionDef_var &);
+          CORBA_UnionDef_out (const CORBA_UnionDef_out &);
+          CORBA_UnionDef_out &operator= (const CORBA_UnionDef_out &);
+          CORBA_UnionDef_out &operator= (const CORBA_UnionDef_var &);
+          CORBA_UnionDef_out &operator= (CORBA_UnionDef_ptr);
+          operator CORBA_UnionDef_ptr &();
+          CORBA_UnionDef_ptr &ptr (void);
+          CORBA_UnionDef_ptr operator-> (void);
 
-private:
-  CORBA_UnionDef_ptr &ptr_;
-};
+        private:
+          CORBA_UnionDef_ptr &ptr_;
+        };
 
 
 #endif /* end #if !defined */
@@ -2165,320 +2212,323 @@ private:
 #if !defined (_CORBA_UNIONDEF_CH_)
 #define _CORBA_UNIONDEF_CH_
 
-// Forward Classes Declaration
-class _TAO_CORBA_UnionDef_Proxy_Impl;
-class _TAO_CORBA_UnionDef_Remote_Proxy_Impl;
-class _TAO_CORBA_UnionDef_Proxy_Broker;
-class _TAO_CORBA_UnionDef_Remote_Proxy_Broker;
-
-class TAO_IFR_Client_Export CORBA_UnionDef: public virtual CORBA_TypedefDef, public virtual CORBA_Container
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_UnionDef_ptr _ptr_type;
-  typedef CORBA_UnionDef_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static CORBA_UnionDef_ptr _duplicate (CORBA_UnionDef_ptr obj);
-  static CORBA_UnionDef_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_UnionDef_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_UnionDef_ptr _nil (void)
-    {
-      return (CORBA_UnionDef_ptr)0;
-    }
-
-  static void _tao_any_destructor (void*);
-
-  virtual CORBA::TypeCode_ptr discriminator_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_IDLType_ptr discriminator_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void discriminator_type_def (
-      CORBA_IDLType_ptr discriminator_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_UnionMemberSeq * members (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void members (
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
-
-private:
-  _TAO_CORBA_UnionDef_Proxy_Broker *the_TAO_CORBA_UnionDef_Proxy_Broker_;
-  
-protected:
-  CORBA_UnionDef (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void CORBA_UnionDef_setup_collocation (int collocated);
-    
-    CORBA_UnionDef (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_CORBA_UnionDef_Remote_Proxy_Impl;
-    friend class _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_CORBA_UnionDef_Direct_Proxy_Impl;
-  
-  virtual ~CORBA_UnionDef (void);
-private:
-  CORBA_UnionDef (const CORBA_UnionDef &);
-  void operator= (const CORBA_UnionDef &);
-};
-
-
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_UnionDef_Proxy_Impl : 
-  public virtual _TAO_CORBA_TypedefDef_Proxy_Impl, 
-  public virtual _TAO_CORBA_Container_Proxy_Impl
-{
-public:
-  virtual ~_TAO_CORBA_UnionDef_Proxy_Impl (void) { }
-  
-    virtual CORBA::TypeCode_ptr discriminator_type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_IDLType_ptr discriminator_type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void discriminator_type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr discriminator_type_def,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_UnionMemberSeq * members (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void members (
-      CORBA_Object *_collocated_tao_target_,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-protected:
-  _TAO_CORBA_UnionDef_Proxy_Impl (void);
-
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_UnionDef_Remote_Proxy_Impl : 
-  public virtual _TAO_CORBA_UnionDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_TypedefDef_Remote_Proxy_Impl, 
-  public virtual _TAO_CORBA_Container_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_CORBA_UnionDef_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_CORBA_UnionDef_Remote_Proxy_Impl (void) { }
-  
-    virtual CORBA::TypeCode_ptr discriminator_type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_IDLType_ptr discriminator_type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void discriminator_type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr discriminator_type_def,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_UnionMemberSeq * members (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void members (
-      CORBA_Object *_collocated_tao_target_,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-};
-
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
-
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_UnionDef_Proxy_Broker
-{
-public:
-  virtual ~_TAO_CORBA_UnionDef_Proxy_Broker (void);
-  virtual _TAO_CORBA_UnionDef_Proxy_Impl &select_proxy (
-    CORBA_UnionDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
-
-protected:
-  _TAO_CORBA_UnionDef_Proxy_Broker (void);
-  
-};
-
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_UnionDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_UnionDef_Proxy_Broker
-{
-public: 
-  _TAO_CORBA_UnionDef_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_CORBA_UnionDef_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_CORBA_UnionDef_Proxy_Impl &select_proxy (
-    CORBA_UnionDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
-
-private:
-  _TAO_CORBA_UnionDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
-
-public:
-  static _TAO_CORBA_UnionDef_Remote_Proxy_Broker *the_TAO_CORBA_UnionDef_Remote_Proxy_Broker (void);
-};
-
-
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+        // Forward Classes Declaration
+        class _TAO_CORBA_UnionDef_Proxy_Impl;
+        class _TAO_CORBA_UnionDef_Remote_Proxy_Impl;
+        class _TAO_CORBA_UnionDef_Proxy_Broker;
+        class _TAO_CORBA_UnionDef_Remote_Proxy_Broker;
+
+        class TAO_IFR_Client_Export CORBA_UnionDef
+          : public virtual CORBA_TypedefDef,
+            public virtual CORBA_Container
+        {
+        public:
+        #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+          typedef CORBA_UnionDef_ptr _ptr_type;
+          typedef CORBA_UnionDef_var _var_type;
+        #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+          // the static operations
+          static CORBA_UnionDef_ptr _duplicate (CORBA_UnionDef_ptr obj);
+
+          static CORBA_UnionDef_ptr _narrow (
+              CORBA::Object_ptr obj,
+              CORBA::Environment &ACE_TRY_ENV =
+                TAO_default_environment ()
+            );
+
+          static CORBA_UnionDef_ptr _unchecked_narrow (
+              CORBA::Object_ptr obj,
+              CORBA::Environment &ACE_TRY_ENV =
+                TAO_default_environment ()
+            );
+
+          static CORBA_UnionDef_ptr _nil (void)
+            {
+              return (CORBA_UnionDef_ptr)0;
+            }
+
+          static void _tao_any_destructor (void*);
+
+          virtual CORBA::TypeCode_ptr discriminator_type (
+              CORBA::Environment &ACE_TRY_ENV =
+                TAO_default_environment ()
+            )
+            ACE_THROW_SPEC ((
+              CORBA::SystemException
+            ));
+
+          virtual CORBA_IDLType_ptr discriminator_type_def (
+              CORBA::Environment &ACE_TRY_ENV =
+                TAO_default_environment ()
+            )
+            ACE_THROW_SPEC ((
+              CORBA::SystemException
+            ));
+
+          virtual void discriminator_type_def (
+              CORBA_IDLType_ptr discriminator_type_def,
+              CORBA::Environment &ACE_TRY_ENV =
+                TAO_default_environment ()
+            )
+            ACE_THROW_SPEC ((
+              CORBA::SystemException
+            ));
+
+          virtual CORBA_UnionMemberSeq * members (
+              CORBA::Environment &ACE_TRY_ENV =
+                TAO_default_environment ()
+            )
+            ACE_THROW_SPEC ((
+              CORBA::SystemException
+            ));
+
+          virtual void members (
+              const CORBA_UnionMemberSeq & members,
+              CORBA::Environment &ACE_TRY_ENV =
+                TAO_default_environment ()
+            )
+            ACE_THROW_SPEC ((
+              CORBA::SystemException
+            ));
+
+          virtual CORBA::Boolean _is_a (
+              const CORBA::Char *type_id,
+              CORBA::Environment &ACE_TRY_ENV =
+                TAO_default_environment ()
+            );
+
+          virtual void *_tao_QueryInterface (ptr_arith_t type);
+
+          virtual const char* _interface_repository_id (void) const;
+
+        private:
+          _TAO_CORBA_UnionDef_Proxy_Broker *the_TAO_CORBA_UnionDef_Proxy_Broker_;
+
+        protected:
+          CORBA_UnionDef (int collocated = 0);
+
+          // This methods travese the inheritance tree and set the
+          // parents piece of the given class in the right mode
+          virtual void CORBA_UnionDef_setup_collocation (int collocated);
+
+          CORBA_UnionDef (
+              TAO_Stub *objref,
+              CORBA::Boolean _tao_collocated = 0,
+              TAO_Abstract_ServantBase *servant = 0
+            );
+
+          friend class _TAO_CORBA_UnionDef_Remote_Proxy_Impl;
+          friend class _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl;
+          friend class _TAO_CORBA_UnionDef_Direct_Proxy_Impl;
+
+          virtual ~CORBA_UnionDef (void);
+
+        private:
+          CORBA_UnionDef (const CORBA_UnionDef &);
+          void operator= (const CORBA_UnionDef &);
+        };
+
+        // The Proxy Implementations are used by each interface to
+        // perform a call. Each different implementation encapsulate
+        // an invocation logics.
+
+
+        ///////////////////////////////////////////////////////////////////////
+        //                    Base Proxy Impl. Declaration
+        //
+
+        class TAO_IFR_Client_Export _TAO_CORBA_UnionDef_Proxy_Impl
+          : public virtual _TAO_CORBA_TypedefDef_Proxy_Impl,
+            public virtual _TAO_CORBA_Container_Proxy_Impl
+        {
+        public:
+          virtual ~_TAO_CORBA_UnionDef_Proxy_Impl (void) { }
+          virtual CORBA::TypeCode_ptr discriminator_type (
+              CORBA_Object *_collocated_tao_target_,
+              CORBA::Environment &ACE_TRY_ENV
+            )
+            ACE_THROW_SPEC ((
+              CORBA::SystemException
+            )) = 0;
+
+          virtual CORBA_IDLType_ptr discriminator_type_def (
+              CORBA_Object *_collocated_tao_target_,
+              CORBA::Environment &ACE_TRY_ENV
+            )
+            ACE_THROW_SPEC ((
+              CORBA::SystemException
+            )) = 0;
+
+          virtual void discriminator_type_def (
+              CORBA_Object *_collocated_tao_target_,
+              CORBA_IDLType_ptr discriminator_type_def,
+              CORBA::Environment &ACE_TRY_ENV
+            )
+            ACE_THROW_SPEC ((
+              CORBA::SystemException
+            )) = 0;
+
+          virtual CORBA_UnionMemberSeq * members (
+              CORBA_Object *_collocated_tao_target_,
+              CORBA::Environment &ACE_TRY_ENV
+            )
+            ACE_THROW_SPEC ((
+              CORBA::SystemException
+            )) = 0;
+
+          virtual void members (
+              CORBA_Object *_collocated_tao_target_,
+              const CORBA_UnionMemberSeq & members,
+              CORBA::Environment &ACE_TRY_ENV
+            )
+            ACE_THROW_SPEC ((
+              CORBA::SystemException
+            )) = 0;
+
+
+        protected:
+          _TAO_CORBA_UnionDef_Proxy_Impl (void);
+        };
+
+        //
+        //               End Base Proxy Impl. Declaration
+        ///////////////////////////////////////////////////////////////////////
+
+
+        ///////////////////////////////////////////////////////////////////////
+        //                Remote Proxy Impl. Declaration
+        //
+
+        class TAO_IFR_Client_Export _TAO_CORBA_UnionDef_Remote_Proxy_Impl
+          : public virtual _TAO_CORBA_UnionDef_Proxy_Impl,
+            public virtual TAO_Remote_Object_Proxy_Impl,
+            public virtual _TAO_CORBA_TypedefDef_Remote_Proxy_Impl,
+            public virtual _TAO_CORBA_Container_Remote_Proxy_Impl
+        {
+        public:
+          _TAO_CORBA_UnionDef_Remote_Proxy_Impl (void);
+
+          virtual ~_TAO_CORBA_UnionDef_Remote_Proxy_Impl (void) { }
+          virtual CORBA::TypeCode_ptr discriminator_type (
+              CORBA_Object *_collocated_tao_target_,
+              CORBA::Environment &ACE_TRY_ENV
+            )
+            ACE_THROW_SPEC ((
+              CORBA::SystemException
+            ));
+
+          virtual CORBA_IDLType_ptr discriminator_type_def (
+              CORBA_Object *_collocated_tao_target_,
+              CORBA::Environment &ACE_TRY_ENV
+            )
+            ACE_THROW_SPEC ((
+              CORBA::SystemException
+            ));
+
+          virtual void discriminator_type_def (
+              CORBA_Object *_collocated_tao_target_,
+              CORBA_IDLType_ptr discriminator_type_def,
+              CORBA::Environment &ACE_TRY_ENV
+            )
+            ACE_THROW_SPEC ((
+              CORBA::SystemException
+            ));
+
+          virtual CORBA_UnionMemberSeq * members (
+              CORBA_Object *_collocated_tao_target_,
+              CORBA::Environment &ACE_TRY_ENV
+            )
+            ACE_THROW_SPEC ((
+              CORBA::SystemException
+            ));
+
+          virtual void members (
+              CORBA_Object *_collocated_tao_target_,
+              const CORBA_UnionMemberSeq & members,
+              CORBA::Environment &ACE_TRY_ENV
+            )
+            ACE_THROW_SPEC ((
+              CORBA::SystemException
+            ));
+
+
+        };
+
+        //
+        //             End Remote Proxy Impl. Declaration
+        ///////////////////////////////////////////////////////////////////////
+
+        // The Proxy Brokers are used by each interface to get
+        // the right proxy for performing a call. In the new
+        // collocation scheme, the proxy to be used can vary on
+        // a call by call basis.
+
+
+        ///////////////////////////////////////////////////////////////////////
+        //                 Base Proxy Broker Declaration
+        //
+
+                class TAO_IFR_Client_Export _TAO_CORBA_UnionDef_Proxy_Broker
+        {
+        public:
+          virtual ~_TAO_CORBA_UnionDef_Proxy_Broker (void);
+          virtual _TAO_CORBA_UnionDef_Proxy_Impl &select_proxy (
+              CORBA_UnionDef *object,
+              CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+            ) = 0;
+
+        protected:
+          _TAO_CORBA_UnionDef_Proxy_Broker (void);
+
+        };
+
+        //
+        //              End Base Proxy Broker Declaration
+        ///////////////////////////////////////////////////////////////////////
+
+
+        ///////////////////////////////////////////////////////////////////////
+        //                 Remote Proxy Broker Declaration
+        //
+
+        class TAO_IFR_Client_Export _TAO_CORBA_UnionDef_Remote_Proxy_Broker
+          : public virtual _TAO_CORBA_UnionDef_Proxy_Broker
+        {
+        public:
+          _TAO_CORBA_UnionDef_Remote_Proxy_Broker (void);
+
+          virtual ~_TAO_CORBA_UnionDef_Remote_Proxy_Broker (void);
+
+          virtual _TAO_CORBA_UnionDef_Proxy_Impl &select_proxy (
+              CORBA_UnionDef *object,
+              CORBA_Environment &ACE_TRY_ENV
+            );
+
+          private:
+            _TAO_CORBA_UnionDef_Remote_Proxy_Impl remote_proxy_impl_;
+
+          public:
+            // This member function is used to get an handle to the unique instance
+            // of the Remote Proxy Broker that is available for a given
+            // interface.
+            static _TAO_CORBA_UnionDef_Remote_Proxy_Broker *the_TAO_CORBA_UnionDef_Remote_Proxy_Broker (void);
+          };
+
+          //
+          //              End Remote Proxy Broker Declaration
+          ///////////////////////////////////////////////////////////////////////
 
 
 #endif /* end #if !defined */
 
 
+
 #if !defined (_CORBA_ENUMDEF___PTR_CH_)
 #define _CORBA_ENUMDEF___PTR_CH_
 
-class CORBA_EnumDef;
-typedef CORBA_EnumDef *CORBA_EnumDef_ptr;
+          class CORBA_EnumDef;
+          typedef CORBA_EnumDef *CORBA_EnumDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -2486,41 +2536,44 @@ typedef CORBA_EnumDef *CORBA_EnumDef_ptr;
 #if !defined (_CORBA_ENUMDEF___VAR_CH_)
 #define _CORBA_ENUMDEF___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_EnumDef_var : public TAO_Base_var
-{
-public:
-  CORBA_EnumDef_var (void); // default constructor
-  CORBA_EnumDef_var (CORBA_EnumDef_ptr p) : ptr_ (p) {} 
-  CORBA_EnumDef_var (const CORBA_EnumDef_var &); // copy constructor
-  ~CORBA_EnumDef_var (void); // destructor
-  
-  CORBA_EnumDef_var &operator= (CORBA_EnumDef_ptr);
-  CORBA_EnumDef_var &operator= (const CORBA_EnumDef_var &);
-  CORBA_EnumDef_ptr operator-> (void) const;
-  
-  operator const CORBA_EnumDef_ptr &() const;
-  operator CORBA_EnumDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_EnumDef_ptr in (void) const;
-  CORBA_EnumDef_ptr &inout (void);
-  CORBA_EnumDef_ptr &out (void);
-  CORBA_EnumDef_ptr _retn (void);
-  CORBA_EnumDef_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_EnumDef_ptr duplicate (CORBA_EnumDef_ptr);
-  static void release (CORBA_EnumDef_ptr);
-  static CORBA_EnumDef_ptr nil (void);
-  static CORBA_EnumDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
-
-private:
-  CORBA_EnumDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_EnumDef_var (const TAO_Base_var &rhs);
-  CORBA_EnumDef_var &operator= (const TAO_Base_var &rhs);
-};
+          class TAO_IFR_Client_Export CORBA_EnumDef_var : public TAO_Base_var
+          {
+          public:
+            CORBA_EnumDef_var (void); // default constructor
+            CORBA_EnumDef_var (CORBA_EnumDef_ptr p) : ptr_ (p) {}
+            CORBA_EnumDef_var (const CORBA_EnumDef_var &); // copy constructor
+            ~CORBA_EnumDef_var (void); // destructor
+
+            CORBA_EnumDef_var &operator= (CORBA_EnumDef_ptr);
+            CORBA_EnumDef_var &operator= (const CORBA_EnumDef_var &);
+            CORBA_EnumDef_ptr operator-> (void) const;
+
+            operator const CORBA_EnumDef_ptr &() const;
+            operator CORBA_EnumDef_ptr &();
+            // in, inout, out, _retn
+            CORBA_EnumDef_ptr in (void) const;
+            CORBA_EnumDef_ptr &inout (void);
+            CORBA_EnumDef_ptr &out (void);
+            CORBA_EnumDef_ptr _retn (void);
+            CORBA_EnumDef_ptr ptr (void) const;
+
+            // Hooks used by template sequence and object manager classes
+            // for non-defined forward declared interfaces.
+            static CORBA_EnumDef_ptr duplicate (CORBA_EnumDef_ptr);
+            static void release (CORBA_EnumDef_ptr);
+            static CORBA_EnumDef_ptr nil (void);
+            static CORBA_EnumDef_ptr narrow (
+                CORBA::Object *,
+                CORBA::Environment &
+              );
+            static CORBA::Object * upcast (void *);
+
+          private:
+            CORBA_EnumDef_ptr ptr_;
+            // Unimplemented - prevents widening assignment.
+            CORBA_EnumDef_var (const TAO_Base_var &rhs);
+            CORBA_EnumDef_var &operator= (const TAO_Base_var &rhs);
+          };
 
 
 #endif /* end #if !defined */
@@ -2529,22 +2582,22 @@ private:
 #if !defined (_CORBA_ENUMDEF___OUT_CH_)
 #define _CORBA_ENUMDEF___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_EnumDef_out
-{
-public:
-  CORBA_EnumDef_out (CORBA_EnumDef_ptr &);
-  CORBA_EnumDef_out (CORBA_EnumDef_var &);
-  CORBA_EnumDef_out (const CORBA_EnumDef_out &);
-  CORBA_EnumDef_out &operator= (const CORBA_EnumDef_out &);
-  CORBA_EnumDef_out &operator= (const CORBA_EnumDef_var &);
-  CORBA_EnumDef_out &operator= (CORBA_EnumDef_ptr);
-  operator CORBA_EnumDef_ptr &();
-  CORBA_EnumDef_ptr &ptr (void);
-  CORBA_EnumDef_ptr operator-> (void);
+          class TAO_IFR_Client_Export CORBA_EnumDef_out
+          {
+          public:
+            CORBA_EnumDef_out (CORBA_EnumDef_ptr &);
+            CORBA_EnumDef_out (CORBA_EnumDef_var &);
+            CORBA_EnumDef_out (const CORBA_EnumDef_out &);
+            CORBA_EnumDef_out &operator= (const CORBA_EnumDef_out &);
+            CORBA_EnumDef_out &operator= (const CORBA_EnumDef_var &);
+            CORBA_EnumDef_out &operator= (CORBA_EnumDef_ptr);
+            operator CORBA_EnumDef_ptr &();
+            CORBA_EnumDef_ptr &ptr (void);
+            CORBA_EnumDef_ptr operator-> (void);
 
-private:
-  CORBA_EnumDef_ptr &ptr_;
-};
+          private:
+            CORBA_EnumDef_ptr &ptr_;
+          };
 
 
 #endif /* end #if !defined */
@@ -2553,243 +2606,245 @@ private:
 #if !defined (_CORBA_ENUMDEF_CH_)
 #define _CORBA_ENUMDEF_CH_
 
-// Forward Classes Declaration
-class _TAO_CORBA_EnumDef_Proxy_Impl;
-class _TAO_CORBA_EnumDef_Remote_Proxy_Impl;
-class _TAO_CORBA_EnumDef_Proxy_Broker;
-class _TAO_CORBA_EnumDef_Remote_Proxy_Broker;
-
-class TAO_IFR_Client_Export CORBA_EnumDef: public virtual CORBA_TypedefDef
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_EnumDef_ptr _ptr_type;
-  typedef CORBA_EnumDef_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static CORBA_EnumDef_ptr _duplicate (CORBA_EnumDef_ptr obj);
-  static CORBA_EnumDef_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_EnumDef_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_EnumDef_ptr _nil (void)
-    {
-      return (CORBA_EnumDef_ptr)0;
-    }
-
-  static void _tao_any_destructor (void*);
-
-  virtual CORBA_EnumMemberSeq * members (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void members (
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
-
-private:
-  _TAO_CORBA_EnumDef_Proxy_Broker *the_TAO_CORBA_EnumDef_Proxy_Broker_;
-  
-protected:
-  CORBA_EnumDef (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void CORBA_EnumDef_setup_collocation (int collocated);
-    
-    CORBA_EnumDef (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_CORBA_EnumDef_Remote_Proxy_Impl;
-    friend class _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_CORBA_EnumDef_Direct_Proxy_Impl;
-  
-  virtual ~CORBA_EnumDef (void);
-private:
-  CORBA_EnumDef (const CORBA_EnumDef &);
-  void operator= (const CORBA_EnumDef &);
-};
-
-
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_EnumDef_Proxy_Impl : 
-  public virtual _TAO_CORBA_TypedefDef_Proxy_Impl
-{
-public:
-  virtual ~_TAO_CORBA_EnumDef_Proxy_Impl (void) { }
-  
-    virtual CORBA_EnumMemberSeq * members (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void members (
-      CORBA_Object *_collocated_tao_target_,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
+          // Forward Classes Declaration
+          class _TAO_CORBA_EnumDef_Proxy_Impl;
+          class _TAO_CORBA_EnumDef_Remote_Proxy_Impl;
+          class _TAO_CORBA_EnumDef_Proxy_Broker;
+          class _TAO_CORBA_EnumDef_Remote_Proxy_Broker;
+
+          class TAO_IFR_Client_Export CORBA_EnumDef
+            : public virtual CORBA_TypedefDef
+          {
+          public:
+          #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+            typedef CORBA_EnumDef_ptr _ptr_type;
+            typedef CORBA_EnumDef_var _var_type;
+          #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+            // the static operations
+            static CORBA_EnumDef_ptr _duplicate (CORBA_EnumDef_ptr obj);
+
+            static CORBA_EnumDef_ptr _narrow (
+                CORBA::Object_ptr obj,
+                CORBA::Environment &ACE_TRY_ENV =
+                  TAO_default_environment ()
+              );
+
+            static CORBA_EnumDef_ptr _unchecked_narrow (
+                CORBA::Object_ptr obj,
+                CORBA::Environment &ACE_TRY_ENV =
+                  TAO_default_environment ()
+              );
+
+            static CORBA_EnumDef_ptr _nil (void)
+              {
+                return (CORBA_EnumDef_ptr)0;
+              }
+
+            static void _tao_any_destructor (void*);
+
+            virtual CORBA_EnumMemberSeq * members (
+                CORBA::Environment &ACE_TRY_ENV =
+                  TAO_default_environment ()
+              )
+              ACE_THROW_SPEC ((
+                CORBA::SystemException
+              ));
+
+            virtual void members (
+                const CORBA_EnumMemberSeq & members,
+                CORBA::Environment &ACE_TRY_ENV =
+                  TAO_default_environment ()
+              )
+              ACE_THROW_SPEC ((
+                CORBA::SystemException
+              ));
+
+            virtual CORBA::Boolean _is_a (
+                const CORBA::Char *type_id,
+                CORBA::Environment &ACE_TRY_ENV =
+                  TAO_default_environment ()
+              );
+
+            virtual void *_tao_QueryInterface (ptr_arith_t type);
+
+            virtual const char* _interface_repository_id (void) const;
+
+          private:
+            _TAO_CORBA_EnumDef_Proxy_Broker *the_TAO_CORBA_EnumDef_Proxy_Broker_;
+
+          protected:
+            CORBA_EnumDef (int collocated = 0);
+
+            // This methods travese the inheritance tree and set the
+            // parents piece of the given class in the right mode
+            virtual void CORBA_EnumDef_setup_collocation (int collocated);
+
+            CORBA_EnumDef (
+                TAO_Stub *objref,
+                CORBA::Boolean _tao_collocated = 0,
+                TAO_Abstract_ServantBase *servant = 0
+              );
+
+            friend class _TAO_CORBA_EnumDef_Remote_Proxy_Impl;
+            friend class _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl;
+            friend class _TAO_CORBA_EnumDef_Direct_Proxy_Impl;
+
+            virtual ~CORBA_EnumDef (void);
+
+          private:
+            CORBA_EnumDef (const CORBA_EnumDef &);
+            void operator= (const CORBA_EnumDef &);
+          };
+
+          // The Proxy Implementations are used by each interface to
+          // perform a call. Each different implementation encapsulate
+          // an invocation logics.
+
+
+          ///////////////////////////////////////////////////////////////////////
+          //                    Base Proxy Impl. Declaration
+          //
+
+          class TAO_IFR_Client_Export _TAO_CORBA_EnumDef_Proxy_Impl
+            : public virtual _TAO_CORBA_TypedefDef_Proxy_Impl
+          {
+          public:
+            virtual ~_TAO_CORBA_EnumDef_Proxy_Impl (void) { }
+            virtual CORBA_EnumMemberSeq * members (
+                CORBA_Object *_collocated_tao_target_,
+                CORBA::Environment &ACE_TRY_ENV
+              )
+              ACE_THROW_SPEC ((
+                CORBA::SystemException
+              )) = 0;
+
+            virtual void members (
+                CORBA_Object *_collocated_tao_target_,
+                const CORBA_EnumMemberSeq & members,
+                CORBA::Environment &ACE_TRY_ENV
+              )
+              ACE_THROW_SPEC ((
+                CORBA::SystemException
+              )) = 0;
+
+
+          protected:
+            _TAO_CORBA_EnumDef_Proxy_Impl (void);
+          };
+
+          //
+          //               End Base Proxy Impl. Declaration
+          ///////////////////////////////////////////////////////////////////////
+
+
+          ///////////////////////////////////////////////////////////////////////
+          //                Remote Proxy Impl. Declaration
+          //
+
+          class TAO_IFR_Client_Export _TAO_CORBA_EnumDef_Remote_Proxy_Impl
+            : public virtual _TAO_CORBA_EnumDef_Proxy_Impl,
+              public virtual TAO_Remote_Object_Proxy_Impl,
+              public virtual _TAO_CORBA_TypedefDef_Remote_Proxy_Impl
+          {
+          public:
+            _TAO_CORBA_EnumDef_Remote_Proxy_Impl (void);
+
+            virtual ~_TAO_CORBA_EnumDef_Remote_Proxy_Impl (void) { }
+            virtual CORBA_EnumMemberSeq * members (
+                CORBA_Object *_collocated_tao_target_,
+                CORBA::Environment &ACE_TRY_ENV
+              )
+              ACE_THROW_SPEC ((
+                CORBA::SystemException
+              ));
+
+            virtual void members (
+                CORBA_Object *_collocated_tao_target_,
+                const CORBA_EnumMemberSeq & members,
+                CORBA::Environment &ACE_TRY_ENV
+              )
+              ACE_THROW_SPEC ((
+                CORBA::SystemException
+              ));
+
+
+          };
+
+          //
+          //             End Remote Proxy Impl. Declaration
+          ///////////////////////////////////////////////////////////////////////
+
+          // The Proxy Brokers are used by each interface to get
+          // the right proxy for performing a call. In the new
+          // collocation scheme, the proxy to be used can vary on
+          // a call by call basis.
+
+
+          ///////////////////////////////////////////////////////////////////////
+          //                 Base Proxy Broker Declaration
+          //
+
+                    class TAO_IFR_Client_Export _TAO_CORBA_EnumDef_Proxy_Broker
+          {
+          public:
+            virtual ~_TAO_CORBA_EnumDef_Proxy_Broker (void);
+            virtual _TAO_CORBA_EnumDef_Proxy_Impl &select_proxy (
+                CORBA_EnumDef *object,
+                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+              ) = 0;
+
+          protected:
+            _TAO_CORBA_EnumDef_Proxy_Broker (void);
+
+          };
+
+          //
+          //              End Base Proxy Broker Declaration
+          ///////////////////////////////////////////////////////////////////////
+
+
+          ///////////////////////////////////////////////////////////////////////
+          //                 Remote Proxy Broker Declaration
+          //
+
+          class TAO_IFR_Client_Export _TAO_CORBA_EnumDef_Remote_Proxy_Broker
+            : public virtual _TAO_CORBA_EnumDef_Proxy_Broker
+          {
+          public:
+            _TAO_CORBA_EnumDef_Remote_Proxy_Broker (void);
+
+            virtual ~_TAO_CORBA_EnumDef_Remote_Proxy_Broker (void);
+
+            virtual _TAO_CORBA_EnumDef_Proxy_Impl &select_proxy (
+                CORBA_EnumDef *object,
+                CORBA_Environment &ACE_TRY_ENV
+              );
+
+            private:
+              _TAO_CORBA_EnumDef_Remote_Proxy_Impl remote_proxy_impl_;
 
-protected:
-  _TAO_CORBA_EnumDef_Proxy_Impl (void);
-
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
+            public:
+              // This member function is used to get an handle to the unique instance
+              // of the Remote Proxy Broker that is available for a given
+              // interface.
+              static _TAO_CORBA_EnumDef_Remote_Proxy_Broker *the_TAO_CORBA_EnumDef_Remote_Proxy_Broker (void);
+            };
 
-
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_EnumDef_Remote_Proxy_Impl : 
-  public virtual _TAO_CORBA_EnumDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_TypedefDef_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_CORBA_EnumDef_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_CORBA_EnumDef_Remote_Proxy_Impl (void) { }
-  
-    virtual CORBA_EnumMemberSeq * members (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void members (
-      CORBA_Object *_collocated_tao_target_,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-};
-
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
-
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_EnumDef_Proxy_Broker
-{
-public:
-  virtual ~_TAO_CORBA_EnumDef_Proxy_Broker (void);
-  virtual _TAO_CORBA_EnumDef_Proxy_Impl &select_proxy (
-    CORBA_EnumDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
-
-protected:
-  _TAO_CORBA_EnumDef_Proxy_Broker (void);
-  
-};
-
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_EnumDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_EnumDef_Proxy_Broker
-{
-public: 
-  _TAO_CORBA_EnumDef_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_CORBA_EnumDef_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_CORBA_EnumDef_Proxy_Impl &select_proxy (
-    CORBA_EnumDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
-
-private:
-  _TAO_CORBA_EnumDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
-
-public:
-  static _TAO_CORBA_EnumDef_Remote_Proxy_Broker *the_TAO_CORBA_EnumDef_Remote_Proxy_Broker (void);
-};
-
-
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+            //
+            //              End Remote Proxy Broker Declaration
+            ///////////////////////////////////////////////////////////////////////
 
 
 #endif /* end #if !defined */
 
 
+
 #if !defined (_CORBA_ALIASDEF___PTR_CH_)
 #define _CORBA_ALIASDEF___PTR_CH_
 
-class CORBA_AliasDef;
-typedef CORBA_AliasDef *CORBA_AliasDef_ptr;
+            class CORBA_AliasDef;
+            typedef CORBA_AliasDef *CORBA_AliasDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -2797,41 +2852,44 @@ typedef CORBA_AliasDef *CORBA_AliasDef_ptr;
 #if !defined (_CORBA_ALIASDEF___VAR_CH_)
 #define _CORBA_ALIASDEF___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_AliasDef_var : public TAO_Base_var
-{
-public:
-  CORBA_AliasDef_var (void); // default constructor
-  CORBA_AliasDef_var (CORBA_AliasDef_ptr p) : ptr_ (p) {} 
-  CORBA_AliasDef_var (const CORBA_AliasDef_var &); // copy constructor
-  ~CORBA_AliasDef_var (void); // destructor
-  
-  CORBA_AliasDef_var &operator= (CORBA_AliasDef_ptr);
-  CORBA_AliasDef_var &operator= (const CORBA_AliasDef_var &);
-  CORBA_AliasDef_ptr operator-> (void) const;
-  
-  operator const CORBA_AliasDef_ptr &() const;
-  operator CORBA_AliasDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_AliasDef_ptr in (void) const;
-  CORBA_AliasDef_ptr &inout (void);
-  CORBA_AliasDef_ptr &out (void);
-  CORBA_AliasDef_ptr _retn (void);
-  CORBA_AliasDef_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_AliasDef_ptr duplicate (CORBA_AliasDef_ptr);
-  static void release (CORBA_AliasDef_ptr);
-  static CORBA_AliasDef_ptr nil (void);
-  static CORBA_AliasDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
-
-private:
-  CORBA_AliasDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_AliasDef_var (const TAO_Base_var &rhs);
-  CORBA_AliasDef_var &operator= (const TAO_Base_var &rhs);
-};
+            class TAO_IFR_Client_Export CORBA_AliasDef_var : public TAO_Base_var
+            {
+            public:
+              CORBA_AliasDef_var (void); // default constructor
+              CORBA_AliasDef_var (CORBA_AliasDef_ptr p) : ptr_ (p) {}
+              CORBA_AliasDef_var (const CORBA_AliasDef_var &); // copy constructor
+              ~CORBA_AliasDef_var (void); // destructor
+
+              CORBA_AliasDef_var &operator= (CORBA_AliasDef_ptr);
+              CORBA_AliasDef_var &operator= (const CORBA_AliasDef_var &);
+              CORBA_AliasDef_ptr operator-> (void) const;
+
+              operator const CORBA_AliasDef_ptr &() const;
+              operator CORBA_AliasDef_ptr &();
+              // in, inout, out, _retn
+              CORBA_AliasDef_ptr in (void) const;
+              CORBA_AliasDef_ptr &inout (void);
+              CORBA_AliasDef_ptr &out (void);
+              CORBA_AliasDef_ptr _retn (void);
+              CORBA_AliasDef_ptr ptr (void) const;
+
+              // Hooks used by template sequence and object manager classes
+              // for non-defined forward declared interfaces.
+              static CORBA_AliasDef_ptr duplicate (CORBA_AliasDef_ptr);
+              static void release (CORBA_AliasDef_ptr);
+              static CORBA_AliasDef_ptr nil (void);
+              static CORBA_AliasDef_ptr narrow (
+                  CORBA::Object *,
+                  CORBA::Environment &
+                );
+              static CORBA::Object * upcast (void *);
+
+            private:
+              CORBA_AliasDef_ptr ptr_;
+              // Unimplemented - prevents widening assignment.
+              CORBA_AliasDef_var (const TAO_Base_var &rhs);
+              CORBA_AliasDef_var &operator= (const TAO_Base_var &rhs);
+            };
 
 
 #endif /* end #if !defined */
@@ -2840,22 +2898,22 @@ private:
 #if !defined (_CORBA_ALIASDEF___OUT_CH_)
 #define _CORBA_ALIASDEF___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_AliasDef_out
-{
-public:
-  CORBA_AliasDef_out (CORBA_AliasDef_ptr &);
-  CORBA_AliasDef_out (CORBA_AliasDef_var &);
-  CORBA_AliasDef_out (const CORBA_AliasDef_out &);
-  CORBA_AliasDef_out &operator= (const CORBA_AliasDef_out &);
-  CORBA_AliasDef_out &operator= (const CORBA_AliasDef_var &);
-  CORBA_AliasDef_out &operator= (CORBA_AliasDef_ptr);
-  operator CORBA_AliasDef_ptr &();
-  CORBA_AliasDef_ptr &ptr (void);
-  CORBA_AliasDef_ptr operator-> (void);
+            class TAO_IFR_Client_Export CORBA_AliasDef_out
+            {
+            public:
+              CORBA_AliasDef_out (CORBA_AliasDef_ptr &);
+              CORBA_AliasDef_out (CORBA_AliasDef_var &);
+              CORBA_AliasDef_out (const CORBA_AliasDef_out &);
+              CORBA_AliasDef_out &operator= (const CORBA_AliasDef_out &);
+              CORBA_AliasDef_out &operator= (const CORBA_AliasDef_var &);
+              CORBA_AliasDef_out &operator= (CORBA_AliasDef_ptr);
+              operator CORBA_AliasDef_ptr &();
+              CORBA_AliasDef_ptr &ptr (void);
+              CORBA_AliasDef_ptr operator-> (void);
 
-private:
-  CORBA_AliasDef_ptr &ptr_;
-};
+            private:
+              CORBA_AliasDef_ptr &ptr_;
+            };
 
 
 #endif /* end #if !defined */
@@ -2864,243 +2922,245 @@ private:
 #if !defined (_CORBA_ALIASDEF_CH_)
 #define _CORBA_ALIASDEF_CH_
 
-// Forward Classes Declaration
-class _TAO_CORBA_AliasDef_Proxy_Impl;
-class _TAO_CORBA_AliasDef_Remote_Proxy_Impl;
-class _TAO_CORBA_AliasDef_Proxy_Broker;
-class _TAO_CORBA_AliasDef_Remote_Proxy_Broker;
-
-class TAO_IFR_Client_Export CORBA_AliasDef: public virtual CORBA_TypedefDef
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_AliasDef_ptr _ptr_type;
-  typedef CORBA_AliasDef_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static CORBA_AliasDef_ptr _duplicate (CORBA_AliasDef_ptr obj);
-  static CORBA_AliasDef_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_AliasDef_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_AliasDef_ptr _nil (void)
-    {
-      return (CORBA_AliasDef_ptr)0;
-    }
-
-  static void _tao_any_destructor (void*);
-
-  virtual CORBA_IDLType_ptr original_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void original_type_def (
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
-
-private:
-  _TAO_CORBA_AliasDef_Proxy_Broker *the_TAO_CORBA_AliasDef_Proxy_Broker_;
-  
-protected:
-  CORBA_AliasDef (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void CORBA_AliasDef_setup_collocation (int collocated);
-    
-    CORBA_AliasDef (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_CORBA_AliasDef_Remote_Proxy_Impl;
-    friend class _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_CORBA_AliasDef_Direct_Proxy_Impl;
-  
-  virtual ~CORBA_AliasDef (void);
-private:
-  CORBA_AliasDef (const CORBA_AliasDef &);
-  void operator= (const CORBA_AliasDef &);
-};
-
-
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_AliasDef_Proxy_Impl : 
-  public virtual _TAO_CORBA_TypedefDef_Proxy_Impl
-{
-public:
-  virtual ~_TAO_CORBA_AliasDef_Proxy_Impl (void) { }
-  
-    virtual CORBA_IDLType_ptr original_type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void original_type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-protected:
-  _TAO_CORBA_AliasDef_Proxy_Impl (void);
-
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_AliasDef_Remote_Proxy_Impl : 
-  public virtual _TAO_CORBA_AliasDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_TypedefDef_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_CORBA_AliasDef_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_CORBA_AliasDef_Remote_Proxy_Impl (void) { }
-  
-    virtual CORBA_IDLType_ptr original_type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void original_type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-};
-
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
-
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_AliasDef_Proxy_Broker
-{
-public:
-  virtual ~_TAO_CORBA_AliasDef_Proxy_Broker (void);
-  virtual _TAO_CORBA_AliasDef_Proxy_Impl &select_proxy (
-    CORBA_AliasDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
-
-protected:
-  _TAO_CORBA_AliasDef_Proxy_Broker (void);
-  
-};
-
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_AliasDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_AliasDef_Proxy_Broker
-{
-public: 
-  _TAO_CORBA_AliasDef_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_CORBA_AliasDef_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_CORBA_AliasDef_Proxy_Impl &select_proxy (
-    CORBA_AliasDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
+            // Forward Classes Declaration
+            class _TAO_CORBA_AliasDef_Proxy_Impl;
+            class _TAO_CORBA_AliasDef_Remote_Proxy_Impl;
+            class _TAO_CORBA_AliasDef_Proxy_Broker;
+            class _TAO_CORBA_AliasDef_Remote_Proxy_Broker;
+
+            class TAO_IFR_Client_Export CORBA_AliasDef
+              : public virtual CORBA_TypedefDef
+            {
+            public:
+            #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+              typedef CORBA_AliasDef_ptr _ptr_type;
+              typedef CORBA_AliasDef_var _var_type;
+            #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+              // the static operations
+              static CORBA_AliasDef_ptr _duplicate (CORBA_AliasDef_ptr obj);
+
+              static CORBA_AliasDef_ptr _narrow (
+                  CORBA::Object_ptr obj,
+                  CORBA::Environment &ACE_TRY_ENV =
+                    TAO_default_environment ()
+                );
+
+              static CORBA_AliasDef_ptr _unchecked_narrow (
+                  CORBA::Object_ptr obj,
+                  CORBA::Environment &ACE_TRY_ENV =
+                    TAO_default_environment ()
+                );
+
+              static CORBA_AliasDef_ptr _nil (void)
+                {
+                  return (CORBA_AliasDef_ptr)0;
+                }
+
+              static void _tao_any_destructor (void*);
+
+              virtual CORBA_IDLType_ptr original_type_def (
+                  CORBA::Environment &ACE_TRY_ENV =
+                    TAO_default_environment ()
+                )
+                ACE_THROW_SPEC ((
+                  CORBA::SystemException
+                ));
+
+              virtual void original_type_def (
+                  CORBA_IDLType_ptr original_type_def,
+                  CORBA::Environment &ACE_TRY_ENV =
+                    TAO_default_environment ()
+                )
+                ACE_THROW_SPEC ((
+                  CORBA::SystemException
+                ));
+
+              virtual CORBA::Boolean _is_a (
+                  const CORBA::Char *type_id,
+                  CORBA::Environment &ACE_TRY_ENV =
+                    TAO_default_environment ()
+                );
+
+              virtual void *_tao_QueryInterface (ptr_arith_t type);
+
+              virtual const char* _interface_repository_id (void) const;
+
+            private:
+              _TAO_CORBA_AliasDef_Proxy_Broker *the_TAO_CORBA_AliasDef_Proxy_Broker_;
+
+            protected:
+              CORBA_AliasDef (int collocated = 0);
+
+              // This methods travese the inheritance tree and set the
+              // parents piece of the given class in the right mode
+              virtual void CORBA_AliasDef_setup_collocation (int collocated);
+
+              CORBA_AliasDef (
+                  TAO_Stub *objref,
+                  CORBA::Boolean _tao_collocated = 0,
+                  TAO_Abstract_ServantBase *servant = 0
+                );
+
+              friend class _TAO_CORBA_AliasDef_Remote_Proxy_Impl;
+              friend class _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl;
+              friend class _TAO_CORBA_AliasDef_Direct_Proxy_Impl;
+
+              virtual ~CORBA_AliasDef (void);
+
+            private:
+              CORBA_AliasDef (const CORBA_AliasDef &);
+              void operator= (const CORBA_AliasDef &);
+            };
+
+            // The Proxy Implementations are used by each interface to
+            // perform a call. Each different implementation encapsulate
+            // an invocation logics.
+
+
+            ///////////////////////////////////////////////////////////////////////
+            //                    Base Proxy Impl. Declaration
+            //
+
+            class TAO_IFR_Client_Export _TAO_CORBA_AliasDef_Proxy_Impl
+              : public virtual _TAO_CORBA_TypedefDef_Proxy_Impl
+            {
+            public:
+              virtual ~_TAO_CORBA_AliasDef_Proxy_Impl (void) { }
+              virtual CORBA_IDLType_ptr original_type_def (
+                  CORBA_Object *_collocated_tao_target_,
+                  CORBA::Environment &ACE_TRY_ENV
+                )
+                ACE_THROW_SPEC ((
+                  CORBA::SystemException
+                )) = 0;
+
+              virtual void original_type_def (
+                  CORBA_Object *_collocated_tao_target_,
+                  CORBA_IDLType_ptr original_type_def,
+                  CORBA::Environment &ACE_TRY_ENV
+                )
+                ACE_THROW_SPEC ((
+                  CORBA::SystemException
+                )) = 0;
+
+
+            protected:
+              _TAO_CORBA_AliasDef_Proxy_Impl (void);
+            };
+
+            //
+            //               End Base Proxy Impl. Declaration
+            ///////////////////////////////////////////////////////////////////////
+
+
+            ///////////////////////////////////////////////////////////////////////
+            //                Remote Proxy Impl. Declaration
+            //
+
+            class TAO_IFR_Client_Export _TAO_CORBA_AliasDef_Remote_Proxy_Impl
+              : public virtual _TAO_CORBA_AliasDef_Proxy_Impl,
+                public virtual TAO_Remote_Object_Proxy_Impl,
+                public virtual _TAO_CORBA_TypedefDef_Remote_Proxy_Impl
+            {
+            public:
+              _TAO_CORBA_AliasDef_Remote_Proxy_Impl (void);
+
+              virtual ~_TAO_CORBA_AliasDef_Remote_Proxy_Impl (void) { }
+              virtual CORBA_IDLType_ptr original_type_def (
+                  CORBA_Object *_collocated_tao_target_,
+                  CORBA::Environment &ACE_TRY_ENV
+                )
+                ACE_THROW_SPEC ((
+                  CORBA::SystemException
+                ));
+
+              virtual void original_type_def (
+                  CORBA_Object *_collocated_tao_target_,
+                  CORBA_IDLType_ptr original_type_def,
+                  CORBA::Environment &ACE_TRY_ENV
+                )
+                ACE_THROW_SPEC ((
+                  CORBA::SystemException
+                ));
+
+
+            };
+
+            //
+            //             End Remote Proxy Impl. Declaration
+            ///////////////////////////////////////////////////////////////////////
+
+            // The Proxy Brokers are used by each interface to get
+            // the right proxy for performing a call. In the new
+            // collocation scheme, the proxy to be used can vary on
+            // a call by call basis.
+
+
+            ///////////////////////////////////////////////////////////////////////
+            //                 Base Proxy Broker Declaration
+            //
+
+                        class TAO_IFR_Client_Export _TAO_CORBA_AliasDef_Proxy_Broker
+            {
+            public:
+              virtual ~_TAO_CORBA_AliasDef_Proxy_Broker (void);
+              virtual _TAO_CORBA_AliasDef_Proxy_Impl &select_proxy (
+                  CORBA_AliasDef *object,
+                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                ) = 0;
+
+            protected:
+              _TAO_CORBA_AliasDef_Proxy_Broker (void);
+
+            };
+
+            //
+            //              End Base Proxy Broker Declaration
+            ///////////////////////////////////////////////////////////////////////
+
+
+            ///////////////////////////////////////////////////////////////////////
+            //                 Remote Proxy Broker Declaration
+            //
+
+            class TAO_IFR_Client_Export _TAO_CORBA_AliasDef_Remote_Proxy_Broker
+              : public virtual _TAO_CORBA_AliasDef_Proxy_Broker
+            {
+            public:
+              _TAO_CORBA_AliasDef_Remote_Proxy_Broker (void);
+
+              virtual ~_TAO_CORBA_AliasDef_Remote_Proxy_Broker (void);
+
+              virtual _TAO_CORBA_AliasDef_Proxy_Impl &select_proxy (
+                  CORBA_AliasDef *object,
+                  CORBA_Environment &ACE_TRY_ENV
+                );
+
+              private:
+                _TAO_CORBA_AliasDef_Remote_Proxy_Impl remote_proxy_impl_;
 
-private:
-  _TAO_CORBA_AliasDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
+              public:
+                // This member function is used to get an handle to the unique instance
+                // of the Remote Proxy Broker that is available for a given
+                // interface.
+                static _TAO_CORBA_AliasDef_Remote_Proxy_Broker *the_TAO_CORBA_AliasDef_Remote_Proxy_Broker (void);
+              };
 
-public:
-  static _TAO_CORBA_AliasDef_Remote_Proxy_Broker *the_TAO_CORBA_AliasDef_Remote_Proxy_Broker (void);
-};
-
-
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+              //
+              //              End Remote Proxy Broker Declaration
+              ///////////////////////////////////////////////////////////////////////
 
 
 #endif /* end #if !defined */
 
 
+
 #if !defined (_CORBA_NATIVEDEF___PTR_CH_)
 #define _CORBA_NATIVEDEF___PTR_CH_
 
-class CORBA_NativeDef;
-typedef CORBA_NativeDef *CORBA_NativeDef_ptr;
+              class CORBA_NativeDef;
+              typedef CORBA_NativeDef *CORBA_NativeDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -3108,41 +3168,44 @@ typedef CORBA_NativeDef *CORBA_NativeDef_ptr;
 #if !defined (_CORBA_NATIVEDEF___VAR_CH_)
 #define _CORBA_NATIVEDEF___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_NativeDef_var : public TAO_Base_var
-{
-public:
-  CORBA_NativeDef_var (void); // default constructor
-  CORBA_NativeDef_var (CORBA_NativeDef_ptr p) : ptr_ (p) {} 
-  CORBA_NativeDef_var (const CORBA_NativeDef_var &); // copy constructor
-  ~CORBA_NativeDef_var (void); // destructor
-  
-  CORBA_NativeDef_var &operator= (CORBA_NativeDef_ptr);
-  CORBA_NativeDef_var &operator= (const CORBA_NativeDef_var &);
-  CORBA_NativeDef_ptr operator-> (void) const;
-  
-  operator const CORBA_NativeDef_ptr &() const;
-  operator CORBA_NativeDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_NativeDef_ptr in (void) const;
-  CORBA_NativeDef_ptr &inout (void);
-  CORBA_NativeDef_ptr &out (void);
-  CORBA_NativeDef_ptr _retn (void);
-  CORBA_NativeDef_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_NativeDef_ptr duplicate (CORBA_NativeDef_ptr);
-  static void release (CORBA_NativeDef_ptr);
-  static CORBA_NativeDef_ptr nil (void);
-  static CORBA_NativeDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
-
-private:
-  CORBA_NativeDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_NativeDef_var (const TAO_Base_var &rhs);
-  CORBA_NativeDef_var &operator= (const TAO_Base_var &rhs);
-};
+              class TAO_IFR_Client_Export CORBA_NativeDef_var : public TAO_Base_var
+              {
+              public:
+                CORBA_NativeDef_var (void); // default constructor
+                CORBA_NativeDef_var (CORBA_NativeDef_ptr p) : ptr_ (p) {}
+                CORBA_NativeDef_var (const CORBA_NativeDef_var &); // copy constructor
+                ~CORBA_NativeDef_var (void); // destructor
+
+                CORBA_NativeDef_var &operator= (CORBA_NativeDef_ptr);
+                CORBA_NativeDef_var &operator= (const CORBA_NativeDef_var &);
+                CORBA_NativeDef_ptr operator-> (void) const;
+
+                operator const CORBA_NativeDef_ptr &() const;
+                operator CORBA_NativeDef_ptr &();
+                // in, inout, out, _retn
+                CORBA_NativeDef_ptr in (void) const;
+                CORBA_NativeDef_ptr &inout (void);
+                CORBA_NativeDef_ptr &out (void);
+                CORBA_NativeDef_ptr _retn (void);
+                CORBA_NativeDef_ptr ptr (void) const;
+
+                // Hooks used by template sequence and object manager classes
+                // for non-defined forward declared interfaces.
+                static CORBA_NativeDef_ptr duplicate (CORBA_NativeDef_ptr);
+                static void release (CORBA_NativeDef_ptr);
+                static CORBA_NativeDef_ptr nil (void);
+                static CORBA_NativeDef_ptr narrow (
+                    CORBA::Object *,
+                    CORBA::Environment &
+                  );
+                static CORBA::Object * upcast (void *);
+
+              private:
+                CORBA_NativeDef_ptr ptr_;
+                // Unimplemented - prevents widening assignment.
+                CORBA_NativeDef_var (const TAO_Base_var &rhs);
+                CORBA_NativeDef_var &operator= (const TAO_Base_var &rhs);
+              };
 
 
 #endif /* end #if !defined */
@@ -3151,22 +3214,22 @@ private:
 #if !defined (_CORBA_NATIVEDEF___OUT_CH_)
 #define _CORBA_NATIVEDEF___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_NativeDef_out
-{
-public:
-  CORBA_NativeDef_out (CORBA_NativeDef_ptr &);
-  CORBA_NativeDef_out (CORBA_NativeDef_var &);
-  CORBA_NativeDef_out (const CORBA_NativeDef_out &);
-  CORBA_NativeDef_out &operator= (const CORBA_NativeDef_out &);
-  CORBA_NativeDef_out &operator= (const CORBA_NativeDef_var &);
-  CORBA_NativeDef_out &operator= (CORBA_NativeDef_ptr);
-  operator CORBA_NativeDef_ptr &();
-  CORBA_NativeDef_ptr &ptr (void);
-  CORBA_NativeDef_ptr operator-> (void);
+              class TAO_IFR_Client_Export CORBA_NativeDef_out
+              {
+              public:
+                CORBA_NativeDef_out (CORBA_NativeDef_ptr &);
+                CORBA_NativeDef_out (CORBA_NativeDef_var &);
+                CORBA_NativeDef_out (const CORBA_NativeDef_out &);
+                CORBA_NativeDef_out &operator= (const CORBA_NativeDef_out &);
+                CORBA_NativeDef_out &operator= (const CORBA_NativeDef_var &);
+                CORBA_NativeDef_out &operator= (CORBA_NativeDef_ptr);
+                operator CORBA_NativeDef_ptr &();
+                CORBA_NativeDef_ptr &ptr (void);
+                CORBA_NativeDef_ptr operator-> (void);
 
-private:
-  CORBA_NativeDef_ptr &ptr_;
-};
+              private:
+                CORBA_NativeDef_ptr &ptr_;
+              };
 
 
 #endif /* end #if !defined */
@@ -3175,1477 +3238,1491 @@ private:
 #if !defined (_CORBA_NATIVEDEF_CH_)
 #define _CORBA_NATIVEDEF_CH_
 
-// Forward Classes Declaration
-class _TAO_CORBA_NativeDef_Proxy_Impl;
-class _TAO_CORBA_NativeDef_Remote_Proxy_Impl;
-class _TAO_CORBA_NativeDef_Proxy_Broker;
-class _TAO_CORBA_NativeDef_Remote_Proxy_Broker;
+              // Forward Classes Declaration
+              class _TAO_CORBA_NativeDef_Proxy_Impl;
+              class _TAO_CORBA_NativeDef_Remote_Proxy_Impl;
+              class _TAO_CORBA_NativeDef_Proxy_Broker;
+              class _TAO_CORBA_NativeDef_Remote_Proxy_Broker;
 
-class TAO_IFR_Client_Export CORBA_NativeDef: public virtual CORBA_TypedefDef
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_NativeDef_ptr _ptr_type;
-  typedef CORBA_NativeDef_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
+              class TAO_IFR_Client_Export CORBA_NativeDef
+                : public virtual CORBA_TypedefDef
+              {
+              public:
+              #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+                typedef CORBA_NativeDef_ptr _ptr_type;
+                typedef CORBA_NativeDef_var _var_type;
+              #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-  // the static operations
-  static CORBA_NativeDef_ptr _duplicate (CORBA_NativeDef_ptr obj);
-  static CORBA_NativeDef_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_NativeDef_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_NativeDef_ptr _nil (void)
-    {
-      return (CORBA_NativeDef_ptr)0;
-    }
+                // the static operations
+                static CORBA_NativeDef_ptr _duplicate (CORBA_NativeDef_ptr obj);
 
-  static void _tao_any_destructor (void*);
+                static CORBA_NativeDef_ptr _narrow (
+                    CORBA::Object_ptr obj,
+                    CORBA::Environment &ACE_TRY_ENV =
+                      TAO_default_environment ()
+                  );
 
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
+                static CORBA_NativeDef_ptr _unchecked_narrow (
+                    CORBA::Object_ptr obj,
+                    CORBA::Environment &ACE_TRY_ENV =
+                      TAO_default_environment ()
+                  );
 
-private:
-  _TAO_CORBA_NativeDef_Proxy_Broker *the_TAO_CORBA_NativeDef_Proxy_Broker_;
-  
-protected:
-  CORBA_NativeDef (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void CORBA_NativeDef_setup_collocation (int collocated);
-    
-    CORBA_NativeDef (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_CORBA_NativeDef_Remote_Proxy_Impl;
-    friend class _TAO_CORBA_NativeDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_CORBA_NativeDef_Direct_Proxy_Impl;
-  
-  virtual ~CORBA_NativeDef (void);
-private:
-  CORBA_NativeDef (const CORBA_NativeDef &);
-  void operator= (const CORBA_NativeDef &);
-};
+                static CORBA_NativeDef_ptr _nil (void)
+                  {
+                    return (CORBA_NativeDef_ptr)0;
+                  }
+
+                static void _tao_any_destructor (void*);
 
+                virtual CORBA::Boolean _is_a (
+                    const CORBA::Char *type_id,
+                    CORBA::Environment &ACE_TRY_ENV =
+                      TAO_default_environment ()
+                  );
 
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
+                virtual void *_tao_QueryInterface (ptr_arith_t type);
 
+                virtual const char* _interface_repository_id (void) const;
 
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
+              private:
+                _TAO_CORBA_NativeDef_Proxy_Broker *the_TAO_CORBA_NativeDef_Proxy_Broker_;
 
-class TAO_IFR_Client_Export _TAO_CORBA_NativeDef_Proxy_Impl : 
-  public virtual _TAO_CORBA_TypedefDef_Proxy_Impl
-{
-public:
-  virtual ~_TAO_CORBA_NativeDef_Proxy_Impl (void) { }
-  
-  protected:
-  _TAO_CORBA_NativeDef_Proxy_Impl (void);
+              protected:
+                CORBA_NativeDef (int collocated = 0);
 
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_NativeDef_Remote_Proxy_Impl : 
-  public virtual _TAO_CORBA_NativeDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_TypedefDef_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_CORBA_NativeDef_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_CORBA_NativeDef_Remote_Proxy_Impl (void) { }
-  
-  };
-
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
-
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_NativeDef_Proxy_Broker
-{
-public:
-  virtual ~_TAO_CORBA_NativeDef_Proxy_Broker (void);
-  virtual _TAO_CORBA_NativeDef_Proxy_Impl &select_proxy (
-    CORBA_NativeDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
-
-protected:
-  _TAO_CORBA_NativeDef_Proxy_Broker (void);
-  
-};
-
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_NativeDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_NativeDef_Proxy_Broker
-{
-public: 
-  _TAO_CORBA_NativeDef_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_CORBA_NativeDef_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_CORBA_NativeDef_Proxy_Impl &select_proxy (
-    CORBA_NativeDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
-
-private:
-  _TAO_CORBA_NativeDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
-
-public:
-  static _TAO_CORBA_NativeDef_Remote_Proxy_Broker *the_TAO_CORBA_NativeDef_Remote_Proxy_Broker (void);
-};
-
-
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_PRIMITIVEDEF_CH_)
-#define _CORBA_PRIMITIVEDEF_CH_
+                // This methods travese the inheritance tree and set the
+                // parents piece of the given class in the right mode
+                virtual void CORBA_NativeDef_setup_collocation (int collocated);
 
-// Forward Classes Declaration
-class _TAO_CORBA_PrimitiveDef_Proxy_Impl;
-class _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl;
-class _TAO_CORBA_PrimitiveDef_Proxy_Broker;
-class _TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker;
+                CORBA_NativeDef (
+                    TAO_Stub *objref,
+                    CORBA::Boolean _tao_collocated = 0,
+                    TAO_Abstract_ServantBase *servant = 0
+                  );
 
-class TAO_IFR_Client_Export CORBA_PrimitiveDef: public virtual CORBA_IDLType
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA::PrimitiveDef_ptr _ptr_type;
-  typedef CORBA_PrimitiveDef_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
+                friend class _TAO_CORBA_NativeDef_Remote_Proxy_Impl;
+                friend class _TAO_CORBA_NativeDef_ThruPOA_Proxy_Impl;
+                friend class _TAO_CORBA_NativeDef_Direct_Proxy_Impl;
 
-  // the static operations
-  static CORBA::PrimitiveDef_ptr _duplicate (CORBA::PrimitiveDef_ptr obj);
-  static CORBA::PrimitiveDef_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA::PrimitiveDef_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA::PrimitiveDef_ptr _nil (void)
-    {
-      return (CORBA::PrimitiveDef_ptr)0;
-    }
+                virtual ~CORBA_NativeDef (void);
 
-  static void _tao_any_destructor (void*);
+              private:
+                CORBA_NativeDef (const CORBA_NativeDef &);
+                void operator= (const CORBA_NativeDef &);
+              };
 
-  virtual CORBA::PrimitiveKind kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+              // The Proxy Implementations are used by each interface to
+              // perform a call. Each different implementation encapsulate
+              // an invocation logics.
 
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
 
-private:
-  _TAO_CORBA_PrimitiveDef_Proxy_Broker *the_TAO_CORBA_PrimitiveDef_Proxy_Broker_;
-  
-protected:
-  CORBA_PrimitiveDef (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void CORBA_PrimitiveDef_setup_collocation (int collocated);
-    
-    CORBA_PrimitiveDef (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl;
-    friend class _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_CORBA_PrimitiveDef_Direct_Proxy_Impl;
-  
-  virtual ~CORBA_PrimitiveDef (void);
-private:
-  CORBA_PrimitiveDef (const CORBA_PrimitiveDef &);
-  void operator= (const CORBA_PrimitiveDef &);
-};
+              ///////////////////////////////////////////////////////////////////////
+              //                    Base Proxy Impl. Declaration
+              //
 
+              class TAO_IFR_Client_Export _TAO_CORBA_NativeDef_Proxy_Impl
+                : public virtual _TAO_CORBA_TypedefDef_Proxy_Impl
+              {
+              public:
+                virtual ~_TAO_CORBA_NativeDef_Proxy_Impl (void) { }
 
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_PrimitiveDef_Proxy_Impl : 
-  public virtual _TAO_CORBA_IDLType_Proxy_Impl
-{
-public:
-  virtual ~_TAO_CORBA_PrimitiveDef_Proxy_Impl (void) { }
-  
-    virtual CORBA::PrimitiveKind kind (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
+              protected:
+                _TAO_CORBA_NativeDef_Proxy_Impl (void);
+              };
 
-protected:
-  _TAO_CORBA_PrimitiveDef_Proxy_Impl (void);
+              //
+              //               End Base Proxy Impl. Declaration
+              ///////////////////////////////////////////////////////////////////////
 
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
 
+              ///////////////////////////////////////////////////////////////////////
+              //                Remote Proxy Impl. Declaration
+              //
 
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
+              class TAO_IFR_Client_Export _TAO_CORBA_NativeDef_Remote_Proxy_Impl
+                : public virtual _TAO_CORBA_NativeDef_Proxy_Impl,
+                  public virtual TAO_Remote_Object_Proxy_Impl,
+                  public virtual _TAO_CORBA_TypedefDef_Remote_Proxy_Impl
+              {
+              public:
+                _TAO_CORBA_NativeDef_Remote_Proxy_Impl (void);
 
-class TAO_IFR_Client_Export _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl : 
-  public virtual _TAO_CORBA_PrimitiveDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_IDLType_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl (void) { }
-  
-    virtual CORBA::PrimitiveKind kind (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+                virtual ~_TAO_CORBA_NativeDef_Remote_Proxy_Impl (void) { }
 
-};
+              };
 
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
+              //
+              //             End Remote Proxy Impl. Declaration
+              ///////////////////////////////////////////////////////////////////////
 
+              // The Proxy Brokers are used by each interface to get
+              // the right proxy for performing a call. In the new
+              // collocation scheme, the proxy to be used can vary on
+              // a call by call basis.
 
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
 
+              ///////////////////////////////////////////////////////////////////////
+              //                 Base Proxy Broker Declaration
+              //
 
+                            class TAO_IFR_Client_Export _TAO_CORBA_NativeDef_Proxy_Broker
+              {
+              public:
+                virtual ~_TAO_CORBA_NativeDef_Proxy_Broker (void);
+                virtual _TAO_CORBA_NativeDef_Proxy_Impl &select_proxy (
+                    CORBA_NativeDef *object,
+                    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                  ) = 0;
 
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
+              protected:
+                _TAO_CORBA_NativeDef_Proxy_Broker (void);
 
-class TAO_IFR_Client_Export _TAO_CORBA_PrimitiveDef_Proxy_Broker
-{
-public:
-  virtual ~_TAO_CORBA_PrimitiveDef_Proxy_Broker (void);
-  virtual _TAO_CORBA_PrimitiveDef_Proxy_Impl &select_proxy (
-    CORBA_PrimitiveDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
+              };
 
-protected:
-  _TAO_CORBA_PrimitiveDef_Proxy_Broker (void);
-  
-};
+              //
+              //              End Base Proxy Broker Declaration
+              ///////////////////////////////////////////////////////////////////////
 
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
 
+              ///////////////////////////////////////////////////////////////////////
+              //                 Remote Proxy Broker Declaration
+              //
 
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
+              class TAO_IFR_Client_Export _TAO_CORBA_NativeDef_Remote_Proxy_Broker
+                : public virtual _TAO_CORBA_NativeDef_Proxy_Broker
+              {
+              public:
+                _TAO_CORBA_NativeDef_Remote_Proxy_Broker (void);
 
-class TAO_IFR_Client_Export _TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_PrimitiveDef_Proxy_Broker
-{
-public: 
-  _TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_CORBA_PrimitiveDef_Proxy_Impl &select_proxy (
-    CORBA_PrimitiveDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
+                virtual ~_TAO_CORBA_NativeDef_Remote_Proxy_Broker (void);
 
-private:
-  _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
+                virtual _TAO_CORBA_NativeDef_Proxy_Impl &select_proxy (
+                    CORBA_NativeDef *object,
+                    CORBA_Environment &ACE_TRY_ENV
+                  );
 
-public:
-  static _TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker *the_TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker (void);
-};
+                private:
+                  _TAO_CORBA_NativeDef_Remote_Proxy_Impl remote_proxy_impl_;
 
+                public:
+                  // This member function is used to get an handle to the unique instance
+                  // of the Remote Proxy Broker that is available for a given
+                  // interface.
+                  static _TAO_CORBA_NativeDef_Remote_Proxy_Broker *the_TAO_CORBA_NativeDef_Remote_Proxy_Broker (void);
+                };
 
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+                //
+                //              End Remote Proxy Broker Declaration
+                ///////////////////////////////////////////////////////////////////////
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_STRINGDEF_CH_)
-#define _CORBA_STRINGDEF_CH_
 
-// Forward Classes Declaration
-class _TAO_CORBA_StringDef_Proxy_Impl;
-class _TAO_CORBA_StringDef_Remote_Proxy_Impl;
-class _TAO_CORBA_StringDef_Proxy_Broker;
-class _TAO_CORBA_StringDef_Remote_Proxy_Broker;
+#if !defined (_CORBA_PRIMITIVEDEF_CH_)
+#define _CORBA_PRIMITIVEDEF_CH_
 
-class TAO_IFR_Client_Export CORBA_StringDef: public virtual CORBA_IDLType
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_StringDef_ptr _ptr_type;
-  typedef CORBA_StringDef_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
+                // Forward Classes Declaration
+                class _TAO_CORBA_PrimitiveDef_Proxy_Impl;
+                class _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl;
+                class _TAO_CORBA_PrimitiveDef_Proxy_Broker;
+                class _TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker;
+
+                class TAO_IFR_Client_Export CORBA_PrimitiveDef
+                  : public virtual CORBA_IDLType
+                {
+                public:
+                #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+                  typedef CORBA_PrimitiveDef_ptr _ptr_type;
+                  typedef CORBA_PrimitiveDef_var _var_type;
+                #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+                  // the static operations
+                  static CORBA_PrimitiveDef_ptr _duplicate (CORBA_PrimitiveDef_ptr obj);
+
+                  static CORBA_PrimitiveDef_ptr _narrow (
+                      CORBA::Object_ptr obj,
+                      CORBA::Environment &ACE_TRY_ENV =
+                        TAO_default_environment ()
+                    );
+
+                  static CORBA_PrimitiveDef_ptr _unchecked_narrow (
+                      CORBA::Object_ptr obj,
+                      CORBA::Environment &ACE_TRY_ENV =
+                        TAO_default_environment ()
+                    );
+
+                  static CORBA_PrimitiveDef_ptr _nil (void)
+                    {
+                      return (CORBA_PrimitiveDef_ptr)0;
+                    }
+
+                  static void _tao_any_destructor (void*);
+
+                  virtual CORBA::PrimitiveKind kind (
+                      CORBA::Environment &ACE_TRY_ENV =
+                        TAO_default_environment ()
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    ));
+
+                  virtual CORBA::Boolean _is_a (
+                      const CORBA::Char *type_id,
+                      CORBA::Environment &ACE_TRY_ENV =
+                        TAO_default_environment ()
+                    );
+
+                  virtual void *_tao_QueryInterface (ptr_arith_t type);
+
+                  virtual const char* _interface_repository_id (void) const;
+
+                private:
+                  _TAO_CORBA_PrimitiveDef_Proxy_Broker *the_TAO_CORBA_PrimitiveDef_Proxy_Broker_;
+
+                protected:
+                  CORBA_PrimitiveDef (int collocated = 0);
+
+                  // This methods travese the inheritance tree and set the
+                  // parents piece of the given class in the right mode
+                  virtual void CORBA_PrimitiveDef_setup_collocation (int collocated);
+
+                  CORBA_PrimitiveDef (
+                      TAO_Stub *objref,
+                      CORBA::Boolean _tao_collocated = 0,
+                      TAO_Abstract_ServantBase *servant = 0
+                    );
+
+                  friend class _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl;
+                  friend class _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl;
+                  friend class _TAO_CORBA_PrimitiveDef_Direct_Proxy_Impl;
+
+                  virtual ~CORBA_PrimitiveDef (void);
+
+                private:
+                  CORBA_PrimitiveDef (const CORBA_PrimitiveDef &);
+                  void operator= (const CORBA_PrimitiveDef &);
+                };
+
+                // The Proxy Implementations are used by each interface to
+                // perform a call. Each different implementation encapsulate
+                // an invocation logics.
+
+
+                ///////////////////////////////////////////////////////////////////////
+                //                    Base Proxy Impl. Declaration
+                //
+
+                class TAO_IFR_Client_Export _TAO_CORBA_PrimitiveDef_Proxy_Impl
+                  : public virtual _TAO_CORBA_IDLType_Proxy_Impl
+                {
+                public:
+                  virtual ~_TAO_CORBA_PrimitiveDef_Proxy_Impl (void) { }
+                  virtual CORBA::PrimitiveKind kind (
+                      CORBA_Object *_collocated_tao_target_,
+                      CORBA::Environment &ACE_TRY_ENV
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    )) = 0;
+
+
+                protected:
+                  _TAO_CORBA_PrimitiveDef_Proxy_Impl (void);
+                };
+
+                //
+                //               End Base Proxy Impl. Declaration
+                ///////////////////////////////////////////////////////////////////////
 
-  // the static operations
-  static CORBA_StringDef_ptr _duplicate (CORBA_StringDef_ptr obj);
-  static CORBA_StringDef_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_StringDef_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_StringDef_ptr _nil (void)
-    {
-      return (CORBA_StringDef_ptr)0;
-    }
 
-  static void _tao_any_destructor (void*);
+                ///////////////////////////////////////////////////////////////////////
+                //                Remote Proxy Impl. Declaration
+                //
 
-  virtual CORBA::ULong bound (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+                class TAO_IFR_Client_Export _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl
+                  : public virtual _TAO_CORBA_PrimitiveDef_Proxy_Impl,
+                    public virtual TAO_Remote_Object_Proxy_Impl,
+                    public virtual _TAO_CORBA_IDLType_Remote_Proxy_Impl
+                {
+                public:
+                  _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl (void);
 
-  virtual void bound (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+                  virtual ~_TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl (void) { }
+                  virtual CORBA::PrimitiveKind kind (
+                      CORBA_Object *_collocated_tao_target_,
+                      CORBA::Environment &ACE_TRY_ENV
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    ));
 
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
 
-private:
-  _TAO_CORBA_StringDef_Proxy_Broker *the_TAO_CORBA_StringDef_Proxy_Broker_;
-  
-protected:
-  CORBA_StringDef (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void CORBA_StringDef_setup_collocation (int collocated);
-    
-    CORBA_StringDef (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_CORBA_StringDef_Remote_Proxy_Impl;
-    friend class _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_CORBA_StringDef_Direct_Proxy_Impl;
-  
-  virtual ~CORBA_StringDef (void);
-private:
-  CORBA_StringDef (const CORBA_StringDef &);
-  void operator= (const CORBA_StringDef &);
-};
+                };
 
+                //
+                //             End Remote Proxy Impl. Declaration
+                ///////////////////////////////////////////////////////////////////////
 
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
+                // The Proxy Brokers are used by each interface to get
+                // the right proxy for performing a call. In the new
+                // collocation scheme, the proxy to be used can vary on
+                // a call by call basis.
 
 
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
+                ///////////////////////////////////////////////////////////////////////
+                //                 Base Proxy Broker Declaration
+                //
 
-class TAO_IFR_Client_Export _TAO_CORBA_StringDef_Proxy_Impl : 
-  public virtual _TAO_CORBA_IDLType_Proxy_Impl
-{
-public:
-  virtual ~_TAO_CORBA_StringDef_Proxy_Impl (void) { }
-  
-    virtual CORBA::ULong bound (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
+                                class TAO_IFR_Client_Export _TAO_CORBA_PrimitiveDef_Proxy_Broker
+                {
+                public:
+                  virtual ~_TAO_CORBA_PrimitiveDef_Proxy_Broker (void);
+                  virtual _TAO_CORBA_PrimitiveDef_Proxy_Impl &select_proxy (
+                      CORBA_PrimitiveDef *object,
+                      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                    ) = 0;
 
-  virtual void bound (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
+                protected:
+                  _TAO_CORBA_PrimitiveDef_Proxy_Broker (void);
 
-protected:
-  _TAO_CORBA_StringDef_Proxy_Impl (void);
+                };
 
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
+                //
+                //              End Base Proxy Broker Declaration
+                ///////////////////////////////////////////////////////////////////////
 
 
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_StringDef_Remote_Proxy_Impl : 
-  public virtual _TAO_CORBA_StringDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_IDLType_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_CORBA_StringDef_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_CORBA_StringDef_Remote_Proxy_Impl (void) { }
-  
-    virtual CORBA::ULong bound (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void bound (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+                ///////////////////////////////////////////////////////////////////////
+                //                 Remote Proxy Broker Declaration
+                //
 
-};
+                class TAO_IFR_Client_Export _TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker
+                  : public virtual _TAO_CORBA_PrimitiveDef_Proxy_Broker
+                {
+                public:
+                  _TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker (void);
 
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
+                  virtual ~_TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker (void);
 
+                  virtual _TAO_CORBA_PrimitiveDef_Proxy_Impl &select_proxy (
+                      CORBA_PrimitiveDef *object,
+                      CORBA_Environment &ACE_TRY_ENV
+                    );
+
+                  private:
+                    _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl remote_proxy_impl_;
 
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
+                  public:
+                    // This member function is used to get an handle to the unique instance
+                    // of the Remote Proxy Broker that is available for a given
+                    // interface.
+                    static _TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker *the_TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker (void);
+                  };
 
+                  //
+                  //              End Remote Proxy Broker Declaration
+                  ///////////////////////////////////////////////////////////////////////
 
 
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_StringDef_Proxy_Broker
-{
-public:
-  virtual ~_TAO_CORBA_StringDef_Proxy_Broker (void);
-  virtual _TAO_CORBA_StringDef_Proxy_Impl &select_proxy (
-    CORBA_StringDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
-
-protected:
-  _TAO_CORBA_StringDef_Proxy_Broker (void);
-  
-};
+#endif /* end #if !defined */
 
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
 
 
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_StringDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_StringDef_Proxy_Broker
-{
-public: 
-  _TAO_CORBA_StringDef_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_CORBA_StringDef_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_CORBA_StringDef_Proxy_Impl &select_proxy (
-    CORBA_StringDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
-
-private:
-  _TAO_CORBA_StringDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
+#if !defined (_CORBA_STRINGDEF_CH_)
+#define _CORBA_STRINGDEF_CH_
 
-public:
-  static _TAO_CORBA_StringDef_Remote_Proxy_Broker *the_TAO_CORBA_StringDef_Remote_Proxy_Broker (void);
-};
+                  // Forward Classes Declaration
+                  class _TAO_CORBA_StringDef_Proxy_Impl;
+                  class _TAO_CORBA_StringDef_Remote_Proxy_Impl;
+                  class _TAO_CORBA_StringDef_Proxy_Broker;
+                  class _TAO_CORBA_StringDef_Remote_Proxy_Broker;
+
+                  class TAO_IFR_Client_Export CORBA_StringDef
+                    : public virtual CORBA_IDLType
+                  {
+                  public:
+                  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+                    typedef CORBA_StringDef_ptr _ptr_type;
+                    typedef CORBA_StringDef_var _var_type;
+                  #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+                    // the static operations
+                    static CORBA_StringDef_ptr _duplicate (CORBA_StringDef_ptr obj);
+
+                    static CORBA_StringDef_ptr _narrow (
+                        CORBA::Object_ptr obj,
+                        CORBA::Environment &ACE_TRY_ENV =
+                          TAO_default_environment ()
+                      );
+
+                    static CORBA_StringDef_ptr _unchecked_narrow (
+                        CORBA::Object_ptr obj,
+                        CORBA::Environment &ACE_TRY_ENV =
+                          TAO_default_environment ()
+                      );
+
+                    static CORBA_StringDef_ptr _nil (void)
+                      {
+                        return (CORBA_StringDef_ptr)0;
+                      }
+
+                    static void _tao_any_destructor (void*);
+
+                    virtual CORBA::ULong bound (
+                        CORBA::Environment &ACE_TRY_ENV =
+                          TAO_default_environment ()
+                      )
+                      ACE_THROW_SPEC ((
+                        CORBA::SystemException
+                      ));
+
+                    virtual void bound (
+                        CORBA::ULong bound,
+                        CORBA::Environment &ACE_TRY_ENV =
+                          TAO_default_environment ()
+                      )
+                      ACE_THROW_SPEC ((
+                        CORBA::SystemException
+                      ));
+
+                    virtual CORBA::Boolean _is_a (
+                        const CORBA::Char *type_id,
+                        CORBA::Environment &ACE_TRY_ENV =
+                          TAO_default_environment ()
+                      );
+
+                    virtual void *_tao_QueryInterface (ptr_arith_t type);
+
+                    virtual const char* _interface_repository_id (void) const;
+
+                  private:
+                    _TAO_CORBA_StringDef_Proxy_Broker *the_TAO_CORBA_StringDef_Proxy_Broker_;
+
+                  protected:
+                    CORBA_StringDef (int collocated = 0);
+
+                    // This methods travese the inheritance tree and set the
+                    // parents piece of the given class in the right mode
+                    virtual void CORBA_StringDef_setup_collocation (int collocated);
+
+                    CORBA_StringDef (
+                        TAO_Stub *objref,
+                        CORBA::Boolean _tao_collocated = 0,
+                        TAO_Abstract_ServantBase *servant = 0
+                      );
+
+                    friend class _TAO_CORBA_StringDef_Remote_Proxy_Impl;
+                    friend class _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl;
+                    friend class _TAO_CORBA_StringDef_Direct_Proxy_Impl;
+
+                    virtual ~CORBA_StringDef (void);
+
+                  private:
+                    CORBA_StringDef (const CORBA_StringDef &);
+                    void operator= (const CORBA_StringDef &);
+                  };
+
+                  // The Proxy Implementations are used by each interface to
+                  // perform a call. Each different implementation encapsulate
+                  // an invocation logics.
+
+
+                  ///////////////////////////////////////////////////////////////////////
+                  //                    Base Proxy Impl. Declaration
+                  //
+
+                  class TAO_IFR_Client_Export _TAO_CORBA_StringDef_Proxy_Impl
+                    : public virtual _TAO_CORBA_IDLType_Proxy_Impl
+                  {
+                  public:
+                    virtual ~_TAO_CORBA_StringDef_Proxy_Impl (void) { }
+                    virtual CORBA::ULong bound (
+                        CORBA_Object *_collocated_tao_target_,
+                        CORBA::Environment &ACE_TRY_ENV
+                      )
+                      ACE_THROW_SPEC ((
+                        CORBA::SystemException
+                      )) = 0;
+
+                    virtual void bound (
+                        CORBA_Object *_collocated_tao_target_,
+                        CORBA::ULong bound,
+                        CORBA::Environment &ACE_TRY_ENV
+                      )
+                      ACE_THROW_SPEC ((
+                        CORBA::SystemException
+                      )) = 0;
+
+
+                  protected:
+                    _TAO_CORBA_StringDef_Proxy_Impl (void);
+                  };
+
+                  //
+                  //               End Base Proxy Impl. Declaration
+                  ///////////////////////////////////////////////////////////////////////
+
+
+                  ///////////////////////////////////////////////////////////////////////
+                  //                Remote Proxy Impl. Declaration
+                  //
+
+                  class TAO_IFR_Client_Export _TAO_CORBA_StringDef_Remote_Proxy_Impl
+                    : public virtual _TAO_CORBA_StringDef_Proxy_Impl,
+                      public virtual TAO_Remote_Object_Proxy_Impl,
+                      public virtual _TAO_CORBA_IDLType_Remote_Proxy_Impl
+                  {
+                  public:
+                    _TAO_CORBA_StringDef_Remote_Proxy_Impl (void);
+
+                    virtual ~_TAO_CORBA_StringDef_Remote_Proxy_Impl (void) { }
+                    virtual CORBA::ULong bound (
+                        CORBA_Object *_collocated_tao_target_,
+                        CORBA::Environment &ACE_TRY_ENV
+                      )
+                      ACE_THROW_SPEC ((
+                        CORBA::SystemException
+                      ));
+
+                    virtual void bound (
+                        CORBA_Object *_collocated_tao_target_,
+                        CORBA::ULong bound,
+                        CORBA::Environment &ACE_TRY_ENV
+                      )
+                      ACE_THROW_SPEC ((
+                        CORBA::SystemException
+                      ));
+
+
+                  };
+
+                  //
+                  //             End Remote Proxy Impl. Declaration
+                  ///////////////////////////////////////////////////////////////////////
+
+                  // The Proxy Brokers are used by each interface to get
+                  // the right proxy for performing a call. In the new
+                  // collocation scheme, the proxy to be used can vary on
+                  // a call by call basis.
+
+
+                  ///////////////////////////////////////////////////////////////////////
+                  //                 Base Proxy Broker Declaration
+                  //
+
+                                    class TAO_IFR_Client_Export _TAO_CORBA_StringDef_Proxy_Broker
+                  {
+                  public:
+                    virtual ~_TAO_CORBA_StringDef_Proxy_Broker (void);
+                    virtual _TAO_CORBA_StringDef_Proxy_Impl &select_proxy (
+                        CORBA_StringDef *object,
+                        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                      ) = 0;
+
+                  protected:
+                    _TAO_CORBA_StringDef_Proxy_Broker (void);
+
+                  };
+
+                  //
+                  //              End Base Proxy Broker Declaration
+                  ///////////////////////////////////////////////////////////////////////
+
+
+                  ///////////////////////////////////////////////////////////////////////
+                  //                 Remote Proxy Broker Declaration
+                  //
+
+                  class TAO_IFR_Client_Export _TAO_CORBA_StringDef_Remote_Proxy_Broker
+                    : public virtual _TAO_CORBA_StringDef_Proxy_Broker
+                  {
+                  public:
+                    _TAO_CORBA_StringDef_Remote_Proxy_Broker (void);
+
+                    virtual ~_TAO_CORBA_StringDef_Remote_Proxy_Broker (void);
+
+                    virtual _TAO_CORBA_StringDef_Proxy_Impl &select_proxy (
+                        CORBA_StringDef *object,
+                        CORBA_Environment &ACE_TRY_ENV
+                      );
+
+                    private:
+                      _TAO_CORBA_StringDef_Remote_Proxy_Impl remote_proxy_impl_;
 
+                    public:
+                      // This member function is used to get an handle to the unique instance
+                      // of the Remote Proxy Broker that is available for a given
+                      // interface.
+                      static _TAO_CORBA_StringDef_Remote_Proxy_Broker *the_TAO_CORBA_StringDef_Remote_Proxy_Broker (void);
+                    };
 
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+                    //
+                    //              End Remote Proxy Broker Declaration
+                    ///////////////////////////////////////////////////////////////////////
 
 
 #endif /* end #if !defined */
 
 
+
 #if !defined (_CORBA_WSTRINGDEF_CH_)
 #define _CORBA_WSTRINGDEF_CH_
 
-// Forward Classes Declaration
-class _TAO_CORBA_WstringDef_Proxy_Impl;
-class _TAO_CORBA_WstringDef_Remote_Proxy_Impl;
-class _TAO_CORBA_WstringDef_Proxy_Broker;
-class _TAO_CORBA_WstringDef_Remote_Proxy_Broker;
-
-class TAO_IFR_Client_Export CORBA_WstringDef: public virtual CORBA_IDLType
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_WstringDef_ptr _ptr_type;
-  typedef CORBA_WstringDef_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static CORBA_WstringDef_ptr _duplicate (CORBA_WstringDef_ptr obj);
-  static CORBA_WstringDef_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_WstringDef_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_WstringDef_ptr _nil (void)
-    {
-      return (CORBA_WstringDef_ptr)0;
-    }
-
-  static void _tao_any_destructor (void*);
-
-  virtual CORBA::ULong bound (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void bound (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
-
-private:
-  _TAO_CORBA_WstringDef_Proxy_Broker *the_TAO_CORBA_WstringDef_Proxy_Broker_;
-  
-protected:
-  CORBA_WstringDef (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void CORBA_WstringDef_setup_collocation (int collocated);
-    
-    CORBA_WstringDef (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_CORBA_WstringDef_Remote_Proxy_Impl;
-    friend class _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_CORBA_WstringDef_Direct_Proxy_Impl;
-  
-  virtual ~CORBA_WstringDef (void);
-private:
-  CORBA_WstringDef (const CORBA_WstringDef &);
-  void operator= (const CORBA_WstringDef &);
-};
-
-
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_WstringDef_Proxy_Impl : 
-  public virtual _TAO_CORBA_IDLType_Proxy_Impl
-{
-public:
-  virtual ~_TAO_CORBA_WstringDef_Proxy_Impl (void) { }
-  
-    virtual CORBA::ULong bound (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void bound (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-protected:
-  _TAO_CORBA_WstringDef_Proxy_Impl (void);
-
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_WstringDef_Remote_Proxy_Impl : 
-  public virtual _TAO_CORBA_WstringDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_IDLType_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_CORBA_WstringDef_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_CORBA_WstringDef_Remote_Proxy_Impl (void) { }
-  
-    virtual CORBA::ULong bound (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void bound (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+                    // Forward Classes Declaration
+                    class _TAO_CORBA_WstringDef_Proxy_Impl;
+                    class _TAO_CORBA_WstringDef_Remote_Proxy_Impl;
+                    class _TAO_CORBA_WstringDef_Proxy_Broker;
+                    class _TAO_CORBA_WstringDef_Remote_Proxy_Broker;
+
+                    class TAO_IFR_Client_Export CORBA_WstringDef
+                      : public virtual CORBA_IDLType
+                    {
+                    public:
+                    #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+                      typedef CORBA_WstringDef_ptr _ptr_type;
+                      typedef CORBA_WstringDef_var _var_type;
+                    #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+                      // the static operations
+                      static CORBA_WstringDef_ptr _duplicate (CORBA_WstringDef_ptr obj);
+
+                      static CORBA_WstringDef_ptr _narrow (
+                          CORBA::Object_ptr obj,
+                          CORBA::Environment &ACE_TRY_ENV =
+                            TAO_default_environment ()
+                        );
+
+                      static CORBA_WstringDef_ptr _unchecked_narrow (
+                          CORBA::Object_ptr obj,
+                          CORBA::Environment &ACE_TRY_ENV =
+                            TAO_default_environment ()
+                        );
+
+                      static CORBA_WstringDef_ptr _nil (void)
+                        {
+                          return (CORBA_WstringDef_ptr)0;
+                        }
+
+                      static void _tao_any_destructor (void*);
+
+                      virtual CORBA::ULong bound (
+                          CORBA::Environment &ACE_TRY_ENV =
+                            TAO_default_environment ()
+                        )
+                        ACE_THROW_SPEC ((
+                          CORBA::SystemException
+                        ));
+
+                      virtual void bound (
+                          CORBA::ULong bound,
+                          CORBA::Environment &ACE_TRY_ENV =
+                            TAO_default_environment ()
+                        )
+                        ACE_THROW_SPEC ((
+                          CORBA::SystemException
+                        ));
+
+                      virtual CORBA::Boolean _is_a (
+                          const CORBA::Char *type_id,
+                          CORBA::Environment &ACE_TRY_ENV =
+                            TAO_default_environment ()
+                        );
+
+                      virtual void *_tao_QueryInterface (ptr_arith_t type);
+
+                      virtual const char* _interface_repository_id (void) const;
+
+                    private:
+                      _TAO_CORBA_WstringDef_Proxy_Broker *the_TAO_CORBA_WstringDef_Proxy_Broker_;
+
+                    protected:
+                      CORBA_WstringDef (int collocated = 0);
+
+                      // This methods travese the inheritance tree and set the
+                      // parents piece of the given class in the right mode
+                      virtual void CORBA_WstringDef_setup_collocation (int collocated);
+
+                      CORBA_WstringDef (
+                          TAO_Stub *objref,
+                          CORBA::Boolean _tao_collocated = 0,
+                          TAO_Abstract_ServantBase *servant = 0
+                        );
+
+                      friend class _TAO_CORBA_WstringDef_Remote_Proxy_Impl;
+                      friend class _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl;
+                      friend class _TAO_CORBA_WstringDef_Direct_Proxy_Impl;
+
+                      virtual ~CORBA_WstringDef (void);
+
+                    private:
+                      CORBA_WstringDef (const CORBA_WstringDef &);
+                      void operator= (const CORBA_WstringDef &);
+                    };
+
+                    // The Proxy Implementations are used by each interface to
+                    // perform a call. Each different implementation encapsulate
+                    // an invocation logics.
+
+
+                    ///////////////////////////////////////////////////////////////////////
+                    //                    Base Proxy Impl. Declaration
+                    //
+
+                    class TAO_IFR_Client_Export _TAO_CORBA_WstringDef_Proxy_Impl
+                      : public virtual _TAO_CORBA_IDLType_Proxy_Impl
+                    {
+                    public:
+                      virtual ~_TAO_CORBA_WstringDef_Proxy_Impl (void) { }
+                      virtual CORBA::ULong bound (
+                          CORBA_Object *_collocated_tao_target_,
+                          CORBA::Environment &ACE_TRY_ENV
+                        )
+                        ACE_THROW_SPEC ((
+                          CORBA::SystemException
+                        )) = 0;
+
+                      virtual void bound (
+                          CORBA_Object *_collocated_tao_target_,
+                          CORBA::ULong bound,
+                          CORBA::Environment &ACE_TRY_ENV
+                        )
+                        ACE_THROW_SPEC ((
+                          CORBA::SystemException
+                        )) = 0;
+
+
+                    protected:
+                      _TAO_CORBA_WstringDef_Proxy_Impl (void);
+                    };
+
+                    //
+                    //               End Base Proxy Impl. Declaration
+                    ///////////////////////////////////////////////////////////////////////
+
+
+                    ///////////////////////////////////////////////////////////////////////
+                    //                Remote Proxy Impl. Declaration
+                    //
+
+                    class TAO_IFR_Client_Export _TAO_CORBA_WstringDef_Remote_Proxy_Impl
+                      : public virtual _TAO_CORBA_WstringDef_Proxy_Impl,
+                        public virtual TAO_Remote_Object_Proxy_Impl,
+                        public virtual _TAO_CORBA_IDLType_Remote_Proxy_Impl
+                    {
+                    public:
+                      _TAO_CORBA_WstringDef_Remote_Proxy_Impl (void);
+
+                      virtual ~_TAO_CORBA_WstringDef_Remote_Proxy_Impl (void) { }
+                      virtual CORBA::ULong bound (
+                          CORBA_Object *_collocated_tao_target_,
+                          CORBA::Environment &ACE_TRY_ENV
+                        )
+                        ACE_THROW_SPEC ((
+                          CORBA::SystemException
+                        ));
+
+                      virtual void bound (
+                          CORBA_Object *_collocated_tao_target_,
+                          CORBA::ULong bound,
+                          CORBA::Environment &ACE_TRY_ENV
+                        )
+                        ACE_THROW_SPEC ((
+                          CORBA::SystemException
+                        ));
+
+
+                    };
+
+                    //
+                    //             End Remote Proxy Impl. Declaration
+                    ///////////////////////////////////////////////////////////////////////
+
+                    // The Proxy Brokers are used by each interface to get
+                    // the right proxy for performing a call. In the new
+                    // collocation scheme, the proxy to be used can vary on
+                    // a call by call basis.
+
+
+                    ///////////////////////////////////////////////////////////////////////
+                    //                 Base Proxy Broker Declaration
+                    //
+
+                                        class TAO_IFR_Client_Export _TAO_CORBA_WstringDef_Proxy_Broker
+                    {
+                    public:
+                      virtual ~_TAO_CORBA_WstringDef_Proxy_Broker (void);
+                      virtual _TAO_CORBA_WstringDef_Proxy_Impl &select_proxy (
+                          CORBA_WstringDef *object,
+                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                        ) = 0;
+
+                    protected:
+                      _TAO_CORBA_WstringDef_Proxy_Broker (void);
+
+                    };
+
+                    //
+                    //              End Base Proxy Broker Declaration
+                    ///////////////////////////////////////////////////////////////////////
+
+
+                    ///////////////////////////////////////////////////////////////////////
+                    //                 Remote Proxy Broker Declaration
+                    //
+
+                    class TAO_IFR_Client_Export _TAO_CORBA_WstringDef_Remote_Proxy_Broker
+                      : public virtual _TAO_CORBA_WstringDef_Proxy_Broker
+                    {
+                    public:
+                      _TAO_CORBA_WstringDef_Remote_Proxy_Broker (void);
+
+                      virtual ~_TAO_CORBA_WstringDef_Remote_Proxy_Broker (void);
+
+                      virtual _TAO_CORBA_WstringDef_Proxy_Impl &select_proxy (
+                          CORBA_WstringDef *object,
+                          CORBA_Environment &ACE_TRY_ENV
+                        );
+
+                      private:
+                        _TAO_CORBA_WstringDef_Remote_Proxy_Impl remote_proxy_impl_;
 
-};
+                      public:
+                        // This member function is used to get an handle to the unique instance
+                        // of the Remote Proxy Broker that is available for a given
+                        // interface.
+                        static _TAO_CORBA_WstringDef_Remote_Proxy_Broker *the_TAO_CORBA_WstringDef_Remote_Proxy_Broker (void);
+                      };
 
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
-
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_WstringDef_Proxy_Broker
-{
-public:
-  virtual ~_TAO_CORBA_WstringDef_Proxy_Broker (void);
-  virtual _TAO_CORBA_WstringDef_Proxy_Impl &select_proxy (
-    CORBA_WstringDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
-
-protected:
-  _TAO_CORBA_WstringDef_Proxy_Broker (void);
-  
-};
-
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_WstringDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_WstringDef_Proxy_Broker
-{
-public: 
-  _TAO_CORBA_WstringDef_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_CORBA_WstringDef_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_CORBA_WstringDef_Proxy_Impl &select_proxy (
-    CORBA_WstringDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
-
-private:
-  _TAO_CORBA_WstringDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
-
-public:
-  static _TAO_CORBA_WstringDef_Remote_Proxy_Broker *the_TAO_CORBA_WstringDef_Remote_Proxy_Broker (void);
-};
-
-
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+                      //
+                      //              End Remote Proxy Broker Declaration
+                      ///////////////////////////////////////////////////////////////////////
 
 
 #endif /* end #if !defined */
 
 
+
 #if !defined (_CORBA_SEQUENCEDEF_CH_)
 #define _CORBA_SEQUENCEDEF_CH_
 
-// Forward Classes Declaration
-class _TAO_CORBA_SequenceDef_Proxy_Impl;
-class _TAO_CORBA_SequenceDef_Remote_Proxy_Impl;
-class _TAO_CORBA_SequenceDef_Proxy_Broker;
-class _TAO_CORBA_SequenceDef_Remote_Proxy_Broker;
-
-class TAO_IFR_Client_Export CORBA_SequenceDef : public virtual CORBA_IDLType
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_SequenceDef_ptr _ptr_type;
-  typedef CORBA_SequenceDef_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static CORBA_SequenceDef_ptr _duplicate (CORBA_SequenceDef_ptr obj);
-  static CORBA_SequenceDef_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_SequenceDef_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_SequenceDef_ptr _nil (void)
-    {
-      return (CORBA_SequenceDef_ptr)0;
-    }
-
-  static void _tao_any_destructor (void*);
-
-  virtual CORBA::ULong bound (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void bound (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::TypeCode_ptr element_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_IDLType_ptr element_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void element_type_def (
-      CORBA_IDLType_ptr element_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
-
-private:
-  _TAO_CORBA_SequenceDef_Proxy_Broker *the_TAO_CORBA_SequenceDef_Proxy_Broker_;
-  
-protected:
-  CORBA_SequenceDef (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void CORBA_SequenceDef_setup_collocation (int collocated);
-    
-    CORBA_SequenceDef (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_CORBA_SequenceDef_Remote_Proxy_Impl;
-    friend class _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_CORBA_SequenceDef_Direct_Proxy_Impl;
-  
-  virtual ~CORBA_SequenceDef (void);
-private:
-  CORBA_SequenceDef (const CORBA_SequenceDef &);
-  void operator= (const CORBA_SequenceDef &);
-};
-
-
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_SequenceDef_Proxy_Impl : public virtual TAO_Object_Proxy_Impl
-{
-public:
-  virtual ~_TAO_CORBA_SequenceDef_Proxy_Impl (void) { }
-  
-    virtual CORBA::ULong bound (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void bound (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA::TypeCode_ptr element_type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_IDLType_ptr element_type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void element_type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr element_type_def,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-protected:
-  _TAO_CORBA_SequenceDef_Proxy_Impl (void);
-
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_SequenceDef_Remote_Proxy_Impl : 
-  public virtual _TAO_CORBA_SequenceDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl
-{
-public:
-  _TAO_CORBA_SequenceDef_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_CORBA_SequenceDef_Remote_Proxy_Impl (void) { }
-  
-    virtual CORBA::ULong bound (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void bound (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::TypeCode_ptr element_type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_IDLType_ptr element_type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void element_type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr element_type_def,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-};
-
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
-
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_SequenceDef_Proxy_Broker
-{
-public:
-  virtual ~_TAO_CORBA_SequenceDef_Proxy_Broker (void);
-  virtual _TAO_CORBA_SequenceDef_Proxy_Impl &select_proxy (
-    CORBA_SequenceDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
-
-protected:
-  _TAO_CORBA_SequenceDef_Proxy_Broker (void);
-  
-};
-
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_SequenceDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_SequenceDef_Proxy_Broker
-{
-public: 
-  _TAO_CORBA_SequenceDef_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_CORBA_SequenceDef_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_CORBA_SequenceDef_Proxy_Impl &select_proxy (
-    CORBA_SequenceDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
-
-private:
-  _TAO_CORBA_SequenceDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
-
-public:
-  static _TAO_CORBA_SequenceDef_Remote_Proxy_Broker *the_TAO_CORBA_SequenceDef_Remote_Proxy_Broker (void);
-};
-
-
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+                      // Forward Classes Declaration
+                      class _TAO_CORBA_SequenceDef_Proxy_Impl;
+                      class _TAO_CORBA_SequenceDef_Remote_Proxy_Impl;
+                      class _TAO_CORBA_SequenceDef_Proxy_Broker;
+                      class _TAO_CORBA_SequenceDef_Remote_Proxy_Broker;
+
+                      class TAO_IFR_Client_Export CORBA_SequenceDef
+                        : public virtual CORBA_IDLType
+                      {
+                      public:
+                      #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+                        typedef CORBA_SequenceDef_ptr _ptr_type;
+                        typedef CORBA_SequenceDef_var _var_type;
+                      #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+                        // the static operations
+                        static CORBA_SequenceDef_ptr _duplicate (CORBA_SequenceDef_ptr obj);
+
+                        static CORBA_SequenceDef_ptr _narrow (
+                            CORBA::Object_ptr obj,
+                            CORBA::Environment &ACE_TRY_ENV =
+                              TAO_default_environment ()
+                          );
+
+                        static CORBA_SequenceDef_ptr _unchecked_narrow (
+                            CORBA::Object_ptr obj,
+                            CORBA::Environment &ACE_TRY_ENV =
+                              TAO_default_environment ()
+                          );
+
+                        static CORBA_SequenceDef_ptr _nil (void)
+                          {
+                            return (CORBA_SequenceDef_ptr)0;
+                          }
+
+                        static void _tao_any_destructor (void*);
+
+                        virtual CORBA::ULong bound (
+                            CORBA::Environment &ACE_TRY_ENV =
+                              TAO_default_environment ()
+                          )
+                          ACE_THROW_SPEC ((
+                            CORBA::SystemException
+                          ));
+
+                        virtual void bound (
+                            CORBA::ULong bound,
+                            CORBA::Environment &ACE_TRY_ENV =
+                              TAO_default_environment ()
+                          )
+                          ACE_THROW_SPEC ((
+                            CORBA::SystemException
+                          ));
+
+                        virtual CORBA::TypeCode_ptr element_type (
+                            CORBA::Environment &ACE_TRY_ENV =
+                              TAO_default_environment ()
+                          )
+                          ACE_THROW_SPEC ((
+                            CORBA::SystemException
+                          ));
+
+                        virtual CORBA_IDLType_ptr element_type_def (
+                            CORBA::Environment &ACE_TRY_ENV =
+                              TAO_default_environment ()
+                          )
+                          ACE_THROW_SPEC ((
+                            CORBA::SystemException
+                          ));
+
+                        virtual void element_type_def (
+                            CORBA_IDLType_ptr element_type_def,
+                            CORBA::Environment &ACE_TRY_ENV =
+                              TAO_default_environment ()
+                          )
+                          ACE_THROW_SPEC ((
+                            CORBA::SystemException
+                          ));
+
+                        virtual CORBA::Boolean _is_a (
+                            const CORBA::Char *type_id,
+                            CORBA::Environment &ACE_TRY_ENV =
+                              TAO_default_environment ()
+                          );
+
+                        virtual void *_tao_QueryInterface (ptr_arith_t type);
+
+                        virtual const char* _interface_repository_id (void) const;
+
+                      private:
+                        _TAO_CORBA_SequenceDef_Proxy_Broker *the_TAO_CORBA_SequenceDef_Proxy_Broker_;
+
+                      protected:
+                        CORBA_SequenceDef (int collocated = 0);
+
+                        // This methods travese the inheritance tree and set the
+                        // parents piece of the given class in the right mode
+                        virtual void CORBA_SequenceDef_setup_collocation (int collocated);
+
+                        CORBA_SequenceDef (
+                            TAO_Stub *objref,
+                            CORBA::Boolean _tao_collocated = 0,
+                            TAO_Abstract_ServantBase *servant = 0
+                          );
+
+                        friend class _TAO_CORBA_SequenceDef_Remote_Proxy_Impl;
+                        friend class _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl;
+                        friend class _TAO_CORBA_SequenceDef_Direct_Proxy_Impl;
+
+                        virtual ~CORBA_SequenceDef (void);
+
+                      private:
+                        CORBA_SequenceDef (const CORBA_SequenceDef &);
+                        void operator= (const CORBA_SequenceDef &);
+                      };
+
+                      // The Proxy Implementations are used by each interface to
+                      // perform a call. Each different implementation encapsulate
+                      // an invocation logics.
+
+
+                      ///////////////////////////////////////////////////////////////////////
+                      //                    Base Proxy Impl. Declaration
+                      //
+
+                      class TAO_IFR_Client_Export _TAO_CORBA_SequenceDef_Proxy_Impl
+                        : public virtual _TAO_CORBA_IDLType_Proxy_Impl
+                      {
+                      public:
+                        virtual ~_TAO_CORBA_SequenceDef_Proxy_Impl (void) { }
+                        virtual CORBA::ULong bound (
+                            CORBA_Object *_collocated_tao_target_,
+                            CORBA::Environment &ACE_TRY_ENV
+                          )
+                          ACE_THROW_SPEC ((
+                            CORBA::SystemException
+                          )) = 0;
+
+                        virtual void bound (
+                            CORBA_Object *_collocated_tao_target_,
+                            CORBA::ULong bound,
+                            CORBA::Environment &ACE_TRY_ENV
+                          )
+                          ACE_THROW_SPEC ((
+                            CORBA::SystemException
+                          )) = 0;
+
+                        virtual CORBA::TypeCode_ptr element_type (
+                            CORBA_Object *_collocated_tao_target_,
+                            CORBA::Environment &ACE_TRY_ENV
+                          )
+                          ACE_THROW_SPEC ((
+                            CORBA::SystemException
+                          )) = 0;
+
+                        virtual CORBA_IDLType_ptr element_type_def (
+                            CORBA_Object *_collocated_tao_target_,
+                            CORBA::Environment &ACE_TRY_ENV
+                          )
+                          ACE_THROW_SPEC ((
+                            CORBA::SystemException
+                          )) = 0;
+
+                        virtual void element_type_def (
+                            CORBA_Object *_collocated_tao_target_,
+                            CORBA_IDLType_ptr element_type_def,
+                            CORBA::Environment &ACE_TRY_ENV
+                          )
+                          ACE_THROW_SPEC ((
+                            CORBA::SystemException
+                          )) = 0;
+
+
+                      protected:
+                        _TAO_CORBA_SequenceDef_Proxy_Impl (void);
+                      };
+
+                      //
+                      //               End Base Proxy Impl. Declaration
+                      ///////////////////////////////////////////////////////////////////////
+
+
+                      ///////////////////////////////////////////////////////////////////////
+                      //                Remote Proxy Impl. Declaration
+                      //
+
+                      class TAO_IFR_Client_Export _TAO_CORBA_SequenceDef_Remote_Proxy_Impl
+                        : public virtual _TAO_CORBA_SequenceDef_Proxy_Impl,
+                          public virtual TAO_Remote_Object_Proxy_Impl,
+                          public virtual _TAO_CORBA_IDLType_Remote_Proxy_Impl
+                      {
+                      public:
+                        _TAO_CORBA_SequenceDef_Remote_Proxy_Impl (void);
+
+                        virtual ~_TAO_CORBA_SequenceDef_Remote_Proxy_Impl (void) { }
+                        virtual CORBA::ULong bound (
+                            CORBA_Object *_collocated_tao_target_,
+                            CORBA::Environment &ACE_TRY_ENV
+                          )
+                          ACE_THROW_SPEC ((
+                            CORBA::SystemException
+                          ));
+
+                        virtual void bound (
+                            CORBA_Object *_collocated_tao_target_,
+                            CORBA::ULong bound,
+                            CORBA::Environment &ACE_TRY_ENV
+                          )
+                          ACE_THROW_SPEC ((
+                            CORBA::SystemException
+                          ));
+
+                        virtual CORBA::TypeCode_ptr element_type (
+                            CORBA_Object *_collocated_tao_target_,
+                            CORBA::Environment &ACE_TRY_ENV
+                          )
+                          ACE_THROW_SPEC ((
+                            CORBA::SystemException
+                          ));
+
+                        virtual CORBA_IDLType_ptr element_type_def (
+                            CORBA_Object *_collocated_tao_target_,
+                            CORBA::Environment &ACE_TRY_ENV
+                          )
+                          ACE_THROW_SPEC ((
+                            CORBA::SystemException
+                          ));
+
+                        virtual void element_type_def (
+                            CORBA_Object *_collocated_tao_target_,
+                            CORBA_IDLType_ptr element_type_def,
+                            CORBA::Environment &ACE_TRY_ENV
+                          )
+                          ACE_THROW_SPEC ((
+                            CORBA::SystemException
+                          ));
+
+
+                      };
+
+                      //
+                      //             End Remote Proxy Impl. Declaration
+                      ///////////////////////////////////////////////////////////////////////
+
+                      // The Proxy Brokers are used by each interface to get
+                      // the right proxy for performing a call. In the new
+                      // collocation scheme, the proxy to be used can vary on
+                      // a call by call basis.
+
+
+                      ///////////////////////////////////////////////////////////////////////
+                      //                 Base Proxy Broker Declaration
+                      //
+
+                                            class TAO_IFR_Client_Export _TAO_CORBA_SequenceDef_Proxy_Broker
+                      {
+                      public:
+                        virtual ~_TAO_CORBA_SequenceDef_Proxy_Broker (void);
+                        virtual _TAO_CORBA_SequenceDef_Proxy_Impl &select_proxy (
+                            CORBA_SequenceDef *object,
+                            CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                          ) = 0;
+
+                      protected:
+                        _TAO_CORBA_SequenceDef_Proxy_Broker (void);
+
+                      };
+
+                      //
+                      //              End Base Proxy Broker Declaration
+                      ///////////////////////////////////////////////////////////////////////
+
+
+                      ///////////////////////////////////////////////////////////////////////
+                      //                 Remote Proxy Broker Declaration
+                      //
+
+                      class TAO_IFR_Client_Export _TAO_CORBA_SequenceDef_Remote_Proxy_Broker
+                        : public virtual _TAO_CORBA_SequenceDef_Proxy_Broker
+                      {
+                      public:
+                        _TAO_CORBA_SequenceDef_Remote_Proxy_Broker (void);
+
+                        virtual ~_TAO_CORBA_SequenceDef_Remote_Proxy_Broker (void);
+
+                        virtual _TAO_CORBA_SequenceDef_Proxy_Impl &select_proxy (
+                            CORBA_SequenceDef *object,
+                            CORBA_Environment &ACE_TRY_ENV
+                          );
+
+                        private:
+                          _TAO_CORBA_SequenceDef_Remote_Proxy_Impl remote_proxy_impl_;
+
+                        public:
+                          // This member function is used to get an handle to the unique instance
+                          // of the Remote Proxy Broker that is available for a given
+                          // interface.
+                          static _TAO_CORBA_SequenceDef_Remote_Proxy_Broker *the_TAO_CORBA_SequenceDef_Remote_Proxy_Broker (void);
+                        };
+
+                        //
+                        //              End Remote Proxy Broker Declaration
+                        ///////////////////////////////////////////////////////////////////////
 
 
 #endif /* end #if !defined */
 
 
+
 #if !defined (_CORBA_ARRAYDEF_CH_)
 #define _CORBA_ARRAYDEF_CH_
 
-// Forward Classes Declaration
-class _TAO_CORBA_ArrayDef_Proxy_Impl;
-class _TAO_CORBA_ArrayDef_Remote_Proxy_Impl;
-class _TAO_CORBA_ArrayDef_Proxy_Broker;
-class _TAO_CORBA_ArrayDef_Remote_Proxy_Broker;
-
-class TAO_IFR_Client_Export CORBA_ArrayDef: public virtual CORBA_IDLType
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_ArrayDef_ptr _ptr_type;
-  typedef CORBA_ArrayDef_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static CORBA_ArrayDef_ptr _duplicate (CORBA_ArrayDef_ptr obj);
-  static CORBA_ArrayDef_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_ArrayDef_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_ArrayDef_ptr _nil (void)
-    {
-      return (CORBA_ArrayDef_ptr)0;
-    }
-
-  static void _tao_any_destructor (void*);
-
-  virtual CORBA::ULong length (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void length (
-      CORBA::ULong length,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::TypeCode_ptr element_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_IDLType_ptr element_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void element_type_def (
-      CORBA_IDLType_ptr element_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
-
-private:
-  _TAO_CORBA_ArrayDef_Proxy_Broker *the_TAO_CORBA_ArrayDef_Proxy_Broker_;
-  
-protected:
-  CORBA_ArrayDef (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void CORBA_ArrayDef_setup_collocation (int collocated);
-    
-    CORBA_ArrayDef (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_CORBA_ArrayDef_Remote_Proxy_Impl;
-    friend class _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_CORBA_ArrayDef_Direct_Proxy_Impl;
-  
-  virtual ~CORBA_ArrayDef (void);
-private:
-  CORBA_ArrayDef (const CORBA_ArrayDef &);
-  void operator= (const CORBA_ArrayDef &);
-};
-
-
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_ArrayDef_Proxy_Impl : 
-  public virtual _TAO_CORBA_IDLType_Proxy_Impl
-{
-public:
-  virtual ~_TAO_CORBA_ArrayDef_Proxy_Impl (void) { }
-  
-    virtual CORBA::ULong length (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void length (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::ULong length,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA::TypeCode_ptr element_type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_IDLType_ptr element_type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void element_type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr element_type_def,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-protected:
-  _TAO_CORBA_ArrayDef_Proxy_Impl (void);
-
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_ArrayDef_Remote_Proxy_Impl : 
-  public virtual _TAO_CORBA_ArrayDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_IDLType_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_CORBA_ArrayDef_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_CORBA_ArrayDef_Remote_Proxy_Impl (void) { }
-  
-    virtual CORBA::ULong length (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void length (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::ULong length,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::TypeCode_ptr element_type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_IDLType_ptr element_type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void element_type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr element_type_def,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-};
-
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
-
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_ArrayDef_Proxy_Broker
-{
-public:
-  virtual ~_TAO_CORBA_ArrayDef_Proxy_Broker (void);
-  virtual _TAO_CORBA_ArrayDef_Proxy_Impl &select_proxy (
-    CORBA_ArrayDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
-
-protected:
-  _TAO_CORBA_ArrayDef_Proxy_Broker (void);
-  
-};
-
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_ArrayDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_ArrayDef_Proxy_Broker
-{
-public: 
-  _TAO_CORBA_ArrayDef_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_CORBA_ArrayDef_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_CORBA_ArrayDef_Proxy_Impl &select_proxy (
-    CORBA_ArrayDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
-
-private:
-  _TAO_CORBA_ArrayDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
-
-public:
-  static _TAO_CORBA_ArrayDef_Remote_Proxy_Broker *the_TAO_CORBA_ArrayDef_Remote_Proxy_Broker (void);
-};
-
-
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+                        // Forward Classes Declaration
+                        class _TAO_CORBA_ArrayDef_Proxy_Impl;
+                        class _TAO_CORBA_ArrayDef_Remote_Proxy_Impl;
+                        class _TAO_CORBA_ArrayDef_Proxy_Broker;
+                        class _TAO_CORBA_ArrayDef_Remote_Proxy_Broker;
+
+                        class TAO_IFR_Client_Export CORBA_ArrayDef
+                          : public virtual CORBA_IDLType
+                        {
+                        public:
+                        #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+                          typedef CORBA_ArrayDef_ptr _ptr_type;
+                          typedef CORBA_ArrayDef_var _var_type;
+                        #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+                          // the static operations
+                          static CORBA_ArrayDef_ptr _duplicate (CORBA_ArrayDef_ptr obj);
+
+                          static CORBA_ArrayDef_ptr _narrow (
+                              CORBA::Object_ptr obj,
+                              CORBA::Environment &ACE_TRY_ENV =
+                                TAO_default_environment ()
+                            );
+
+                          static CORBA_ArrayDef_ptr _unchecked_narrow (
+                              CORBA::Object_ptr obj,
+                              CORBA::Environment &ACE_TRY_ENV =
+                                TAO_default_environment ()
+                            );
+
+                          static CORBA_ArrayDef_ptr _nil (void)
+                            {
+                              return (CORBA_ArrayDef_ptr)0;
+                            }
+
+                          static void _tao_any_destructor (void*);
+
+                          virtual CORBA::ULong length (
+                              CORBA::Environment &ACE_TRY_ENV =
+                                TAO_default_environment ()
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            ));
+
+                          virtual void length (
+                              CORBA::ULong length,
+                              CORBA::Environment &ACE_TRY_ENV =
+                                TAO_default_environment ()
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            ));
+
+                          virtual CORBA::TypeCode_ptr element_type (
+                              CORBA::Environment &ACE_TRY_ENV =
+                                TAO_default_environment ()
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            ));
+
+                          virtual CORBA_IDLType_ptr element_type_def (
+                              CORBA::Environment &ACE_TRY_ENV =
+                                TAO_default_environment ()
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            ));
+
+                          virtual void element_type_def (
+                              CORBA_IDLType_ptr element_type_def,
+                              CORBA::Environment &ACE_TRY_ENV =
+                                TAO_default_environment ()
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            ));
+
+                          virtual CORBA::Boolean _is_a (
+                              const CORBA::Char *type_id,
+                              CORBA::Environment &ACE_TRY_ENV =
+                                TAO_default_environment ()
+                            );
+
+                          virtual void *_tao_QueryInterface (ptr_arith_t type);
+
+                          virtual const char* _interface_repository_id (void) const;
+
+                        private:
+                          _TAO_CORBA_ArrayDef_Proxy_Broker *the_TAO_CORBA_ArrayDef_Proxy_Broker_;
+
+                        protected:
+                          CORBA_ArrayDef (int collocated = 0);
+
+                          // This methods travese the inheritance tree and set the
+                          // parents piece of the given class in the right mode
+                          virtual void CORBA_ArrayDef_setup_collocation (int collocated);
+
+                          CORBA_ArrayDef (
+                              TAO_Stub *objref,
+                              CORBA::Boolean _tao_collocated = 0,
+                              TAO_Abstract_ServantBase *servant = 0
+                            );
+
+                          friend class _TAO_CORBA_ArrayDef_Remote_Proxy_Impl;
+                          friend class _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl;
+                          friend class _TAO_CORBA_ArrayDef_Direct_Proxy_Impl;
+
+                          virtual ~CORBA_ArrayDef (void);
+
+                        private:
+                          CORBA_ArrayDef (const CORBA_ArrayDef &);
+                          void operator= (const CORBA_ArrayDef &);
+                        };
+
+                        // The Proxy Implementations are used by each interface to
+                        // perform a call. Each different implementation encapsulate
+                        // an invocation logics.
+
+
+                        ///////////////////////////////////////////////////////////////////////
+                        //                    Base Proxy Impl. Declaration
+                        //
+
+                        class TAO_IFR_Client_Export _TAO_CORBA_ArrayDef_Proxy_Impl
+                          : public virtual _TAO_CORBA_IDLType_Proxy_Impl
+                        {
+                        public:
+                          virtual ~_TAO_CORBA_ArrayDef_Proxy_Impl (void) { }
+                          virtual CORBA::ULong length (
+                              CORBA_Object *_collocated_tao_target_,
+                              CORBA::Environment &ACE_TRY_ENV
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            )) = 0;
+
+                          virtual void length (
+                              CORBA_Object *_collocated_tao_target_,
+                              CORBA::ULong length,
+                              CORBA::Environment &ACE_TRY_ENV
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            )) = 0;
+
+                          virtual CORBA::TypeCode_ptr element_type (
+                              CORBA_Object *_collocated_tao_target_,
+                              CORBA::Environment &ACE_TRY_ENV
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            )) = 0;
+
+                          virtual CORBA_IDLType_ptr element_type_def (
+                              CORBA_Object *_collocated_tao_target_,
+                              CORBA::Environment &ACE_TRY_ENV
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            )) = 0;
+
+                          virtual void element_type_def (
+                              CORBA_Object *_collocated_tao_target_,
+                              CORBA_IDLType_ptr element_type_def,
+                              CORBA::Environment &ACE_TRY_ENV
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            )) = 0;
+
+
+                        protected:
+                          _TAO_CORBA_ArrayDef_Proxy_Impl (void);
+                        };
+
+                        //
+                        //               End Base Proxy Impl. Declaration
+                        ///////////////////////////////////////////////////////////////////////
+
+
+                        ///////////////////////////////////////////////////////////////////////
+                        //                Remote Proxy Impl. Declaration
+                        //
+
+                        class TAO_IFR_Client_Export _TAO_CORBA_ArrayDef_Remote_Proxy_Impl
+                          : public virtual _TAO_CORBA_ArrayDef_Proxy_Impl,
+                            public virtual TAO_Remote_Object_Proxy_Impl,
+                            public virtual _TAO_CORBA_IDLType_Remote_Proxy_Impl
+                        {
+                        public:
+                          _TAO_CORBA_ArrayDef_Remote_Proxy_Impl (void);
+
+                          virtual ~_TAO_CORBA_ArrayDef_Remote_Proxy_Impl (void) { }
+                          virtual CORBA::ULong length (
+                              CORBA_Object *_collocated_tao_target_,
+                              CORBA::Environment &ACE_TRY_ENV
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            ));
+
+                          virtual void length (
+                              CORBA_Object *_collocated_tao_target_,
+                              CORBA::ULong length,
+                              CORBA::Environment &ACE_TRY_ENV
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            ));
+
+                          virtual CORBA::TypeCode_ptr element_type (
+                              CORBA_Object *_collocated_tao_target_,
+                              CORBA::Environment &ACE_TRY_ENV
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            ));
+
+                          virtual CORBA_IDLType_ptr element_type_def (
+                              CORBA_Object *_collocated_tao_target_,
+                              CORBA::Environment &ACE_TRY_ENV
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            ));
+
+                          virtual void element_type_def (
+                              CORBA_Object *_collocated_tao_target_,
+                              CORBA_IDLType_ptr element_type_def,
+                              CORBA::Environment &ACE_TRY_ENV
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            ));
+
+
+                        };
+
+                        //
+                        //             End Remote Proxy Impl. Declaration
+                        ///////////////////////////////////////////////////////////////////////
+
+                        // The Proxy Brokers are used by each interface to get
+                        // the right proxy for performing a call. In the new
+                        // collocation scheme, the proxy to be used can vary on
+                        // a call by call basis.
+
+
+                        ///////////////////////////////////////////////////////////////////////
+                        //                 Base Proxy Broker Declaration
+                        //
+
+                                                class TAO_IFR_Client_Export _TAO_CORBA_ArrayDef_Proxy_Broker
+                        {
+                        public:
+                          virtual ~_TAO_CORBA_ArrayDef_Proxy_Broker (void);
+                          virtual _TAO_CORBA_ArrayDef_Proxy_Impl &select_proxy (
+                              CORBA_ArrayDef *object,
+                              CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                            ) = 0;
+
+                        protected:
+                          _TAO_CORBA_ArrayDef_Proxy_Broker (void);
+
+                        };
+
+                        //
+                        //              End Base Proxy Broker Declaration
+                        ///////////////////////////////////////////////////////////////////////
+
+
+                        ///////////////////////////////////////////////////////////////////////
+                        //                 Remote Proxy Broker Declaration
+                        //
+
+                        class TAO_IFR_Client_Export _TAO_CORBA_ArrayDef_Remote_Proxy_Broker
+                          : public virtual _TAO_CORBA_ArrayDef_Proxy_Broker
+                        {
+                        public:
+                          _TAO_CORBA_ArrayDef_Remote_Proxy_Broker (void);
+
+                          virtual ~_TAO_CORBA_ArrayDef_Remote_Proxy_Broker (void);
+
+                          virtual _TAO_CORBA_ArrayDef_Proxy_Impl &select_proxy (
+                              CORBA_ArrayDef *object,
+                              CORBA_Environment &ACE_TRY_ENV
+                            );
+
+                          private:
+                            _TAO_CORBA_ArrayDef_Remote_Proxy_Impl remote_proxy_impl_;
+
+                          public:
+                            // This member function is used to get an handle to the unique instance
+                            // of the Remote Proxy Broker that is available for a given
+                            // interface.
+                            static _TAO_CORBA_ArrayDef_Remote_Proxy_Broker *the_TAO_CORBA_ArrayDef_Remote_Proxy_Broker (void);
+                          };
+
+                          //
+                          //              End Remote Proxy Broker Declaration
+                          ///////////////////////////////////////////////////////////////////////
 
 
 #endif /* end #if !defined */
@@ -4654,8 +4731,8 @@ public:
 #if !defined (_CORBA_EXCEPTIONDEF___PTR_CH_)
 #define _CORBA_EXCEPTIONDEF___PTR_CH_
 
-class CORBA_ExceptionDef;
-typedef CORBA_ExceptionDef *CORBA_ExceptionDef_ptr;
+                          class CORBA_ExceptionDef;
+                          typedef CORBA_ExceptionDef *CORBA_ExceptionDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -4663,41 +4740,44 @@ typedef CORBA_ExceptionDef *CORBA_ExceptionDef_ptr;
 #if !defined (_CORBA_EXCEPTIONDEF___VAR_CH_)
 #define _CORBA_EXCEPTIONDEF___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_ExceptionDef_var : public TAO_Base_var
-{
-public:
-  CORBA_ExceptionDef_var (void); // default constructor
-  CORBA_ExceptionDef_var (CORBA_ExceptionDef_ptr p) : ptr_ (p) {} 
-  CORBA_ExceptionDef_var (const CORBA_ExceptionDef_var &); // copy constructor
-  ~CORBA_ExceptionDef_var (void); // destructor
-  
-  CORBA_ExceptionDef_var &operator= (CORBA_ExceptionDef_ptr);
-  CORBA_ExceptionDef_var &operator= (const CORBA_ExceptionDef_var &);
-  CORBA_ExceptionDef_ptr operator-> (void) const;
-  
-  operator const CORBA_ExceptionDef_ptr &() const;
-  operator CORBA_ExceptionDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_ExceptionDef_ptr in (void) const;
-  CORBA_ExceptionDef_ptr &inout (void);
-  CORBA_ExceptionDef_ptr &out (void);
-  CORBA_ExceptionDef_ptr _retn (void);
-  CORBA_ExceptionDef_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_ExceptionDef_ptr duplicate (CORBA_ExceptionDef_ptr);
-  static void release (CORBA_ExceptionDef_ptr);
-  static CORBA_ExceptionDef_ptr nil (void);
-  static CORBA_ExceptionDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
-
-private:
-  CORBA_ExceptionDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_ExceptionDef_var (const TAO_Base_var &rhs);
-  CORBA_ExceptionDef_var &operator= (const TAO_Base_var &rhs);
-};
+                          class TAO_IFR_Client_Export CORBA_ExceptionDef_var : public TAO_Base_var
+                          {
+                          public:
+                            CORBA_ExceptionDef_var (void); // default constructor
+                            CORBA_ExceptionDef_var (CORBA_ExceptionDef_ptr p) : ptr_ (p) {}
+                            CORBA_ExceptionDef_var (const CORBA_ExceptionDef_var &); // copy constructor
+                            ~CORBA_ExceptionDef_var (void); // destructor
+
+                            CORBA_ExceptionDef_var &operator= (CORBA_ExceptionDef_ptr);
+                            CORBA_ExceptionDef_var &operator= (const CORBA_ExceptionDef_var &);
+                            CORBA_ExceptionDef_ptr operator-> (void) const;
+
+                            operator const CORBA_ExceptionDef_ptr &() const;
+                            operator CORBA_ExceptionDef_ptr &();
+                            // in, inout, out, _retn
+                            CORBA_ExceptionDef_ptr in (void) const;
+                            CORBA_ExceptionDef_ptr &inout (void);
+                            CORBA_ExceptionDef_ptr &out (void);
+                            CORBA_ExceptionDef_ptr _retn (void);
+                            CORBA_ExceptionDef_ptr ptr (void) const;
+
+                            // Hooks used by template sequence and object manager classes
+                            // for non-defined forward declared interfaces.
+                            static CORBA_ExceptionDef_ptr duplicate (CORBA_ExceptionDef_ptr);
+                            static void release (CORBA_ExceptionDef_ptr);
+                            static CORBA_ExceptionDef_ptr nil (void);
+                            static CORBA_ExceptionDef_ptr narrow (
+                                CORBA::Object *,
+                                CORBA::Environment &
+                              );
+                            static CORBA::Object * upcast (void *);
+
+                          private:
+                            CORBA_ExceptionDef_ptr ptr_;
+                            // Unimplemented - prevents widening assignment.
+                            CORBA_ExceptionDef_var (const TAO_Base_var &rhs);
+                            CORBA_ExceptionDef_var &operator= (const TAO_Base_var &rhs);
+                          };
 
 
 #endif /* end #if !defined */
@@ -4706,22 +4786,22 @@ private:
 #if !defined (_CORBA_EXCEPTIONDEF___OUT_CH_)
 #define _CORBA_EXCEPTIONDEF___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_ExceptionDef_out
-{
-public:
-  CORBA_ExceptionDef_out (CORBA_ExceptionDef_ptr &);
-  CORBA_ExceptionDef_out (CORBA_ExceptionDef_var &);
-  CORBA_ExceptionDef_out (const CORBA_ExceptionDef_out &);
-  CORBA_ExceptionDef_out &operator= (const CORBA_ExceptionDef_out &);
-  CORBA_ExceptionDef_out &operator= (const CORBA_ExceptionDef_var &);
-  CORBA_ExceptionDef_out &operator= (CORBA_ExceptionDef_ptr);
-  operator CORBA_ExceptionDef_ptr &();
-  CORBA_ExceptionDef_ptr &ptr (void);
-  CORBA_ExceptionDef_ptr operator-> (void);
+                          class TAO_IFR_Client_Export CORBA_ExceptionDef_out
+                          {
+                          public:
+                            CORBA_ExceptionDef_out (CORBA_ExceptionDef_ptr &);
+                            CORBA_ExceptionDef_out (CORBA_ExceptionDef_var &);
+                            CORBA_ExceptionDef_out (const CORBA_ExceptionDef_out &);
+                            CORBA_ExceptionDef_out &operator= (const CORBA_ExceptionDef_out &);
+                            CORBA_ExceptionDef_out &operator= (const CORBA_ExceptionDef_var &);
+                            CORBA_ExceptionDef_out &operator= (CORBA_ExceptionDef_ptr);
+                            operator CORBA_ExceptionDef_ptr &();
+                            CORBA_ExceptionDef_ptr &ptr (void);
+                            CORBA_ExceptionDef_ptr operator-> (void);
 
-private:
-  CORBA_ExceptionDef_ptr &ptr_;
-};
+                          private:
+                            CORBA_ExceptionDef_ptr &ptr_;
+                          };
 
 
 #endif /* end #if !defined */
@@ -4730,408 +4810,429 @@ private:
 #if !defined (_CORBA_EXCEPTIONDEF_CH_)
 #define _CORBA_EXCEPTIONDEF_CH_
 
-// Forward Classes Declaration
-class _TAO_CORBA_ExceptionDef_Proxy_Impl;
-class _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl;
-class _TAO_CORBA_ExceptionDef_Proxy_Broker;
-class _TAO_CORBA_ExceptionDef_Remote_Proxy_Broker;
-
-class TAO_IFR_Client_Export CORBA_ExceptionDef: public virtual CORBA_Contained, public virtual CORBA_Container
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_ExceptionDef_ptr _ptr_type;
-  typedef CORBA_ExceptionDef_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static CORBA_ExceptionDef_ptr _duplicate (CORBA_ExceptionDef_ptr obj);
-  static CORBA_ExceptionDef_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_ExceptionDef_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_ExceptionDef_ptr _nil (void)
-    {
-      return (CORBA_ExceptionDef_ptr)0;
-    }
-
-  static void _tao_any_destructor (void*);
-
-  virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_StructMemberSeq * members (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void members (
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
-
-private:
-  _TAO_CORBA_ExceptionDef_Proxy_Broker *the_TAO_CORBA_ExceptionDef_Proxy_Broker_;
-  
-protected:
-  CORBA_ExceptionDef (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void CORBA_ExceptionDef_setup_collocation (int collocated);
-    
-    CORBA_ExceptionDef (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl;
-    friend class _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_CORBA_ExceptionDef_Direct_Proxy_Impl;
-  
-  virtual ~CORBA_ExceptionDef (void);
-private:
-  CORBA_ExceptionDef (const CORBA_ExceptionDef &);
-  void operator= (const CORBA_ExceptionDef &);
-};
-
-
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_ExceptionDef_Proxy_Impl : 
-  public virtual _TAO_CORBA_Contained_Proxy_Impl, 
-  public virtual _TAO_CORBA_Container_Proxy_Impl
-{
-public:
-  virtual ~_TAO_CORBA_ExceptionDef_Proxy_Impl (void) { }
-  
-    virtual CORBA::TypeCode_ptr type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_StructMemberSeq * members (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void members (
-      CORBA_Object *_collocated_tao_target_,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-protected:
-  _TAO_CORBA_ExceptionDef_Proxy_Impl (void);
-
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl : 
-  public virtual _TAO_CORBA_ExceptionDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl, 
-  public virtual _TAO_CORBA_Container_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_CORBA_ExceptionDef_Remote_Proxy_Impl (void) { }
-  
-    virtual CORBA::TypeCode_ptr type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_StructMemberSeq * members (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void members (
-      CORBA_Object *_collocated_tao_target_,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-};
-
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
-
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_ExceptionDef_Proxy_Broker
-{
-public:
-  virtual ~_TAO_CORBA_ExceptionDef_Proxy_Broker (void);
-  virtual _TAO_CORBA_ExceptionDef_Proxy_Impl &select_proxy (
-    CORBA_ExceptionDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
-
-protected:
-  _TAO_CORBA_ExceptionDef_Proxy_Broker (void);
-  
-};
-
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_ExceptionDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_ExceptionDef_Proxy_Broker
-{
-public: 
-  _TAO_CORBA_ExceptionDef_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_CORBA_ExceptionDef_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_CORBA_ExceptionDef_Proxy_Impl &select_proxy (
-    CORBA_ExceptionDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
-
-private:
-  _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
-
-public:
-  static _TAO_CORBA_ExceptionDef_Remote_Proxy_Broker *the_TAO_CORBA_ExceptionDef_Remote_Proxy_Broker (void);
-};
-
-
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+                          // Forward Classes Declaration
+                          class _TAO_CORBA_ExceptionDef_Proxy_Impl;
+                          class _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl;
+                          class _TAO_CORBA_ExceptionDef_Proxy_Broker;
+                          class _TAO_CORBA_ExceptionDef_Remote_Proxy_Broker;
+
+                          class TAO_IFR_Client_Export CORBA_ExceptionDef
+                            : public virtual CORBA_Contained,
+                              public virtual CORBA_Container
+                          {
+                          public:
+                          #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+                            typedef CORBA_ExceptionDef_ptr _ptr_type;
+                            typedef CORBA_ExceptionDef_var _var_type;
+                          #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+                            // the static operations
+                            static CORBA_ExceptionDef_ptr _duplicate (CORBA_ExceptionDef_ptr obj);
+
+                            static CORBA_ExceptionDef_ptr _narrow (
+                                CORBA::Object_ptr obj,
+                                CORBA::Environment &ACE_TRY_ENV =
+                                  TAO_default_environment ()
+                              );
+
+                            static CORBA_ExceptionDef_ptr _unchecked_narrow (
+                                CORBA::Object_ptr obj,
+                                CORBA::Environment &ACE_TRY_ENV =
+                                  TAO_default_environment ()
+                              );
+
+                            static CORBA_ExceptionDef_ptr _nil (void)
+                              {
+                                return (CORBA_ExceptionDef_ptr)0;
+                              }
+
+                            static void _tao_any_destructor (void*);
+
+                            virtual CORBA::TypeCode_ptr type (
+                                CORBA::Environment &ACE_TRY_ENV =
+                                  TAO_default_environment ()
+                              )
+                              ACE_THROW_SPEC ((
+                                CORBA::SystemException
+                              ));
+
+                            virtual CORBA_StructMemberSeq * members (
+                                CORBA::Environment &ACE_TRY_ENV =
+                                  TAO_default_environment ()
+                              )
+                              ACE_THROW_SPEC ((
+                                CORBA::SystemException
+                              ));
+
+                            virtual void members (
+                                const CORBA_StructMemberSeq & members,
+                                CORBA::Environment &ACE_TRY_ENV =
+                                  TAO_default_environment ()
+                              )
+                              ACE_THROW_SPEC ((
+                                CORBA::SystemException
+                              ));
+
+                            virtual CORBA::Boolean _is_a (
+                                const CORBA::Char *type_id,
+                                CORBA::Environment &ACE_TRY_ENV =
+                                  TAO_default_environment ()
+                              );
+
+                            virtual void *_tao_QueryInterface (ptr_arith_t type);
+
+                            virtual const char* _interface_repository_id (void) const;
+
+                          private:
+                            _TAO_CORBA_ExceptionDef_Proxy_Broker *the_TAO_CORBA_ExceptionDef_Proxy_Broker_;
+
+                          protected:
+                            CORBA_ExceptionDef (int collocated = 0);
+
+                            // This methods travese the inheritance tree and set the
+                            // parents piece of the given class in the right mode
+                            virtual void CORBA_ExceptionDef_setup_collocation (int collocated);
+
+                            CORBA_ExceptionDef (
+                                TAO_Stub *objref,
+                                CORBA::Boolean _tao_collocated = 0,
+                                TAO_Abstract_ServantBase *servant = 0
+                              );
+
+                            friend class _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl;
+                            friend class _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl;
+                            friend class _TAO_CORBA_ExceptionDef_Direct_Proxy_Impl;
+
+                            virtual ~CORBA_ExceptionDef (void);
+
+                          private:
+                            CORBA_ExceptionDef (const CORBA_ExceptionDef &);
+                            void operator= (const CORBA_ExceptionDef &);
+                          };
+
+                          // The Proxy Implementations are used by each interface to
+                          // perform a call. Each different implementation encapsulate
+                          // an invocation logics.
+
+
+                          ///////////////////////////////////////////////////////////////////////
+                          //                    Base Proxy Impl. Declaration
+                          //
+
+                          class TAO_IFR_Client_Export _TAO_CORBA_ExceptionDef_Proxy_Impl
+                            : public virtual _TAO_CORBA_Contained_Proxy_Impl,
+                              public virtual _TAO_CORBA_Container_Proxy_Impl
+                          {
+                          public:
+                            virtual ~_TAO_CORBA_ExceptionDef_Proxy_Impl (void) { }
+                            virtual CORBA::TypeCode_ptr type (
+                                CORBA_Object *_collocated_tao_target_,
+                                CORBA::Environment &ACE_TRY_ENV
+                              )
+                              ACE_THROW_SPEC ((
+                                CORBA::SystemException
+                              )) = 0;
+
+                            virtual CORBA_StructMemberSeq * members (
+                                CORBA_Object *_collocated_tao_target_,
+                                CORBA::Environment &ACE_TRY_ENV
+                              )
+                              ACE_THROW_SPEC ((
+                                CORBA::SystemException
+                              )) = 0;
+
+                            virtual void members (
+                                CORBA_Object *_collocated_tao_target_,
+                                const CORBA_StructMemberSeq & members,
+                                CORBA::Environment &ACE_TRY_ENV
+                              )
+                              ACE_THROW_SPEC ((
+                                CORBA::SystemException
+                              )) = 0;
+
+
+                          protected:
+                            _TAO_CORBA_ExceptionDef_Proxy_Impl (void);
+                          };
+
+                          //
+                          //               End Base Proxy Impl. Declaration
+                          ///////////////////////////////////////////////////////////////////////
+
+
+                          ///////////////////////////////////////////////////////////////////////
+                          //                Remote Proxy Impl. Declaration
+                          //
+
+                          class TAO_IFR_Client_Export _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl
+                            : public virtual _TAO_CORBA_ExceptionDef_Proxy_Impl,
+                              public virtual TAO_Remote_Object_Proxy_Impl,
+                              public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl,
+                              public virtual _TAO_CORBA_Container_Remote_Proxy_Impl
+                          {
+                          public:
+                            _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl (void);
+
+                            virtual ~_TAO_CORBA_ExceptionDef_Remote_Proxy_Impl (void) { }
+                            virtual CORBA::TypeCode_ptr type (
+                                CORBA_Object *_collocated_tao_target_,
+                                CORBA::Environment &ACE_TRY_ENV
+                              )
+                              ACE_THROW_SPEC ((
+                                CORBA::SystemException
+                              ));
+
+                            virtual CORBA_StructMemberSeq * members (
+                                CORBA_Object *_collocated_tao_target_,
+                                CORBA::Environment &ACE_TRY_ENV
+                              )
+                              ACE_THROW_SPEC ((
+                                CORBA::SystemException
+                              ));
+
+                            virtual void members (
+                                CORBA_Object *_collocated_tao_target_,
+                                const CORBA_StructMemberSeq & members,
+                                CORBA::Environment &ACE_TRY_ENV
+                              )
+                              ACE_THROW_SPEC ((
+                                CORBA::SystemException
+                              ));
+
+
+                          };
+
+                          //
+                          //             End Remote Proxy Impl. Declaration
+                          ///////////////////////////////////////////////////////////////////////
+
+                          // The Proxy Brokers are used by each interface to get
+                          // the right proxy for performing a call. In the new
+                          // collocation scheme, the proxy to be used can vary on
+                          // a call by call basis.
+
+
+                          ///////////////////////////////////////////////////////////////////////
+                          //                 Base Proxy Broker Declaration
+                          //
+
+                                                    class TAO_IFR_Client_Export _TAO_CORBA_ExceptionDef_Proxy_Broker
+                          {
+                          public:
+                            virtual ~_TAO_CORBA_ExceptionDef_Proxy_Broker (void);
+                            virtual _TAO_CORBA_ExceptionDef_Proxy_Impl &select_proxy (
+                                CORBA_ExceptionDef *object,
+                                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                              ) = 0;
+
+                          protected:
+                            _TAO_CORBA_ExceptionDef_Proxy_Broker (void);
+
+                          };
+
+                          //
+                          //              End Base Proxy Broker Declaration
+                          ///////////////////////////////////////////////////////////////////////
+
+
+                          ///////////////////////////////////////////////////////////////////////
+                          //                 Remote Proxy Broker Declaration
+                          //
+
+                          class TAO_IFR_Client_Export _TAO_CORBA_ExceptionDef_Remote_Proxy_Broker
+                            : public virtual _TAO_CORBA_ExceptionDef_Proxy_Broker
+                          {
+                          public:
+                            _TAO_CORBA_ExceptionDef_Remote_Proxy_Broker (void);
+
+                            virtual ~_TAO_CORBA_ExceptionDef_Remote_Proxy_Broker (void);
+
+                            virtual _TAO_CORBA_ExceptionDef_Proxy_Impl &select_proxy (
+                                CORBA_ExceptionDef *object,
+                                CORBA_Environment &ACE_TRY_ENV
+                              );
+
+                            private:
+                              _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl remote_proxy_impl_;
+
+                            public:
+                              // This member function is used to get an handle to the unique instance
+                              // of the Remote Proxy Broker that is available for a given
+                              // interface.
+                              static _TAO_CORBA_ExceptionDef_Remote_Proxy_Broker *the_TAO_CORBA_ExceptionDef_Remote_Proxy_Broker (void);
+                            };
+
+                            //
+                            //              End Remote Proxy Broker Declaration
+                            ///////////////////////////////////////////////////////////////////////
 
 
 #endif /* end #if !defined */
 
-struct CORBA_ExceptionDescription;
-class CORBA_ExceptionDescription_var;
 
-struct TAO_IFR_Client_Export CORBA_ExceptionDescription
-{
+                            struct CORBA_ExceptionDescription;
+                            class CORBA_ExceptionDescription_var;
+
+                            struct TAO_IFR_Client_Export CORBA_ExceptionDescription
+                            {
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_ExceptionDescription_var _var_type;
+                              typedef CORBA_ExceptionDescription_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-  static void _tao_any_destructor (void*);
+                              static void _tao_any_destructor (void*);
+
+                              TAO_String_Manager name;
+                              TAO_String_Manager id;
+                              TAO_String_Manager defined_in;
+                              TAO_String_Manager version;
+                              CORBA::TypeCode_var type;
+
+                            };
+
+                            class TAO_IFR_Client_Export CORBA_ExceptionDescription_var
+                            {
+                            public:
+                              CORBA_ExceptionDescription_var (void);
+                              CORBA_ExceptionDescription_var (CORBA_ExceptionDescription *);
+                              CORBA_ExceptionDescription_var (const CORBA_ExceptionDescription_var &);
+                              ~CORBA_ExceptionDescription_var (void);
+
+                              CORBA_ExceptionDescription_var &operator= (CORBA_ExceptionDescription *);
+                              CORBA_ExceptionDescription_var &operator= (const CORBA_ExceptionDescription_var &);
+                              CORBA_ExceptionDescription *operator-> (void);
+                              const CORBA_ExceptionDescription *operator-> (void) const;
+
+                              operator const CORBA_ExceptionDescription &() const;
+                              operator CORBA_ExceptionDescription &();
+                              operator CORBA_ExceptionDescription &() const;
+                              // Variable-size types only.
+                              operator CORBA_ExceptionDescription *&();
+
+                              // in, inout, out, _retn
+                              const CORBA_ExceptionDescription &in (void) const;
+                              CORBA_ExceptionDescription &inout (void);
+                              CORBA_ExceptionDescription *&out (void);
+                              CORBA_ExceptionDescription *_retn (void);
+                              CORBA_ExceptionDescription *ptr (void) const;
+
+                            private:
+                              CORBA_ExceptionDescription *ptr_;
+                            };
+
+                            class TAO_IFR_Client_Export CORBA_ExceptionDescription_out
+                            {
+                            public:
+                              CORBA_ExceptionDescription_out (CORBA_ExceptionDescription *&);
+                              CORBA_ExceptionDescription_out (CORBA_ExceptionDescription_var &);
+                              CORBA_ExceptionDescription_out (const CORBA_ExceptionDescription_out &);
+                              CORBA_ExceptionDescription_out &operator= (const CORBA_ExceptionDescription_out &);
+                              CORBA_ExceptionDescription_out &operator= (CORBA_ExceptionDescription *);
+                              operator CORBA_ExceptionDescription *&();
+                              CORBA_ExceptionDescription *&ptr (void);
+                              CORBA_ExceptionDescription *operator-> (void);
+
+                            private:
+                              CORBA_ExceptionDescription *&ptr_;
+                              // Assignment from T_var not allowed.
+                              void operator= (const CORBA_ExceptionDescription_var &);
+                            };
 
-  TAO_String_Manager name;
-  TAO_String_Manager id;
-  TAO_String_Manager defined_in;
-  TAO_String_Manager version;
-  CORBA::TypeCode_var type;
-};
-
-class TAO_IFR_Client_Export CORBA_ExceptionDescription_var
-{
-public:
-  CORBA_ExceptionDescription_var (void); // default constructor
-  CORBA_ExceptionDescription_var (CORBA_ExceptionDescription *);
-  CORBA_ExceptionDescription_var (const CORBA_ExceptionDescription_var &); // copy constructor
-  ~CORBA_ExceptionDescription_var (void); // destructor
-  
-  CORBA_ExceptionDescription_var &operator= (CORBA_ExceptionDescription *);
-  CORBA_ExceptionDescription_var &operator= (const CORBA_ExceptionDescription_var &);
-  CORBA_ExceptionDescription *operator-> (void);
-  const CORBA_ExceptionDescription *operator-> (void) const;
-  
-  operator const CORBA_ExceptionDescription &() const;
-  operator CORBA_ExceptionDescription &();
-  operator CORBA_ExceptionDescription &() const;
-  operator CORBA_ExceptionDescription *&(); // variable-size types only
-  
-  // in, inout, out, _retn 
-  const CORBA_ExceptionDescription &in (void) const;
-  CORBA_ExceptionDescription &inout (void);
-  CORBA_ExceptionDescription *&out (void);
-  CORBA_ExceptionDescription *_retn (void);
-  CORBA_ExceptionDescription *ptr (void) const;
-
-private:
-  CORBA_ExceptionDescription *ptr_;
-};
-
-class TAO_IFR_Client_Export CORBA_ExceptionDescription_out
-{
-public:
-  CORBA_ExceptionDescription_out (CORBA_ExceptionDescription *&);
-  CORBA_ExceptionDescription_out (CORBA_ExceptionDescription_var &);
-  CORBA_ExceptionDescription_out (const CORBA_ExceptionDescription_out &);
-  CORBA_ExceptionDescription_out &operator= (const CORBA_ExceptionDescription_out &);
-  CORBA_ExceptionDescription_out &operator= (CORBA_ExceptionDescription *);
-  operator CORBA_ExceptionDescription *&();
-  CORBA_ExceptionDescription *&ptr (void);
-  CORBA_ExceptionDescription *operator-> (void);
-  
-private:
-  CORBA_ExceptionDescription *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_ExceptionDescription_var &);
-};
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXCEPTIONDEFSEQ_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXCEPTIONDEFSEQ_CH_
 
-  class _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    // = Initialization and termination methods.
-    
-    _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq (CORBA::ULong maximum,
-      CORBA::ULong length,
-      CORBA_ExceptionDef* *value,
-      CORBA::Boolean release = 0);
-    _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq &rhs);
-    virtual ~_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq &rhs);
-    TAO_Object_Manager<CORBA_ExceptionDef,CORBA_ExceptionDef_var> operator[] (CORBA::ULong index) const;
-    static CORBA_ExceptionDef **allocbuf (CORBA::ULong nelems);
-    static void freebuf (CORBA_ExceptionDef **buffer);
-    // The Base_Sequence functions, please see tao/Sequence.h
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    CORBA_ExceptionDef* *get_buffer (CORBA::Boolean orphan = 0);
-    const CORBA_ExceptionDef* *get_buffer (void) const;
-    virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-    virtual void _downcast (
-        void* target,
-        CORBA_Object *src,
-        CORBA_Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    virtual CORBA_Object* _upcast (void *src) const;
-    
-  };
+                            class _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq
+                              : public TAO_Unbounded_Base_Sequence
+                            {
+                            public:
+                              // = Initialization and termination methods.
+                              _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq (void);
+                              _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq (CORBA::ULong maximum);
+                              _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq (
+                                  CORBA::ULong maximum,
+                                  CORBA::ULong length,
+                                  CORBA_ExceptionDef* *value,
+                                  CORBA::Boolean release = 0
+                                );
+                              _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq (
+                                  const _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq &rhs
+                                );
+                              _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq &operator= (
+                                  const _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq &rhs
+                                );
+                              virtual ~_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq (void);
+
+                              // = Accessors.
+                              TAO_Object_Manager<CORBA_ExceptionDef,CORBA_ExceptionDef_var> operator[] (CORBA::ULong index) const;
+
+                              // = Static operations.
+                              static CORBA_ExceptionDef **allocbuf (CORBA::ULong nelems);
+                              static void freebuf (CORBA_ExceptionDef **buffer);
+
+                              // Implement the TAO_Base_Sequence methods (see Sequence.h)
+                              virtual void _allocate_buffer (CORBA::ULong length);
+                              virtual void _deallocate_buffer (void);
+                              CORBA_ExceptionDef* *get_buffer (CORBA::Boolean orphan = 0);
+                              const CORBA_ExceptionDef* *get_buffer (void) const;
+                              virtual void _shrink_buffer (
+                                  CORBA::ULong nl,
+                                  CORBA::ULong ol
+                                );
+
+                              virtual void _downcast (
+                                  void* target,
+                                  CORBA_Object *src,
+                                  CORBA_Environment &ACE_TRY_ENV =
+                                    TAO_default_environment ()
+                                );
+                              virtual CORBA_Object* _upcast (void *src) const;
+                            };
 
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ_CH_)
 #define _CORBA_EXCEPTIONDEFSEQ_CH_
 
-class CORBA_ExceptionDefSeq;
-class CORBA_ExceptionDefSeq_var;
+                            class CORBA_ExceptionDefSeq;
+                            class CORBA_ExceptionDefSeq_var;
 
-// *************************************************************
-// CORBA_ExceptionDefSeq
-// *************************************************************
+                            // *************************************************************
+                            // CORBA_ExceptionDefSeq
+                            // *************************************************************
 
-class TAO_IFR_Client_Export CORBA_ExceptionDefSeq : public 
+                            class TAO_IFR_Client_Export CORBA_ExceptionDefSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq
+                            _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA_ExceptionDef,CORBA_ExceptionDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-{
-public:
-  CORBA_ExceptionDefSeq (void); // default ctor
-  CORBA_ExceptionDefSeq (CORBA::ULong max); // uses max size
-  CORBA_ExceptionDefSeq (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    CORBA_ExceptionDef_ptr *buffer, 
-    CORBA::Boolean release = 0
-  );
-  CORBA_ExceptionDefSeq (const CORBA_ExceptionDefSeq &); // copy ctor
-  ~CORBA_ExceptionDefSeq (void);
-  static void _tao_any_destructor (void*);
+                            TAO_Unbounded_Object_Sequence<CORBA_ExceptionDef,CORBA_ExceptionDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+                            {
+                            public:
+                              CORBA_ExceptionDefSeq (void); // default ctor
+                              CORBA_ExceptionDefSeq (CORBA::ULong max); // uses max size
+                              CORBA_ExceptionDefSeq (
+                                  CORBA::ULong max,
+                                  CORBA::ULong length,
+                                  CORBA_ExceptionDef_ptr *buffer,
+                                  CORBA::Boolean release = 0
+                                );
+                              CORBA_ExceptionDefSeq (const CORBA_ExceptionDefSeq &); // copy ctor
+                              ~CORBA_ExceptionDefSeq (void);
+                              static void _tao_any_destructor (void*);
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_ExceptionDefSeq_var _var_type;
+                              typedef CORBA_ExceptionDefSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-};
+
+                            };
 
 #endif /* end #if !defined */
 
@@ -5139,40 +5240,40 @@ public:
 #if !defined (_CORBA_EXCEPTIONDEFSEQ___VAR_CH_)
 #define _CORBA_EXCEPTIONDEFSEQ___VAR_CH_
 
-// *************************************************************
-// class CORBA_ExceptionDefSeq_var
-// *************************************************************
+                            // *************************************************************
+                            // class CORBA_ExceptionDefSeq_var
+                            // *************************************************************
 
-class TAO_IFR_Client_Export CORBA_ExceptionDefSeq_var
-{
-public:
-  CORBA_ExceptionDefSeq_var (void); // default constructor
-  CORBA_ExceptionDefSeq_var (CORBA_ExceptionDefSeq *);
-  CORBA_ExceptionDefSeq_var (const CORBA_ExceptionDefSeq_var &); // copy constructor
-  ~CORBA_ExceptionDefSeq_var (void); // destructor
-  
-  CORBA_ExceptionDefSeq_var &operator= (CORBA_ExceptionDefSeq *);
-  CORBA_ExceptionDefSeq_var &operator= (const CORBA_ExceptionDefSeq_var &);
-  CORBA_ExceptionDefSeq *operator-> (void);
-  const CORBA_ExceptionDefSeq *operator-> (void) const;
-  
-  operator const CORBA_ExceptionDefSeq &() const;
-  operator CORBA_ExceptionDefSeq &();
-  operator CORBA_ExceptionDefSeq &() const;
-  operator CORBA_ExceptionDefSeq *&(); // variable-size base types only
-  
-  TAO_Object_Manager<CORBA_ExceptionDef, CORBA_ExceptionDef_var> operator[] (CORBA::ULong index);
-  
-  // in, inout, out, _retn 
-  const CORBA_ExceptionDefSeq &in (void) const;
-  CORBA_ExceptionDefSeq &inout (void);
-  CORBA_ExceptionDefSeq *&out (void);
-  CORBA_ExceptionDefSeq *_retn (void);
-  CORBA_ExceptionDefSeq *ptr (void) const;
+                            class TAO_IFR_Client_Export CORBA_ExceptionDefSeq_var
+                            {
+                            public:
+                              CORBA_ExceptionDefSeq_var (void);
+                              CORBA_ExceptionDefSeq_var (CORBA_ExceptionDefSeq *);
+                              CORBA_ExceptionDefSeq_var (const CORBA_ExceptionDefSeq_var &);
+                              ~CORBA_ExceptionDefSeq_var (void);
 
-private:
-  CORBA_ExceptionDefSeq *ptr_;
-};
+                              CORBA_ExceptionDefSeq_var &operator= (CORBA_ExceptionDefSeq *);
+                              CORBA_ExceptionDefSeq_var &operator= (const CORBA_ExceptionDefSeq_var &);
+                              CORBA_ExceptionDefSeq *operator-> (void);
+                              const CORBA_ExceptionDefSeq *operator-> (void) const;
+
+                              operator const CORBA_ExceptionDefSeq &() const;
+                              operator CORBA_ExceptionDefSeq &();
+                              operator CORBA_ExceptionDefSeq &() const;
+                              operator CORBA_ExceptionDefSeq *&(); // variable-size base types only
+
+                              TAO_Object_Manager<CORBA_ExceptionDef, CORBA_ExceptionDef_var> operator[] (CORBA::ULong index);
+
+                              // in, inout, out, _retn
+                              const CORBA_ExceptionDefSeq &in (void) const;
+                              CORBA_ExceptionDefSeq &inout (void);
+                              CORBA_ExceptionDefSeq *&out (void);
+                              CORBA_ExceptionDefSeq *_retn (void);
+                              CORBA_ExceptionDefSeq *ptr (void) const;
+
+                            private:
+                              CORBA_ExceptionDefSeq *ptr_;
+                            };
 
 
 #endif /* end #if !defined */
@@ -5181,106 +5282,118 @@ private:
 #if !defined (_CORBA_EXCEPTIONDEFSEQ___OUT_CH_)
 #define _CORBA_EXCEPTIONDEFSEQ___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_ExceptionDefSeq_out
-{
-public:
-  CORBA_ExceptionDefSeq_out (CORBA_ExceptionDefSeq *&);
-  CORBA_ExceptionDefSeq_out (CORBA_ExceptionDefSeq_var &);
-  CORBA_ExceptionDefSeq_out (const CORBA_ExceptionDefSeq_out &);
-  CORBA_ExceptionDefSeq_out &operator= (const CORBA_ExceptionDefSeq_out &);
-  CORBA_ExceptionDefSeq_out &operator= (CORBA_ExceptionDefSeq *);
-  operator CORBA_ExceptionDefSeq *&();
-  CORBA_ExceptionDefSeq *&ptr (void);
-  CORBA_ExceptionDefSeq *operator-> (void);
-  TAO_Object_Manager<CORBA_ExceptionDef, CORBA_ExceptionDef_var> operator[] (CORBA::ULong index);
-  
-private:
-  CORBA_ExceptionDefSeq *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_ExceptionDefSeq_var &);
-};
+                            class TAO_IFR_Client_Export CORBA_ExceptionDefSeq_out
+                            {
+                            public:
+                              CORBA_ExceptionDefSeq_out (CORBA_ExceptionDefSeq *&);
+                              CORBA_ExceptionDefSeq_out (CORBA_ExceptionDefSeq_var &);
+                              CORBA_ExceptionDefSeq_out (const CORBA_ExceptionDefSeq_out &);
+                              CORBA_ExceptionDefSeq_out &operator= (const CORBA_ExceptionDefSeq_out &);
+                              CORBA_ExceptionDefSeq_out &operator= (CORBA_ExceptionDefSeq *);
+                              operator CORBA_ExceptionDefSeq *&();
+                              CORBA_ExceptionDefSeq *&ptr (void);
+                              CORBA_ExceptionDefSeq *operator-> (void);
+                              TAO_Object_Manager<CORBA_ExceptionDef, CORBA_ExceptionDef_var> operator[] (CORBA::ULong index);
+
+                            private:
+                              CORBA_ExceptionDefSeq *&ptr_;
+                              // Assignment from T_var not allowed.
+                              void operator= (const CORBA_ExceptionDefSeq_var &);
+                            };
 
 
 #endif /* end #if !defined */
 
 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_EXCDESCRIPTIONSEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_EXCDESCRIPTIONSEQ_CH_
 
-  class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    // = Initialization and termination methods.
-    
-    _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (void); // Default constructor.
-    _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (CORBA::ULong maximum,
-      CORBA::ULong length,
-      CORBA_ExceptionDescription *data,
-      CORBA::Boolean release = 0);
-    _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (const _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq &rhs);
-    _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq &operator= (const _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq &rhs);
-    virtual ~_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (void); // Dtor.
-    // = Accessors.
-    CORBA_ExceptionDescription &operator[] (CORBA::ULong i);
-    const CORBA_ExceptionDescription &operator[] (CORBA::ULong i) const;
-    // = Static operations.
-    static CORBA_ExceptionDescription *allocbuf (CORBA::ULong size);
-    static void freebuf (CORBA_ExceptionDescription *buffer);
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    
-    CORBA_ExceptionDescription *get_buffer (CORBA::Boolean orphan = 0);
-    const CORBA_ExceptionDescription *get_buffer (void) const;
-    void replace (CORBA::ULong max,
-      CORBA::ULong length,
-      CORBA_ExceptionDescription *data,
-      CORBA::Boolean release);
-  };
+                            class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq
+                              : public TAO_Unbounded_Base_Sequence
+                            {
+                            public:
+                              // = Initialization and termination methods.
+                              _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (void);
+                              _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (CORBA::ULong maximum);
+                              _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (
+                                  CORBA::ULong maximum,
+                                  CORBA::ULong length,
+                                  CORBA_ExceptionDescription *data,
+                                  CORBA::Boolean release = 0
+                                );
+                              _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (
+                                  const _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq &rhs
+                                );
+                              _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq &operator= (
+                                  const _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq &rhs
+                                );
+                              virtual ~_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (void);
+
+                              // = Accessors.
+                              CORBA_ExceptionDescription &operator[] (CORBA::ULong i);
+                              const CORBA_ExceptionDescription &operator[] (CORBA::ULong i) const;
+
+                              // = Static operations.
+                              static CORBA_ExceptionDescription *allocbuf (CORBA::ULong size);
+                              static void freebuf (CORBA_ExceptionDescription *buffer);
+
+                              // Implement the TAO_Base_Sequence methods (see Sequence.h)
+                              virtual void _allocate_buffer (CORBA::ULong length);
+                              virtual void _deallocate_buffer (void);
+                              CORBA_ExceptionDescription *get_buffer (CORBA::Boolean orphan = 0);
+                              const CORBA_ExceptionDescription *get_buffer (void) const;
+                              void replace (
+                                  CORBA::ULong max,
+                                  CORBA::ULong length,
+                                  CORBA_ExceptionDescription *data,
+                                  CORBA::Boolean release
+                                );
+                            };
 
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_EXCDESCRIPTIONSEQ_CH_)
 #define _CORBA_EXCDESCRIPTIONSEQ_CH_
 
-class CORBA_ExcDescriptionSeq;
-class CORBA_ExcDescriptionSeq_var;
+                            class CORBA_ExcDescriptionSeq;
+                            class CORBA_ExcDescriptionSeq_var;
 
-// *************************************************************
-// CORBA_ExcDescriptionSeq
-// *************************************************************
+                            // *************************************************************
+                            // CORBA_ExcDescriptionSeq
+                            // *************************************************************
 
-class TAO_IFR_Client_Export CORBA_ExcDescriptionSeq : public 
+                            class TAO_IFR_Client_Export CORBA_ExcDescriptionSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq
+                            _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_ExceptionDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-{
-public:
-  CORBA_ExcDescriptionSeq (void); // default ctor
-  CORBA_ExcDescriptionSeq (CORBA::ULong max); // uses max size
-  CORBA_ExcDescriptionSeq (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    CORBA_ExceptionDescription *buffer, 
-    CORBA::Boolean release = 0
-  );
-  CORBA_ExcDescriptionSeq (const CORBA_ExcDescriptionSeq &); // copy ctor
-  ~CORBA_ExcDescriptionSeq (void);
-  static void _tao_any_destructor (void*);
+                            TAO_Unbounded_Sequence<CORBA_ExceptionDescription>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+                            {
+                            public:
+                              CORBA_ExcDescriptionSeq (void); // default ctor
+                              CORBA_ExcDescriptionSeq (CORBA::ULong max); // uses max size
+                              CORBA_ExcDescriptionSeq (
+                                  CORBA::ULong max,
+                                  CORBA::ULong length,
+                                  CORBA_ExceptionDescription *buffer,
+                                  CORBA::Boolean release = 0
+                                );
+                              CORBA_ExcDescriptionSeq (const CORBA_ExcDescriptionSeq &); // copy ctor
+                              ~CORBA_ExcDescriptionSeq (void);
+                              static void _tao_any_destructor (void*);
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_ExcDescriptionSeq_var _var_type;
+                              typedef CORBA_ExcDescriptionSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-};
+
+                            };
 
 #endif /* end #if !defined */
 
@@ -5288,41 +5401,41 @@ public:
 #if !defined (_CORBA_EXCDESCRIPTIONSEQ___VAR_CH_)
 #define _CORBA_EXCDESCRIPTIONSEQ___VAR_CH_
 
-// *************************************************************
-// class CORBA_ExcDescriptionSeq_var
-// *************************************************************
+                            // *************************************************************
+                            // class CORBA_ExcDescriptionSeq_var
+                            // *************************************************************
 
-class TAO_IFR_Client_Export CORBA_ExcDescriptionSeq_var
-{
-public:
-  CORBA_ExcDescriptionSeq_var (void); // default constructor
-  CORBA_ExcDescriptionSeq_var (CORBA_ExcDescriptionSeq *);
-  CORBA_ExcDescriptionSeq_var (const CORBA_ExcDescriptionSeq_var &); // copy constructor
-  ~CORBA_ExcDescriptionSeq_var (void); // destructor
-  
-  CORBA_ExcDescriptionSeq_var &operator= (CORBA_ExcDescriptionSeq *);
-  CORBA_ExcDescriptionSeq_var &operator= (const CORBA_ExcDescriptionSeq_var &);
-  CORBA_ExcDescriptionSeq *operator-> (void);
-  const CORBA_ExcDescriptionSeq *operator-> (void) const;
-  
-  operator const CORBA_ExcDescriptionSeq &() const;
-  operator CORBA_ExcDescriptionSeq &();
-  operator CORBA_ExcDescriptionSeq &() const;
-  operator CORBA_ExcDescriptionSeq *&(); // variable-size base types only
-  
-  CORBA_ExceptionDescription & operator[] (CORBA::ULong index);
-  const CORBA_ExceptionDescription & operator[] (CORBA::ULong index) const;
-  
-  // in, inout, out, _retn 
-  const CORBA_ExcDescriptionSeq &in (void) const;
-  CORBA_ExcDescriptionSeq &inout (void);
-  CORBA_ExcDescriptionSeq *&out (void);
-  CORBA_ExcDescriptionSeq *_retn (void);
-  CORBA_ExcDescriptionSeq *ptr (void) const;
+                            class TAO_IFR_Client_Export CORBA_ExcDescriptionSeq_var
+                            {
+                            public:
+                              CORBA_ExcDescriptionSeq_var (void);
+                              CORBA_ExcDescriptionSeq_var (CORBA_ExcDescriptionSeq *);
+                              CORBA_ExcDescriptionSeq_var (const CORBA_ExcDescriptionSeq_var &);
+                              ~CORBA_ExcDescriptionSeq_var (void);
 
-private:
-  CORBA_ExcDescriptionSeq *ptr_;
-};
+                              CORBA_ExcDescriptionSeq_var &operator= (CORBA_ExcDescriptionSeq *);
+                              CORBA_ExcDescriptionSeq_var &operator= (const CORBA_ExcDescriptionSeq_var &);
+                              CORBA_ExcDescriptionSeq *operator-> (void);
+                              const CORBA_ExcDescriptionSeq *operator-> (void) const;
+
+                              operator const CORBA_ExcDescriptionSeq &() const;
+                              operator CORBA_ExcDescriptionSeq &();
+                              operator CORBA_ExcDescriptionSeq &() const;
+                              operator CORBA_ExcDescriptionSeq *&(); // variable-size base types only
+
+                              CORBA_ExceptionDescription & operator[] (CORBA::ULong index);
+                              const CORBA_ExceptionDescription & operator[] (CORBA::ULong index) const;
+
+                              // in, inout, out, _retn
+                              const CORBA_ExcDescriptionSeq &in (void) const;
+                              CORBA_ExcDescriptionSeq &inout (void);
+                              CORBA_ExcDescriptionSeq *&out (void);
+                              CORBA_ExcDescriptionSeq *_retn (void);
+                              CORBA_ExcDescriptionSeq *ptr (void) const;
+
+                            private:
+                              CORBA_ExcDescriptionSeq *ptr_;
+                            };
 
 
 #endif /* end #if !defined */
@@ -5331,34 +5444,35 @@ private:
 #if !defined (_CORBA_EXCDESCRIPTIONSEQ___OUT_CH_)
 #define _CORBA_EXCDESCRIPTIONSEQ___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_ExcDescriptionSeq_out
-{
-public:
-  CORBA_ExcDescriptionSeq_out (CORBA_ExcDescriptionSeq *&);
-  CORBA_ExcDescriptionSeq_out (CORBA_ExcDescriptionSeq_var &);
-  CORBA_ExcDescriptionSeq_out (const CORBA_ExcDescriptionSeq_out &);
-  CORBA_ExcDescriptionSeq_out &operator= (const CORBA_ExcDescriptionSeq_out &);
-  CORBA_ExcDescriptionSeq_out &operator= (CORBA_ExcDescriptionSeq *);
-  operator CORBA_ExcDescriptionSeq *&();
-  CORBA_ExcDescriptionSeq *&ptr (void);
-  CORBA_ExcDescriptionSeq *operator-> (void);
-  CORBA_ExceptionDescription & operator[] (CORBA::ULong index);
-  
-private:
-  CORBA_ExcDescriptionSeq *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_ExcDescriptionSeq_var &);
-};
+                            class TAO_IFR_Client_Export CORBA_ExcDescriptionSeq_out
+                            {
+                            public:
+                              CORBA_ExcDescriptionSeq_out (CORBA_ExcDescriptionSeq *&);
+                              CORBA_ExcDescriptionSeq_out (CORBA_ExcDescriptionSeq_var &);
+                              CORBA_ExcDescriptionSeq_out (const CORBA_ExcDescriptionSeq_out &);
+                              CORBA_ExcDescriptionSeq_out &operator= (const CORBA_ExcDescriptionSeq_out &);
+                              CORBA_ExcDescriptionSeq_out &operator= (CORBA_ExcDescriptionSeq *);
+                              operator CORBA_ExcDescriptionSeq *&();
+                              CORBA_ExcDescriptionSeq *&ptr (void);
+                              CORBA_ExcDescriptionSeq *operator-> (void);
+                              CORBA_ExceptionDescription & operator[] (CORBA::ULong index);
+
+                            private:
+                              CORBA_ExcDescriptionSeq *&ptr_;
+                              // Assignment from T_var not allowed.
+                              void operator= (const CORBA_ExcDescriptionSeq_var &);
+                            };
 
 
 #endif /* end #if !defined */
 
 
+
 #if !defined (_CORBA_ATTRIBUTEDEF___PTR_CH_)
 #define _CORBA_ATTRIBUTEDEF___PTR_CH_
 
-class CORBA_AttributeDef;
-typedef CORBA_AttributeDef *CORBA_AttributeDef_ptr;
+                            class CORBA_AttributeDef;
+                            typedef CORBA_AttributeDef *CORBA_AttributeDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -5366,41 +5480,44 @@ typedef CORBA_AttributeDef *CORBA_AttributeDef_ptr;
 #if !defined (_CORBA_ATTRIBUTEDEF___VAR_CH_)
 #define _CORBA_ATTRIBUTEDEF___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_AttributeDef_var : public TAO_Base_var
-{
-public:
-  CORBA_AttributeDef_var (void); // default constructor
-  CORBA_AttributeDef_var (CORBA_AttributeDef_ptr p) : ptr_ (p) {} 
-  CORBA_AttributeDef_var (const CORBA_AttributeDef_var &); // copy constructor
-  ~CORBA_AttributeDef_var (void); // destructor
-  
-  CORBA_AttributeDef_var &operator= (CORBA_AttributeDef_ptr);
-  CORBA_AttributeDef_var &operator= (const CORBA_AttributeDef_var &);
-  CORBA_AttributeDef_ptr operator-> (void) const;
-  
-  operator const CORBA_AttributeDef_ptr &() const;
-  operator CORBA_AttributeDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_AttributeDef_ptr in (void) const;
-  CORBA_AttributeDef_ptr &inout (void);
-  CORBA_AttributeDef_ptr &out (void);
-  CORBA_AttributeDef_ptr _retn (void);
-  CORBA_AttributeDef_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_AttributeDef_ptr duplicate (CORBA_AttributeDef_ptr);
-  static void release (CORBA_AttributeDef_ptr);
-  static CORBA_AttributeDef_ptr nil (void);
-  static CORBA_AttributeDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
-
-private:
-  CORBA_AttributeDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_AttributeDef_var (const TAO_Base_var &rhs);
-  CORBA_AttributeDef_var &operator= (const TAO_Base_var &rhs);
-};
+                            class TAO_IFR_Client_Export CORBA_AttributeDef_var : public TAO_Base_var
+                            {
+                            public:
+                              CORBA_AttributeDef_var (void); // default constructor
+                              CORBA_AttributeDef_var (CORBA_AttributeDef_ptr p) : ptr_ (p) {}
+                              CORBA_AttributeDef_var (const CORBA_AttributeDef_var &); // copy constructor
+                              ~CORBA_AttributeDef_var (void); // destructor
+
+                              CORBA_AttributeDef_var &operator= (CORBA_AttributeDef_ptr);
+                              CORBA_AttributeDef_var &operator= (const CORBA_AttributeDef_var &);
+                              CORBA_AttributeDef_ptr operator-> (void) const;
+
+                              operator const CORBA_AttributeDef_ptr &() const;
+                              operator CORBA_AttributeDef_ptr &();
+                              // in, inout, out, _retn
+                              CORBA_AttributeDef_ptr in (void) const;
+                              CORBA_AttributeDef_ptr &inout (void);
+                              CORBA_AttributeDef_ptr &out (void);
+                              CORBA_AttributeDef_ptr _retn (void);
+                              CORBA_AttributeDef_ptr ptr (void) const;
+
+                              // Hooks used by template sequence and object manager classes
+                              // for non-defined forward declared interfaces.
+                              static CORBA_AttributeDef_ptr duplicate (CORBA_AttributeDef_ptr);
+                              static void release (CORBA_AttributeDef_ptr);
+                              static CORBA_AttributeDef_ptr nil (void);
+                              static CORBA_AttributeDef_ptr narrow (
+                                  CORBA::Object *,
+                                  CORBA::Environment &
+                                );
+                              static CORBA::Object * upcast (void *);
+
+                            private:
+                              CORBA_AttributeDef_ptr ptr_;
+                              // Unimplemented - prevents widening assignment.
+                              CORBA_AttributeDef_var (const TAO_Base_var &rhs);
+                              CORBA_AttributeDef_var &operator= (const TAO_Base_var &rhs);
+                            };
 
 
 #endif /* end #if !defined */
@@ -5409,22 +5526,22 @@ private:
 #if !defined (_CORBA_ATTRIBUTEDEF___OUT_CH_)
 #define _CORBA_ATTRIBUTEDEF___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_AttributeDef_out
-{
-public:
-  CORBA_AttributeDef_out (CORBA_AttributeDef_ptr &);
-  CORBA_AttributeDef_out (CORBA_AttributeDef_var &);
-  CORBA_AttributeDef_out (const CORBA_AttributeDef_out &);
-  CORBA_AttributeDef_out &operator= (const CORBA_AttributeDef_out &);
-  CORBA_AttributeDef_out &operator= (const CORBA_AttributeDef_var &);
-  CORBA_AttributeDef_out &operator= (CORBA_AttributeDef_ptr);
-  operator CORBA_AttributeDef_ptr &();
-  CORBA_AttributeDef_ptr &ptr (void);
-  CORBA_AttributeDef_ptr operator-> (void);
+                            class TAO_IFR_Client_Export CORBA_AttributeDef_out
+                            {
+                            public:
+                              CORBA_AttributeDef_out (CORBA_AttributeDef_ptr &);
+                              CORBA_AttributeDef_out (CORBA_AttributeDef_var &);
+                              CORBA_AttributeDef_out (const CORBA_AttributeDef_out &);
+                              CORBA_AttributeDef_out &operator= (const CORBA_AttributeDef_out &);
+                              CORBA_AttributeDef_out &operator= (const CORBA_AttributeDef_var &);
+                              CORBA_AttributeDef_out &operator= (CORBA_AttributeDef_ptr);
+                              operator CORBA_AttributeDef_ptr &();
+                              CORBA_AttributeDef_ptr &ptr (void);
+                              CORBA_AttributeDef_ptr operator-> (void);
 
-private:
-  CORBA_AttributeDef_ptr &ptr_;
-};
+                            private:
+                              CORBA_AttributeDef_ptr &ptr_;
+                            };
 
 
 #endif /* end #if !defined */
@@ -5433,522 +5550,542 @@ private:
 #if !defined (_CORBA_ATTRIBUTEDEF_CH_)
 #define _CORBA_ATTRIBUTEDEF_CH_
 
-// Forward Classes Declaration
-class _TAO_CORBA_AttributeDef_Proxy_Impl;
-class _TAO_CORBA_AttributeDef_Remote_Proxy_Impl;
-class _TAO_CORBA_AttributeDef_Proxy_Broker;
-class _TAO_CORBA_AttributeDef_Remote_Proxy_Broker;
-
-class TAO_IFR_Client_Export CORBA_AttributeDef: public virtual CORBA_Contained
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_AttributeDef_ptr _ptr_type;
-  typedef CORBA_AttributeDef_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static CORBA_AttributeDef_ptr _duplicate (CORBA_AttributeDef_ptr obj);
-  static CORBA_AttributeDef_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_AttributeDef_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_AttributeDef_ptr _nil (void)
-    {
-      return (CORBA_AttributeDef_ptr)0;
-    }
-
-  static void _tao_any_destructor (void*);
-
-  virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_IDLType_ptr type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void type_def (
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::AttributeMode mode (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void mode (
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
-
-private:
-  _TAO_CORBA_AttributeDef_Proxy_Broker *the_TAO_CORBA_AttributeDef_Proxy_Broker_;
-  
-protected:
-  CORBA_AttributeDef (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void CORBA_AttributeDef_setup_collocation (int collocated);
-    
-    CORBA_AttributeDef (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_CORBA_AttributeDef_Remote_Proxy_Impl;
-    friend class _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_CORBA_AttributeDef_Direct_Proxy_Impl;
-  
-  virtual ~CORBA_AttributeDef (void);
-private:
-  CORBA_AttributeDef (const CORBA_AttributeDef &);
-  void operator= (const CORBA_AttributeDef &);
-};
-
-
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_AttributeDef_Proxy_Impl : 
-  public virtual _TAO_CORBA_Contained_Proxy_Impl
-{
-public:
-  virtual ~_TAO_CORBA_AttributeDef_Proxy_Impl (void) { }
-  
-    virtual CORBA::TypeCode_ptr type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_IDLType_ptr type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA::AttributeMode mode (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void mode (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-protected:
-  _TAO_CORBA_AttributeDef_Proxy_Impl (void);
-
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_AttributeDef_Remote_Proxy_Impl : 
-  public virtual _TAO_CORBA_AttributeDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_CORBA_AttributeDef_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_CORBA_AttributeDef_Remote_Proxy_Impl (void) { }
-  
-    virtual CORBA::TypeCode_ptr type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_IDLType_ptr type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::AttributeMode mode (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void mode (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-};
-
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
-
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_AttributeDef_Proxy_Broker
-{
-public:
-  virtual ~_TAO_CORBA_AttributeDef_Proxy_Broker (void);
-  virtual _TAO_CORBA_AttributeDef_Proxy_Impl &select_proxy (
-    CORBA_AttributeDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
-
-protected:
-  _TAO_CORBA_AttributeDef_Proxy_Broker (void);
-  
-};
-
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_AttributeDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_AttributeDef_Proxy_Broker
-{
-public: 
-  _TAO_CORBA_AttributeDef_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_CORBA_AttributeDef_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_CORBA_AttributeDef_Proxy_Impl &select_proxy (
-    CORBA_AttributeDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
-
-private:
-  _TAO_CORBA_AttributeDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
-
-public:
-  static _TAO_CORBA_AttributeDef_Remote_Proxy_Broker *the_TAO_CORBA_AttributeDef_Remote_Proxy_Broker (void);
-};
-
-
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+                            // Forward Classes Declaration
+                            class _TAO_CORBA_AttributeDef_Proxy_Impl;
+                            class _TAO_CORBA_AttributeDef_Remote_Proxy_Impl;
+                            class _TAO_CORBA_AttributeDef_Proxy_Broker;
+                            class _TAO_CORBA_AttributeDef_Remote_Proxy_Broker;
+
+                            class TAO_IFR_Client_Export CORBA_AttributeDef
+                              : public virtual CORBA_Contained
+                            {
+                            public:
+                            #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+                              typedef CORBA_AttributeDef_ptr _ptr_type;
+                              typedef CORBA_AttributeDef_var _var_type;
+                            #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+                              // the static operations
+                              static CORBA_AttributeDef_ptr _duplicate (CORBA_AttributeDef_ptr obj);
+
+                              static CORBA_AttributeDef_ptr _narrow (
+                                  CORBA::Object_ptr obj,
+                                  CORBA::Environment &ACE_TRY_ENV =
+                                    TAO_default_environment ()
+                                );
+
+                              static CORBA_AttributeDef_ptr _unchecked_narrow (
+                                  CORBA::Object_ptr obj,
+                                  CORBA::Environment &ACE_TRY_ENV =
+                                    TAO_default_environment ()
+                                );
+
+                              static CORBA_AttributeDef_ptr _nil (void)
+                                {
+                                  return (CORBA_AttributeDef_ptr)0;
+                                }
+
+                              static void _tao_any_destructor (void*);
+
+                              virtual CORBA::TypeCode_ptr type (
+                                  CORBA::Environment &ACE_TRY_ENV =
+                                    TAO_default_environment ()
+                                )
+                                ACE_THROW_SPEC ((
+                                  CORBA::SystemException
+                                ));
+
+                              virtual CORBA_IDLType_ptr type_def (
+                                  CORBA::Environment &ACE_TRY_ENV =
+                                    TAO_default_environment ()
+                                )
+                                ACE_THROW_SPEC ((
+                                  CORBA::SystemException
+                                ));
+
+                              virtual void type_def (
+                                  CORBA_IDLType_ptr type_def,
+                                  CORBA::Environment &ACE_TRY_ENV =
+                                    TAO_default_environment ()
+                                )
+                                ACE_THROW_SPEC ((
+                                  CORBA::SystemException
+                                ));
+
+                              virtual CORBA::AttributeMode mode (
+                                  CORBA::Environment &ACE_TRY_ENV =
+                                    TAO_default_environment ()
+                                )
+                                ACE_THROW_SPEC ((
+                                  CORBA::SystemException
+                                ));
+
+                              virtual void mode (
+                                  CORBA::AttributeMode mode,
+                                  CORBA::Environment &ACE_TRY_ENV =
+                                    TAO_default_environment ()
+                                )
+                                ACE_THROW_SPEC ((
+                                  CORBA::SystemException
+                                ));
+
+                              virtual CORBA::Boolean _is_a (
+                                  const CORBA::Char *type_id,
+                                  CORBA::Environment &ACE_TRY_ENV =
+                                    TAO_default_environment ()
+                                );
+
+                              virtual void *_tao_QueryInterface (ptr_arith_t type);
+
+                              virtual const char* _interface_repository_id (void) const;
+
+                            private:
+                              _TAO_CORBA_AttributeDef_Proxy_Broker *the_TAO_CORBA_AttributeDef_Proxy_Broker_;
+
+                            protected:
+                              CORBA_AttributeDef (int collocated = 0);
+
+                              // This methods travese the inheritance tree and set the
+                              // parents piece of the given class in the right mode
+                              virtual void CORBA_AttributeDef_setup_collocation (int collocated);
+
+                              CORBA_AttributeDef (
+                                  TAO_Stub *objref,
+                                  CORBA::Boolean _tao_collocated = 0,
+                                  TAO_Abstract_ServantBase *servant = 0
+                                );
+
+                              friend class _TAO_CORBA_AttributeDef_Remote_Proxy_Impl;
+                              friend class _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl;
+                              friend class _TAO_CORBA_AttributeDef_Direct_Proxy_Impl;
+
+                              virtual ~CORBA_AttributeDef (void);
+
+                            private:
+                              CORBA_AttributeDef (const CORBA_AttributeDef &);
+                              void operator= (const CORBA_AttributeDef &);
+                            };
+
+                            // The Proxy Implementations are used by each interface to
+                            // perform a call. Each different implementation encapsulate
+                            // an invocation logics.
+
+
+                            ///////////////////////////////////////////////////////////////////////
+                            //                    Base Proxy Impl. Declaration
+                            //
+
+                            class TAO_IFR_Client_Export _TAO_CORBA_AttributeDef_Proxy_Impl
+                              : public virtual _TAO_CORBA_Contained_Proxy_Impl
+                            {
+                            public:
+                              virtual ~_TAO_CORBA_AttributeDef_Proxy_Impl (void) { }
+                              virtual CORBA::TypeCode_ptr type (
+                                  CORBA_Object *_collocated_tao_target_,
+                                  CORBA::Environment &ACE_TRY_ENV
+                                )
+                                ACE_THROW_SPEC ((
+                                  CORBA::SystemException
+                                )) = 0;
+
+                              virtual CORBA_IDLType_ptr type_def (
+                                  CORBA_Object *_collocated_tao_target_,
+                                  CORBA::Environment &ACE_TRY_ENV
+                                )
+                                ACE_THROW_SPEC ((
+                                  CORBA::SystemException
+                                )) = 0;
+
+                              virtual void type_def (
+                                  CORBA_Object *_collocated_tao_target_,
+                                  CORBA_IDLType_ptr type_def,
+                                  CORBA::Environment &ACE_TRY_ENV
+                                )
+                                ACE_THROW_SPEC ((
+                                  CORBA::SystemException
+                                )) = 0;
+
+                              virtual CORBA::AttributeMode mode (
+                                  CORBA_Object *_collocated_tao_target_,
+                                  CORBA::Environment &ACE_TRY_ENV
+                                )
+                                ACE_THROW_SPEC ((
+                                  CORBA::SystemException
+                                )) = 0;
+
+                              virtual void mode (
+                                  CORBA_Object *_collocated_tao_target_,
+                                  CORBA::AttributeMode mode,
+                                  CORBA::Environment &ACE_TRY_ENV
+                                )
+                                ACE_THROW_SPEC ((
+                                  CORBA::SystemException
+                                )) = 0;
+
+
+                            protected:
+                              _TAO_CORBA_AttributeDef_Proxy_Impl (void);
+                            };
+
+                            //
+                            //               End Base Proxy Impl. Declaration
+                            ///////////////////////////////////////////////////////////////////////
+
+
+                            ///////////////////////////////////////////////////////////////////////
+                            //                Remote Proxy Impl. Declaration
+                            //
+
+                            class TAO_IFR_Client_Export _TAO_CORBA_AttributeDef_Remote_Proxy_Impl
+                              : public virtual _TAO_CORBA_AttributeDef_Proxy_Impl,
+                                public virtual TAO_Remote_Object_Proxy_Impl,
+                                public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl
+                            {
+                            public:
+                              _TAO_CORBA_AttributeDef_Remote_Proxy_Impl (void);
+
+                              virtual ~_TAO_CORBA_AttributeDef_Remote_Proxy_Impl (void) { }
+                              virtual CORBA::TypeCode_ptr type (
+                                  CORBA_Object *_collocated_tao_target_,
+                                  CORBA::Environment &ACE_TRY_ENV
+                                )
+                                ACE_THROW_SPEC ((
+                                  CORBA::SystemException
+                                ));
+
+                              virtual CORBA_IDLType_ptr type_def (
+                                  CORBA_Object *_collocated_tao_target_,
+                                  CORBA::Environment &ACE_TRY_ENV
+                                )
+                                ACE_THROW_SPEC ((
+                                  CORBA::SystemException
+                                ));
+
+                              virtual void type_def (
+                                  CORBA_Object *_collocated_tao_target_,
+                                  CORBA_IDLType_ptr type_def,
+                                  CORBA::Environment &ACE_TRY_ENV
+                                )
+                                ACE_THROW_SPEC ((
+                                  CORBA::SystemException
+                                ));
+
+                              virtual CORBA::AttributeMode mode (
+                                  CORBA_Object *_collocated_tao_target_,
+                                  CORBA::Environment &ACE_TRY_ENV
+                                )
+                                ACE_THROW_SPEC ((
+                                  CORBA::SystemException
+                                ));
+
+                              virtual void mode (
+                                  CORBA_Object *_collocated_tao_target_,
+                                  CORBA::AttributeMode mode,
+                                  CORBA::Environment &ACE_TRY_ENV
+                                )
+                                ACE_THROW_SPEC ((
+                                  CORBA::SystemException
+                                ));
+
+
+                            };
+
+                            //
+                            //             End Remote Proxy Impl. Declaration
+                            ///////////////////////////////////////////////////////////////////////
+
+                            // The Proxy Brokers are used by each interface to get
+                            // the right proxy for performing a call. In the new
+                            // collocation scheme, the proxy to be used can vary on
+                            // a call by call basis.
+
+
+                            ///////////////////////////////////////////////////////////////////////
+                            //                 Base Proxy Broker Declaration
+                            //
+
+                                                        class TAO_IFR_Client_Export _TAO_CORBA_AttributeDef_Proxy_Broker
+                            {
+                            public:
+                              virtual ~_TAO_CORBA_AttributeDef_Proxy_Broker (void);
+                              virtual _TAO_CORBA_AttributeDef_Proxy_Impl &select_proxy (
+                                  CORBA_AttributeDef *object,
+                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                ) = 0;
+
+                            protected:
+                              _TAO_CORBA_AttributeDef_Proxy_Broker (void);
+
+                            };
+
+                            //
+                            //              End Base Proxy Broker Declaration
+                            ///////////////////////////////////////////////////////////////////////
+
+
+                            ///////////////////////////////////////////////////////////////////////
+                            //                 Remote Proxy Broker Declaration
+                            //
+
+                            class TAO_IFR_Client_Export _TAO_CORBA_AttributeDef_Remote_Proxy_Broker
+                              : public virtual _TAO_CORBA_AttributeDef_Proxy_Broker
+                            {
+                            public:
+                              _TAO_CORBA_AttributeDef_Remote_Proxy_Broker (void);
+
+                              virtual ~_TAO_CORBA_AttributeDef_Remote_Proxy_Broker (void);
+
+                              virtual _TAO_CORBA_AttributeDef_Proxy_Impl &select_proxy (
+                                  CORBA_AttributeDef *object,
+                                  CORBA_Environment &ACE_TRY_ENV
+                                );
+
+                              private:
+                                _TAO_CORBA_AttributeDef_Remote_Proxy_Impl remote_proxy_impl_;
+
+                              public:
+                                // This member function is used to get an handle to the unique instance
+                                // of the Remote Proxy Broker that is available for a given
+                                // interface.
+                                static _TAO_CORBA_AttributeDef_Remote_Proxy_Broker *the_TAO_CORBA_AttributeDef_Remote_Proxy_Broker (void);
+                              };
+
+                              //
+                              //              End Remote Proxy Broker Declaration
+                              ///////////////////////////////////////////////////////////////////////
 
 
 #endif /* end #if !defined */
 
-struct CORBA_AttributeDescription;
-class CORBA_AttributeDescription_var;
 
-struct TAO_IFR_Client_Export CORBA_AttributeDescription
-{
+                              struct CORBA_AttributeDescription;
+                              class CORBA_AttributeDescription_var;
+
+                              struct TAO_IFR_Client_Export CORBA_AttributeDescription
+                              {
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_AttributeDescription_var _var_type;
+                                typedef CORBA_AttributeDescription_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-  static void _tao_any_destructor (void*);
-
-  TAO_String_Manager name;
-  TAO_String_Manager id;
-  TAO_String_Manager defined_in;
-  TAO_String_Manager version;
-  CORBA::TypeCode_var type;
-  CORBA::AttributeMode mode;
-};
-
-class TAO_IFR_Client_Export CORBA_AttributeDescription_var
-{
-public:
-  CORBA_AttributeDescription_var (void); // default constructor
-  CORBA_AttributeDescription_var (CORBA_AttributeDescription *);
-  CORBA_AttributeDescription_var (const CORBA_AttributeDescription_var &); // copy constructor
-  ~CORBA_AttributeDescription_var (void); // destructor
-  
-  CORBA_AttributeDescription_var &operator= (CORBA_AttributeDescription *);
-  CORBA_AttributeDescription_var &operator= (const CORBA_AttributeDescription_var &);
-  CORBA_AttributeDescription *operator-> (void);
-  const CORBA_AttributeDescription *operator-> (void) const;
-  
-  operator const CORBA_AttributeDescription &() const;
-  operator CORBA_AttributeDescription &();
-  operator CORBA_AttributeDescription &() const;
-  operator CORBA_AttributeDescription *&(); // variable-size types only
-  
-  // in, inout, out, _retn 
-  const CORBA_AttributeDescription &in (void) const;
-  CORBA_AttributeDescription &inout (void);
-  CORBA_AttributeDescription *&out (void);
-  CORBA_AttributeDescription *_retn (void);
-  CORBA_AttributeDescription *ptr (void) const;
-
-private:
-  CORBA_AttributeDescription *ptr_;
-};
-
-class TAO_IFR_Client_Export CORBA_AttributeDescription_out
-{
-public:
-  CORBA_AttributeDescription_out (CORBA_AttributeDescription *&);
-  CORBA_AttributeDescription_out (CORBA_AttributeDescription_var &);
-  CORBA_AttributeDescription_out (const CORBA_AttributeDescription_out &);
-  CORBA_AttributeDescription_out &operator= (const CORBA_AttributeDescription_out &);
-  CORBA_AttributeDescription_out &operator= (CORBA_AttributeDescription *);
-  operator CORBA_AttributeDescription *&();
-  CORBA_AttributeDescription *&ptr (void);
-  CORBA_AttributeDescription *operator-> (void);
-  
-private:
-  CORBA_AttributeDescription *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_AttributeDescription_var &);
-};
-
-struct CORBA_ParameterDescription;
-class CORBA_ParameterDescription_var;
-
-struct TAO_IFR_Client_Export CORBA_ParameterDescription
-{
+                                static void _tao_any_destructor (void*);
+
+                                TAO_String_Manager name;
+                                TAO_String_Manager id;
+                                TAO_String_Manager defined_in;
+                                TAO_String_Manager version;
+                                CORBA::TypeCode_var type;
+                                CORBA::AttributeMode mode;
+
+                              };
+
+                              class TAO_IFR_Client_Export CORBA_AttributeDescription_var
+                              {
+                              public:
+                                CORBA_AttributeDescription_var (void);
+                                CORBA_AttributeDescription_var (CORBA_AttributeDescription *);
+                                CORBA_AttributeDescription_var (const CORBA_AttributeDescription_var &);
+                                ~CORBA_AttributeDescription_var (void);
+
+                                CORBA_AttributeDescription_var &operator= (CORBA_AttributeDescription *);
+                                CORBA_AttributeDescription_var &operator= (const CORBA_AttributeDescription_var &);
+                                CORBA_AttributeDescription *operator-> (void);
+                                const CORBA_AttributeDescription *operator-> (void) const;
+
+                                operator const CORBA_AttributeDescription &() const;
+                                operator CORBA_AttributeDescription &();
+                                operator CORBA_AttributeDescription &() const;
+                                // Variable-size types only.
+                                operator CORBA_AttributeDescription *&();
+
+                                // in, inout, out, _retn
+                                const CORBA_AttributeDescription &in (void) const;
+                                CORBA_AttributeDescription &inout (void);
+                                CORBA_AttributeDescription *&out (void);
+                                CORBA_AttributeDescription *_retn (void);
+                                CORBA_AttributeDescription *ptr (void) const;
+
+                              private:
+                                CORBA_AttributeDescription *ptr_;
+                              };
+
+                              class TAO_IFR_Client_Export CORBA_AttributeDescription_out
+                              {
+                              public:
+                                CORBA_AttributeDescription_out (CORBA_AttributeDescription *&);
+                                CORBA_AttributeDescription_out (CORBA_AttributeDescription_var &);
+                                CORBA_AttributeDescription_out (const CORBA_AttributeDescription_out &);
+                                CORBA_AttributeDescription_out &operator= (const CORBA_AttributeDescription_out &);
+                                CORBA_AttributeDescription_out &operator= (CORBA_AttributeDescription *);
+                                operator CORBA_AttributeDescription *&();
+                                CORBA_AttributeDescription *&ptr (void);
+                                CORBA_AttributeDescription *operator-> (void);
+
+                              private:
+                                CORBA_AttributeDescription *&ptr_;
+                                // Assignment from T_var not allowed.
+                                void operator= (const CORBA_AttributeDescription_var &);
+                              };
+
+
+                              struct CORBA_ParameterDescription;
+                              class CORBA_ParameterDescription_var;
+
+                              struct TAO_IFR_Client_Export CORBA_ParameterDescription
+                              {
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_ParameterDescription_var _var_type;
+                                typedef CORBA_ParameterDescription_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-  static void _tao_any_destructor (void*);
+                                static void _tao_any_destructor (void*);
+
+                                TAO_String_Manager name;
+                                CORBA::TypeCode_var type;
+                                CORBA_IDLType_var type_def;
+                                CORBA::ParameterMode mode;
+
+                              };
+
+                              class TAO_IFR_Client_Export CORBA_ParameterDescription_var
+                              {
+                              public:
+                                CORBA_ParameterDescription_var (void);
+                                CORBA_ParameterDescription_var (CORBA_ParameterDescription *);
+                                CORBA_ParameterDescription_var (const CORBA_ParameterDescription_var &);
+                                ~CORBA_ParameterDescription_var (void);
+
+                                CORBA_ParameterDescription_var &operator= (CORBA_ParameterDescription *);
+                                CORBA_ParameterDescription_var &operator= (const CORBA_ParameterDescription_var &);
+                                CORBA_ParameterDescription *operator-> (void);
+                                const CORBA_ParameterDescription *operator-> (void) const;
+
+                                operator const CORBA_ParameterDescription &() const;
+                                operator CORBA_ParameterDescription &();
+                                operator CORBA_ParameterDescription &() const;
+                                // Variable-size types only.
+                                operator CORBA_ParameterDescription *&();
+
+                                // in, inout, out, _retn
+                                const CORBA_ParameterDescription &in (void) const;
+                                CORBA_ParameterDescription &inout (void);
+                                CORBA_ParameterDescription *&out (void);
+                                CORBA_ParameterDescription *_retn (void);
+                                CORBA_ParameterDescription *ptr (void) const;
+
+                              private:
+                                CORBA_ParameterDescription *ptr_;
+                              };
+
+                              class TAO_IFR_Client_Export CORBA_ParameterDescription_out
+                              {
+                              public:
+                                CORBA_ParameterDescription_out (CORBA_ParameterDescription *&);
+                                CORBA_ParameterDescription_out (CORBA_ParameterDescription_var &);
+                                CORBA_ParameterDescription_out (const CORBA_ParameterDescription_out &);
+                                CORBA_ParameterDescription_out &operator= (const CORBA_ParameterDescription_out &);
+                                CORBA_ParameterDescription_out &operator= (CORBA_ParameterDescription *);
+                                operator CORBA_ParameterDescription *&();
+                                CORBA_ParameterDescription *&ptr (void);
+                                CORBA_ParameterDescription *operator-> (void);
+
+                              private:
+                                CORBA_ParameterDescription *&ptr_;
+                                // Assignment from T_var not allowed.
+                                void operator= (const CORBA_ParameterDescription_var &);
+                              };
 
-  TAO_String_Manager name;
-  CORBA::TypeCode_var type;
-  CORBA_IDLType_var type_def;
-  CORBA::ParameterMode mode;
-};
 
-class TAO_IFR_Client_Export CORBA_ParameterDescription_var
-{
-public:
-  CORBA_ParameterDescription_var (void); // default constructor
-  CORBA_ParameterDescription_var (CORBA_ParameterDescription *);
-  CORBA_ParameterDescription_var (const CORBA_ParameterDescription_var &); // copy constructor
-  ~CORBA_ParameterDescription_var (void); // destructor
-  
-  CORBA_ParameterDescription_var &operator= (CORBA_ParameterDescription *);
-  CORBA_ParameterDescription_var &operator= (const CORBA_ParameterDescription_var &);
-  CORBA_ParameterDescription *operator-> (void);
-  const CORBA_ParameterDescription *operator-> (void) const;
-  
-  operator const CORBA_ParameterDescription &() const;
-  operator CORBA_ParameterDescription &();
-  operator CORBA_ParameterDescription &() const;
-  operator CORBA_ParameterDescription *&(); // variable-size types only
-  
-  // in, inout, out, _retn 
-  const CORBA_ParameterDescription &in (void) const;
-  CORBA_ParameterDescription &inout (void);
-  CORBA_ParameterDescription *&out (void);
-  CORBA_ParameterDescription *_retn (void);
-  CORBA_ParameterDescription *ptr (void) const;
-
-private:
-  CORBA_ParameterDescription *ptr_;
-};
-
-class TAO_IFR_Client_Export CORBA_ParameterDescription_out
-{
-public:
-  CORBA_ParameterDescription_out (CORBA_ParameterDescription *&);
-  CORBA_ParameterDescription_out (CORBA_ParameterDescription_var &);
-  CORBA_ParameterDescription_out (const CORBA_ParameterDescription_out &);
-  CORBA_ParameterDescription_out &operator= (const CORBA_ParameterDescription_out &);
-  CORBA_ParameterDescription_out &operator= (CORBA_ParameterDescription *);
-  operator CORBA_ParameterDescription *&();
-  CORBA_ParameterDescription *&ptr (void);
-  CORBA_ParameterDescription *operator-> (void);
-  
-private:
-  CORBA_ParameterDescription *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_ParameterDescription_var &);
-};
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_PARDESCRIPTIONSEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_PARDESCRIPTIONSEQ_CH_
 
-  class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    // = Initialization and termination methods.
-    
-    _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (void); // Default constructor.
-    _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (CORBA::ULong maximum,
-      CORBA::ULong length,
-      CORBA_ParameterDescription *data,
-      CORBA::Boolean release = 0);
-    _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (const _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq &rhs);
-    _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq &operator= (const _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq &rhs);
-    virtual ~_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (void); // Dtor.
-    // = Accessors.
-    CORBA_ParameterDescription &operator[] (CORBA::ULong i);
-    const CORBA_ParameterDescription &operator[] (CORBA::ULong i) const;
-    // = Static operations.
-    static CORBA_ParameterDescription *allocbuf (CORBA::ULong size);
-    static void freebuf (CORBA_ParameterDescription *buffer);
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    
-    CORBA_ParameterDescription *get_buffer (CORBA::Boolean orphan = 0);
-    const CORBA_ParameterDescription *get_buffer (void) const;
-    void replace (CORBA::ULong max,
-      CORBA::ULong length,
-      CORBA_ParameterDescription *data,
-      CORBA::Boolean release);
-  };
+                              class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq
+                                : public TAO_Unbounded_Base_Sequence
+                              {
+                              public:
+                                // = Initialization and termination methods.
+                                _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (void);
+                                _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (CORBA::ULong maximum);
+                                _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (
+                                    CORBA::ULong maximum,
+                                    CORBA::ULong length,
+                                    CORBA_ParameterDescription *data,
+                                    CORBA::Boolean release = 0
+                                  );
+                                _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (
+                                    const _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq &rhs
+                                  );
+                                _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq &operator= (
+                                    const _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq &rhs
+                                  );
+                                virtual ~_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (void);
+
+                                // = Accessors.
+                                CORBA_ParameterDescription &operator[] (CORBA::ULong i);
+                                const CORBA_ParameterDescription &operator[] (CORBA::ULong i) const;
+
+                                // = Static operations.
+                                static CORBA_ParameterDescription *allocbuf (CORBA::ULong size);
+                                static void freebuf (CORBA_ParameterDescription *buffer);
+
+                                // Implement the TAO_Base_Sequence methods (see Sequence.h)
+                                virtual void _allocate_buffer (CORBA::ULong length);
+                                virtual void _deallocate_buffer (void);
+                                CORBA_ParameterDescription *get_buffer (CORBA::Boolean orphan = 0);
+                                const CORBA_ParameterDescription *get_buffer (void) const;
+                                void replace (
+                                    CORBA::ULong max,
+                                    CORBA::ULong length,
+                                    CORBA_ParameterDescription *data,
+                                    CORBA::Boolean release
+                                  );
+                              };
 
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_PARDESCRIPTIONSEQ_CH_)
 #define _CORBA_PARDESCRIPTIONSEQ_CH_
 
-class CORBA_ParDescriptionSeq;
-class CORBA_ParDescriptionSeq_var;
+                              class CORBA_ParDescriptionSeq;
+                              class CORBA_ParDescriptionSeq_var;
 
-// *************************************************************
-// CORBA_ParDescriptionSeq
-// *************************************************************
+                              // *************************************************************
+                              // CORBA_ParDescriptionSeq
+                              // *************************************************************
 
-class TAO_IFR_Client_Export CORBA_ParDescriptionSeq : public 
+                              class TAO_IFR_Client_Export CORBA_ParDescriptionSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq
+                              _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_ParameterDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-{
-public:
-  CORBA_ParDescriptionSeq (void); // default ctor
-  CORBA_ParDescriptionSeq (CORBA::ULong max); // uses max size
-  CORBA_ParDescriptionSeq (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    CORBA_ParameterDescription *buffer, 
-    CORBA::Boolean release = 0
-  );
-  CORBA_ParDescriptionSeq (const CORBA_ParDescriptionSeq &); // copy ctor
-  ~CORBA_ParDescriptionSeq (void);
-  static void _tao_any_destructor (void*);
+                              TAO_Unbounded_Sequence<CORBA_ParameterDescription>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+                              {
+                              public:
+                                CORBA_ParDescriptionSeq (void); // default ctor
+                                CORBA_ParDescriptionSeq (CORBA::ULong max); // uses max size
+                                CORBA_ParDescriptionSeq (
+                                    CORBA::ULong max,
+                                    CORBA::ULong length,
+                                    CORBA_ParameterDescription *buffer,
+                                    CORBA::Boolean release = 0
+                                  );
+                                CORBA_ParDescriptionSeq (const CORBA_ParDescriptionSeq &); // copy ctor
+                                ~CORBA_ParDescriptionSeq (void);
+                                static void _tao_any_destructor (void*);
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_ParDescriptionSeq_var _var_type;
+                                typedef CORBA_ParDescriptionSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-};
+
+                              };
 
 #endif /* end #if !defined */
 
@@ -5956,41 +6093,41 @@ public:
 #if !defined (_CORBA_PARDESCRIPTIONSEQ___VAR_CH_)
 #define _CORBA_PARDESCRIPTIONSEQ___VAR_CH_
 
-// *************************************************************
-// class CORBA_ParDescriptionSeq_var
-// *************************************************************
+                              // *************************************************************
+                              // class CORBA_ParDescriptionSeq_var
+                              // *************************************************************
 
-class TAO_IFR_Client_Export CORBA_ParDescriptionSeq_var
-{
-public:
-  CORBA_ParDescriptionSeq_var (void); // default constructor
-  CORBA_ParDescriptionSeq_var (CORBA_ParDescriptionSeq *);
-  CORBA_ParDescriptionSeq_var (const CORBA_ParDescriptionSeq_var &); // copy constructor
-  ~CORBA_ParDescriptionSeq_var (void); // destructor
-  
-  CORBA_ParDescriptionSeq_var &operator= (CORBA_ParDescriptionSeq *);
-  CORBA_ParDescriptionSeq_var &operator= (const CORBA_ParDescriptionSeq_var &);
-  CORBA_ParDescriptionSeq *operator-> (void);
-  const CORBA_ParDescriptionSeq *operator-> (void) const;
-  
-  operator const CORBA_ParDescriptionSeq &() const;
-  operator CORBA_ParDescriptionSeq &();
-  operator CORBA_ParDescriptionSeq &() const;
-  operator CORBA_ParDescriptionSeq *&(); // variable-size base types only
-  
-  CORBA_ParameterDescription & operator[] (CORBA::ULong index);
-  const CORBA_ParameterDescription & operator[] (CORBA::ULong index) const;
-  
-  // in, inout, out, _retn 
-  const CORBA_ParDescriptionSeq &in (void) const;
-  CORBA_ParDescriptionSeq &inout (void);
-  CORBA_ParDescriptionSeq *&out (void);
-  CORBA_ParDescriptionSeq *_retn (void);
-  CORBA_ParDescriptionSeq *ptr (void) const;
+                              class TAO_IFR_Client_Export CORBA_ParDescriptionSeq_var
+                              {
+                              public:
+                                CORBA_ParDescriptionSeq_var (void);
+                                CORBA_ParDescriptionSeq_var (CORBA_ParDescriptionSeq *);
+                                CORBA_ParDescriptionSeq_var (const CORBA_ParDescriptionSeq_var &);
+                                ~CORBA_ParDescriptionSeq_var (void);
 
-private:
-  CORBA_ParDescriptionSeq *ptr_;
-};
+                                CORBA_ParDescriptionSeq_var &operator= (CORBA_ParDescriptionSeq *);
+                                CORBA_ParDescriptionSeq_var &operator= (const CORBA_ParDescriptionSeq_var &);
+                                CORBA_ParDescriptionSeq *operator-> (void);
+                                const CORBA_ParDescriptionSeq *operator-> (void) const;
+
+                                operator const CORBA_ParDescriptionSeq &() const;
+                                operator CORBA_ParDescriptionSeq &();
+                                operator CORBA_ParDescriptionSeq &() const;
+                                operator CORBA_ParDescriptionSeq *&(); // variable-size base types only
+
+                                CORBA_ParameterDescription & operator[] (CORBA::ULong index);
+                                const CORBA_ParameterDescription & operator[] (CORBA::ULong index) const;
+
+                                // in, inout, out, _retn
+                                const CORBA_ParDescriptionSeq &in (void) const;
+                                CORBA_ParDescriptionSeq &inout (void);
+                                CORBA_ParDescriptionSeq *&out (void);
+                                CORBA_ParDescriptionSeq *_retn (void);
+                                CORBA_ParDescriptionSeq *ptr (void) const;
+
+                              private:
+                                CORBA_ParDescriptionSeq *ptr_;
+                              };
 
 
 #endif /* end #if !defined */
@@ -5999,64 +6136,66 @@ private:
 #if !defined (_CORBA_PARDESCRIPTIONSEQ___OUT_CH_)
 #define _CORBA_PARDESCRIPTIONSEQ___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_ParDescriptionSeq_out
-{
-public:
-  CORBA_ParDescriptionSeq_out (CORBA_ParDescriptionSeq *&);
-  CORBA_ParDescriptionSeq_out (CORBA_ParDescriptionSeq_var &);
-  CORBA_ParDescriptionSeq_out (const CORBA_ParDescriptionSeq_out &);
-  CORBA_ParDescriptionSeq_out &operator= (const CORBA_ParDescriptionSeq_out &);
-  CORBA_ParDescriptionSeq_out &operator= (CORBA_ParDescriptionSeq *);
-  operator CORBA_ParDescriptionSeq *&();
-  CORBA_ParDescriptionSeq *&ptr (void);
-  CORBA_ParDescriptionSeq *operator-> (void);
-  CORBA_ParameterDescription & operator[] (CORBA::ULong index);
-  
-private:
-  CORBA_ParDescriptionSeq *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_ParDescriptionSeq_var &);
-};
+                              class TAO_IFR_Client_Export CORBA_ParDescriptionSeq_out
+                              {
+                              public:
+                                CORBA_ParDescriptionSeq_out (CORBA_ParDescriptionSeq *&);
+                                CORBA_ParDescriptionSeq_out (CORBA_ParDescriptionSeq_var &);
+                                CORBA_ParDescriptionSeq_out (const CORBA_ParDescriptionSeq_out &);
+                                CORBA_ParDescriptionSeq_out &operator= (const CORBA_ParDescriptionSeq_out &);
+                                CORBA_ParDescriptionSeq_out &operator= (CORBA_ParDescriptionSeq *);
+                                operator CORBA_ParDescriptionSeq *&();
+                                CORBA_ParDescriptionSeq *&ptr (void);
+                                CORBA_ParDescriptionSeq *operator-> (void);
+                                CORBA_ParameterDescription & operator[] (CORBA::ULong index);
+
+                              private:
+                                CORBA_ParDescriptionSeq *&ptr_;
+                                // Assignment from T_var not allowed.
+                                void operator= (const CORBA_ParDescriptionSeq_var &);
+                              };
 
 
 #endif /* end #if !defined */
 
 
+
 #if !defined (_CORBA_CONTEXTIDSEQ_CH_)
 #define _CORBA_CONTEXTIDSEQ_CH_
 
-class CORBA_ContextIdSeq;
-class CORBA_ContextIdSeq_var;
+                              class CORBA_ContextIdSeq;
+                              class CORBA_ContextIdSeq_var;
 
-// *************************************************************
-// CORBA_ContextIdSeq
-// *************************************************************
+                              // *************************************************************
+                              // CORBA_ContextIdSeq
+                              // *************************************************************
 
-class TAO_IFR_Client_Export CORBA_ContextIdSeq : public 
+                              class TAO_IFR_Client_Export CORBA_ContextIdSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
+                              TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-{
-public:
-  CORBA_ContextIdSeq (void); // default ctor
-  CORBA_ContextIdSeq (CORBA::ULong max); // uses max size
-  CORBA_ContextIdSeq (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    char * *buffer, 
-    CORBA::Boolean release = 0
-  );
-  CORBA_ContextIdSeq (const CORBA_ContextIdSeq &); // copy ctor
-  ~CORBA_ContextIdSeq (void);
-  static void _tao_any_destructor (void*);
+                              TAO_Unbounded_String_Sequence
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+                              {
+                              public:
+                                CORBA_ContextIdSeq (void); // default ctor
+                                CORBA_ContextIdSeq (CORBA::ULong max); // uses max size
+                                CORBA_ContextIdSeq (
+                                    CORBA::ULong max,
+                                    CORBA::ULong length,
+                                    char * *buffer,
+                                    CORBA::Boolean release = 0
+                                  );
+                                CORBA_ContextIdSeq (const CORBA_ContextIdSeq &); // copy ctor
+                                ~CORBA_ContextIdSeq (void);
+                                static void _tao_any_destructor (void*);
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_ContextIdSeq_var _var_type;
+                                typedef CORBA_ContextIdSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-};
+
+                              };
 
 #endif /* end #if !defined */
 
@@ -6064,40 +6203,40 @@ public:
 #if !defined (_CORBA_CONTEXTIDSEQ___VAR_CH_)
 #define _CORBA_CONTEXTIDSEQ___VAR_CH_
 
-// *************************************************************
-// class CORBA_ContextIdSeq_var
-// *************************************************************
+                              // *************************************************************
+                              // class CORBA_ContextIdSeq_var
+                              // *************************************************************
 
-class TAO_IFR_Client_Export CORBA_ContextIdSeq_var
-{
-public:
-  CORBA_ContextIdSeq_var (void); // default constructor
-  CORBA_ContextIdSeq_var (CORBA_ContextIdSeq *);
-  CORBA_ContextIdSeq_var (const CORBA_ContextIdSeq_var &); // copy constructor
-  ~CORBA_ContextIdSeq_var (void); // destructor
-  
-  CORBA_ContextIdSeq_var &operator= (CORBA_ContextIdSeq *);
-  CORBA_ContextIdSeq_var &operator= (const CORBA_ContextIdSeq_var &);
-  CORBA_ContextIdSeq *operator-> (void);
-  const CORBA_ContextIdSeq *operator-> (void) const;
-  
-  operator const CORBA_ContextIdSeq &() const;
-  operator CORBA_ContextIdSeq &();
-  operator CORBA_ContextIdSeq &() const;
-  operator CORBA_ContextIdSeq *&(); // variable-size base types only
-  
-  TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-  
-  // in, inout, out, _retn 
-  const CORBA_ContextIdSeq &in (void) const;
-  CORBA_ContextIdSeq &inout (void);
-  CORBA_ContextIdSeq *&out (void);
-  CORBA_ContextIdSeq *_retn (void);
-  CORBA_ContextIdSeq *ptr (void) const;
+                              class TAO_IFR_Client_Export CORBA_ContextIdSeq_var
+                              {
+                              public:
+                                CORBA_ContextIdSeq_var (void);
+                                CORBA_ContextIdSeq_var (CORBA_ContextIdSeq *);
+                                CORBA_ContextIdSeq_var (const CORBA_ContextIdSeq_var &);
+                                ~CORBA_ContextIdSeq_var (void);
 
-private:
-  CORBA_ContextIdSeq *ptr_;
-};
+                                CORBA_ContextIdSeq_var &operator= (CORBA_ContextIdSeq *);
+                                CORBA_ContextIdSeq_var &operator= (const CORBA_ContextIdSeq_var &);
+                                CORBA_ContextIdSeq *operator-> (void);
+                                const CORBA_ContextIdSeq *operator-> (void) const;
+
+                                operator const CORBA_ContextIdSeq &() const;
+                                operator CORBA_ContextIdSeq &();
+                                operator CORBA_ContextIdSeq &() const;
+                                operator CORBA_ContextIdSeq *&(); // variable-size base types only
+
+                                TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
+
+                                // in, inout, out, _retn
+                                const CORBA_ContextIdSeq &in (void) const;
+                                CORBA_ContextIdSeq &inout (void);
+                                CORBA_ContextIdSeq *&out (void);
+                                CORBA_ContextIdSeq *_retn (void);
+                                CORBA_ContextIdSeq *ptr (void) const;
+
+                              private:
+                                CORBA_ContextIdSeq *ptr_;
+                              };
 
 
 #endif /* end #if !defined */
@@ -6106,34 +6245,36 @@ private:
 #if !defined (_CORBA_CONTEXTIDSEQ___OUT_CH_)
 #define _CORBA_CONTEXTIDSEQ___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_ContextIdSeq_out
-{
-public:
-  CORBA_ContextIdSeq_out (CORBA_ContextIdSeq *&);
-  CORBA_ContextIdSeq_out (CORBA_ContextIdSeq_var &);
-  CORBA_ContextIdSeq_out (const CORBA_ContextIdSeq_out &);
-  CORBA_ContextIdSeq_out &operator= (const CORBA_ContextIdSeq_out &);
-  CORBA_ContextIdSeq_out &operator= (CORBA_ContextIdSeq *);
-  operator CORBA_ContextIdSeq *&();
-  CORBA_ContextIdSeq *&ptr (void);
-  CORBA_ContextIdSeq *operator-> (void);
-  TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-  
-private:
-  CORBA_ContextIdSeq *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_ContextIdSeq_var &);
-};
+                              class TAO_IFR_Client_Export CORBA_ContextIdSeq_out
+                              {
+                              public:
+                                CORBA_ContextIdSeq_out (CORBA_ContextIdSeq *&);
+                                CORBA_ContextIdSeq_out (CORBA_ContextIdSeq_var &);
+                                CORBA_ContextIdSeq_out (const CORBA_ContextIdSeq_out &);
+                                CORBA_ContextIdSeq_out &operator= (const CORBA_ContextIdSeq_out &);
+                                CORBA_ContextIdSeq_out &operator= (CORBA_ContextIdSeq *);
+                                operator CORBA_ContextIdSeq *&();
+                                CORBA_ContextIdSeq *&ptr (void);
+                                CORBA_ContextIdSeq *operator-> (void);
+                                TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
+
+                              private:
+                                CORBA_ContextIdSeq *&ptr_;
+                                // Assignment from T_var not allowed.
+                                void operator= (const CORBA_ContextIdSeq_var &);
+                              };
 
 
 #endif /* end #if !defined */
 
 
+
+
 #if !defined (_CORBA_OPERATIONDEF___PTR_CH_)
 #define _CORBA_OPERATIONDEF___PTR_CH_
 
-class CORBA_OperationDef;
-typedef CORBA_OperationDef *CORBA_OperationDef_ptr;
+                              class CORBA_OperationDef;
+                              typedef CORBA_OperationDef *CORBA_OperationDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -6141,41 +6282,44 @@ typedef CORBA_OperationDef *CORBA_OperationDef_ptr;
 #if !defined (_CORBA_OPERATIONDEF___VAR_CH_)
 #define _CORBA_OPERATIONDEF___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_OperationDef_var : public TAO_Base_var
-{
-public:
-  CORBA_OperationDef_var (void); // default constructor
-  CORBA_OperationDef_var (CORBA_OperationDef_ptr p) : ptr_ (p) {} 
-  CORBA_OperationDef_var (const CORBA_OperationDef_var &); // copy constructor
-  ~CORBA_OperationDef_var (void); // destructor
-  
-  CORBA_OperationDef_var &operator= (CORBA_OperationDef_ptr);
-  CORBA_OperationDef_var &operator= (const CORBA_OperationDef_var &);
-  CORBA_OperationDef_ptr operator-> (void) const;
-  
-  operator const CORBA_OperationDef_ptr &() const;
-  operator CORBA_OperationDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_OperationDef_ptr in (void) const;
-  CORBA_OperationDef_ptr &inout (void);
-  CORBA_OperationDef_ptr &out (void);
-  CORBA_OperationDef_ptr _retn (void);
-  CORBA_OperationDef_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_OperationDef_ptr duplicate (CORBA_OperationDef_ptr);
-  static void release (CORBA_OperationDef_ptr);
-  static CORBA_OperationDef_ptr nil (void);
-  static CORBA_OperationDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
-
-private:
-  CORBA_OperationDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_OperationDef_var (const TAO_Base_var &rhs);
-  CORBA_OperationDef_var &operator= (const TAO_Base_var &rhs);
-};
+                              class TAO_IFR_Client_Export CORBA_OperationDef_var : public TAO_Base_var
+                              {
+                              public:
+                                CORBA_OperationDef_var (void); // default constructor
+                                CORBA_OperationDef_var (CORBA_OperationDef_ptr p) : ptr_ (p) {}
+                                CORBA_OperationDef_var (const CORBA_OperationDef_var &); // copy constructor
+                                ~CORBA_OperationDef_var (void); // destructor
+
+                                CORBA_OperationDef_var &operator= (CORBA_OperationDef_ptr);
+                                CORBA_OperationDef_var &operator= (const CORBA_OperationDef_var &);
+                                CORBA_OperationDef_ptr operator-> (void) const;
+
+                                operator const CORBA_OperationDef_ptr &() const;
+                                operator CORBA_OperationDef_ptr &();
+                                // in, inout, out, _retn
+                                CORBA_OperationDef_ptr in (void) const;
+                                CORBA_OperationDef_ptr &inout (void);
+                                CORBA_OperationDef_ptr &out (void);
+                                CORBA_OperationDef_ptr _retn (void);
+                                CORBA_OperationDef_ptr ptr (void) const;
+
+                                // Hooks used by template sequence and object manager classes
+                                // for non-defined forward declared interfaces.
+                                static CORBA_OperationDef_ptr duplicate (CORBA_OperationDef_ptr);
+                                static void release (CORBA_OperationDef_ptr);
+                                static CORBA_OperationDef_ptr nil (void);
+                                static CORBA_OperationDef_ptr narrow (
+                                    CORBA::Object *,
+                                    CORBA::Environment &
+                                  );
+                                static CORBA::Object * upcast (void *);
+
+                              private:
+                                CORBA_OperationDef_ptr ptr_;
+                                // Unimplemented - prevents widening assignment.
+                                CORBA_OperationDef_var (const TAO_Base_var &rhs);
+                                CORBA_OperationDef_var &operator= (const TAO_Base_var &rhs);
+                              };
 
 
 #endif /* end #if !defined */
@@ -6184,22 +6328,22 @@ private:
 #if !defined (_CORBA_OPERATIONDEF___OUT_CH_)
 #define _CORBA_OPERATIONDEF___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_OperationDef_out
-{
-public:
-  CORBA_OperationDef_out (CORBA_OperationDef_ptr &);
-  CORBA_OperationDef_out (CORBA_OperationDef_var &);
-  CORBA_OperationDef_out (const CORBA_OperationDef_out &);
-  CORBA_OperationDef_out &operator= (const CORBA_OperationDef_out &);
-  CORBA_OperationDef_out &operator= (const CORBA_OperationDef_var &);
-  CORBA_OperationDef_out &operator= (CORBA_OperationDef_ptr);
-  operator CORBA_OperationDef_ptr &();
-  CORBA_OperationDef_ptr &ptr (void);
-  CORBA_OperationDef_ptr operator-> (void);
+                              class TAO_IFR_Client_Export CORBA_OperationDef_out
+                              {
+                              public:
+                                CORBA_OperationDef_out (CORBA_OperationDef_ptr &);
+                                CORBA_OperationDef_out (CORBA_OperationDef_var &);
+                                CORBA_OperationDef_out (const CORBA_OperationDef_out &);
+                                CORBA_OperationDef_out &operator= (const CORBA_OperationDef_out &);
+                                CORBA_OperationDef_out &operator= (const CORBA_OperationDef_var &);
+                                CORBA_OperationDef_out &operator= (CORBA_OperationDef_ptr);
+                                operator CORBA_OperationDef_ptr &();
+                                CORBA_OperationDef_ptr &ptr (void);
+                                CORBA_OperationDef_ptr operator-> (void);
 
-private:
-  CORBA_OperationDef_ptr &ptr_;
-};
+                              private:
+                                CORBA_OperationDef_ptr &ptr_;
+                              };
 
 
 #endif /* end #if !defined */
@@ -6208,571 +6352,577 @@ private:
 #if !defined (_CORBA_OPERATIONDEF_CH_)
 #define _CORBA_OPERATIONDEF_CH_
 
-// Forward Classes Declaration
-class _TAO_CORBA_OperationDef_Proxy_Impl;
-class _TAO_CORBA_OperationDef_Remote_Proxy_Impl;
-class _TAO_CORBA_OperationDef_Proxy_Broker;
-class _TAO_CORBA_OperationDef_Remote_Proxy_Broker;
-
-class TAO_IFR_Client_Export CORBA_OperationDef: public virtual CORBA_Contained
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_OperationDef_ptr _ptr_type;
-  typedef CORBA_OperationDef_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static CORBA_OperationDef_ptr _duplicate (CORBA_OperationDef_ptr obj);
-  static CORBA_OperationDef_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_OperationDef_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_OperationDef_ptr _nil (void)
-    {
-      return (CORBA_OperationDef_ptr)0;
-    }
-
-  static void _tao_any_destructor (void*);
-
-  virtual CORBA::TypeCode_ptr result (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_IDLType_ptr result_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void result_def (
-      CORBA_IDLType_ptr result_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_ParDescriptionSeq * params (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void params (
-      const CORBA_ParDescriptionSeq & params,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::OperationMode mode (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void mode (
-      CORBA::OperationMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_ContextIdSeq * contexts (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void contexts (
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_ExceptionDefSeq * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void exceptions (
-      const CORBA_ExceptionDefSeq & exceptions,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
-
-private:
-  _TAO_CORBA_OperationDef_Proxy_Broker *the_TAO_CORBA_OperationDef_Proxy_Broker_;
-  
-protected:
-  CORBA_OperationDef (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void CORBA_OperationDef_setup_collocation (int collocated);
-    
-    CORBA_OperationDef (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_CORBA_OperationDef_Remote_Proxy_Impl;
-    friend class _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_CORBA_OperationDef_Direct_Proxy_Impl;
-  
-  virtual ~CORBA_OperationDef (void);
-private:
-  CORBA_OperationDef (const CORBA_OperationDef &);
-  void operator= (const CORBA_OperationDef &);
-};
-
-
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_OperationDef_Proxy_Impl : 
-  public virtual _TAO_CORBA_Contained_Proxy_Impl
-{
-public:
-  virtual ~_TAO_CORBA_OperationDef_Proxy_Impl (void) { }
-  
-    virtual CORBA::TypeCode_ptr result (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_IDLType_ptr result_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void result_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr result_def,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_ParDescriptionSeq * params (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void params (
-      CORBA_Object *_collocated_tao_target_,
-      const CORBA_ParDescriptionSeq & params,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA::OperationMode mode (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void mode (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::OperationMode mode,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_ContextIdSeq * contexts (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void contexts (
-      CORBA_Object *_collocated_tao_target_,
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_ExceptionDefSeq * exceptions (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void exceptions (
-      CORBA_Object *_collocated_tao_target_,
-      const CORBA_ExceptionDefSeq & exceptions,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-protected:
-  _TAO_CORBA_OperationDef_Proxy_Impl (void);
-
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_OperationDef_Remote_Proxy_Impl : 
-  public virtual _TAO_CORBA_OperationDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_CORBA_OperationDef_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_CORBA_OperationDef_Remote_Proxy_Impl (void) { }
-  
-    virtual CORBA::TypeCode_ptr result (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_IDLType_ptr result_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void result_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr result_def,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_ParDescriptionSeq * params (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void params (
-      CORBA_Object *_collocated_tao_target_,
-      const CORBA_ParDescriptionSeq & params,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::OperationMode mode (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void mode (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::OperationMode mode,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_ContextIdSeq * contexts (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void contexts (
-      CORBA_Object *_collocated_tao_target_,
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_ExceptionDefSeq * exceptions (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void exceptions (
-      CORBA_Object *_collocated_tao_target_,
-      const CORBA_ExceptionDefSeq & exceptions,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-};
-
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
-
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_OperationDef_Proxy_Broker
-{
-public:
-  virtual ~_TAO_CORBA_OperationDef_Proxy_Broker (void);
-  virtual _TAO_CORBA_OperationDef_Proxy_Impl &select_proxy (
-    CORBA_OperationDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
-
-protected:
-  _TAO_CORBA_OperationDef_Proxy_Broker (void);
-  
-};
-
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_OperationDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_OperationDef_Proxy_Broker
-{
-public: 
-  _TAO_CORBA_OperationDef_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_CORBA_OperationDef_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_CORBA_OperationDef_Proxy_Impl &select_proxy (
-    CORBA_OperationDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
-
-private:
-  _TAO_CORBA_OperationDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
-
-public:
-  static _TAO_CORBA_OperationDef_Remote_Proxy_Broker *the_TAO_CORBA_OperationDef_Remote_Proxy_Broker (void);
-};
-
-
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+                              // Forward Classes Declaration
+                              class _TAO_CORBA_OperationDef_Proxy_Impl;
+                              class _TAO_CORBA_OperationDef_Remote_Proxy_Impl;
+                              class _TAO_CORBA_OperationDef_Proxy_Broker;
+                              class _TAO_CORBA_OperationDef_Remote_Proxy_Broker;
+
+                              class TAO_IFR_Client_Export CORBA_OperationDef
+                                : public virtual CORBA_Contained
+                              {
+                              public:
+                              #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+                                typedef CORBA_OperationDef_ptr _ptr_type;
+                                typedef CORBA_OperationDef_var _var_type;
+                              #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+                                // the static operations
+                                static CORBA_OperationDef_ptr _duplicate (CORBA_OperationDef_ptr obj);
+
+                                static CORBA_OperationDef_ptr _narrow (
+                                    CORBA::Object_ptr obj,
+                                    CORBA::Environment &ACE_TRY_ENV =
+                                      TAO_default_environment ()
+                                  );
+
+                                static CORBA_OperationDef_ptr _unchecked_narrow (
+                                    CORBA::Object_ptr obj,
+                                    CORBA::Environment &ACE_TRY_ENV =
+                                      TAO_default_environment ()
+                                  );
+
+                                static CORBA_OperationDef_ptr _nil (void)
+                                  {
+                                    return (CORBA_OperationDef_ptr)0;
+                                  }
+
+                                static void _tao_any_destructor (void*);
+
+                                virtual CORBA::TypeCode_ptr result (
+                                    CORBA::Environment &ACE_TRY_ENV =
+                                      TAO_default_environment ()
+                                  )
+                                  ACE_THROW_SPEC ((
+                                    CORBA::SystemException
+                                  ));
+
+                                virtual CORBA_IDLType_ptr result_def (
+                                    CORBA::Environment &ACE_TRY_ENV =
+                                      TAO_default_environment ()
+                                  )
+                                  ACE_THROW_SPEC ((
+                                    CORBA::SystemException
+                                  ));
+
+                                virtual void result_def (
+                                    CORBA_IDLType_ptr result_def,
+                                    CORBA::Environment &ACE_TRY_ENV =
+                                      TAO_default_environment ()
+                                  )
+                                  ACE_THROW_SPEC ((
+                                    CORBA::SystemException
+                                  ));
+
+                                virtual CORBA_ParDescriptionSeq * params (
+                                    CORBA::Environment &ACE_TRY_ENV =
+                                      TAO_default_environment ()
+                                  )
+                                  ACE_THROW_SPEC ((
+                                    CORBA::SystemException
+                                  ));
+
+                                virtual void params (
+                                    const CORBA_ParDescriptionSeq & params,
+                                    CORBA::Environment &ACE_TRY_ENV =
+                                      TAO_default_environment ()
+                                  )
+                                  ACE_THROW_SPEC ((
+                                    CORBA::SystemException
+                                  ));
+
+                                virtual CORBA::OperationMode mode (
+                                    CORBA::Environment &ACE_TRY_ENV =
+                                      TAO_default_environment ()
+                                  )
+                                  ACE_THROW_SPEC ((
+                                    CORBA::SystemException
+                                  ));
+
+                                virtual void mode (
+                                    CORBA::OperationMode mode,
+                                    CORBA::Environment &ACE_TRY_ENV =
+                                      TAO_default_environment ()
+                                  )
+                                  ACE_THROW_SPEC ((
+                                    CORBA::SystemException
+                                  ));
+
+                                virtual CORBA_ContextIdSeq * contexts (
+                                    CORBA::Environment &ACE_TRY_ENV =
+                                      TAO_default_environment ()
+                                  )
+                                  ACE_THROW_SPEC ((
+                                    CORBA::SystemException
+                                  ));
+
+                                virtual void contexts (
+                                    const CORBA_ContextIdSeq & contexts,
+                                    CORBA::Environment &ACE_TRY_ENV =
+                                      TAO_default_environment ()
+                                  )
+                                  ACE_THROW_SPEC ((
+                                    CORBA::SystemException
+                                  ));
+
+                                virtual CORBA_ExceptionDefSeq * exceptions (
+                                    CORBA::Environment &ACE_TRY_ENV =
+                                      TAO_default_environment ()
+                                  )
+                                  ACE_THROW_SPEC ((
+                                    CORBA::SystemException
+                                  ));
+
+                                virtual void exceptions (
+                                    const CORBA_ExceptionDefSeq & exceptions,
+                                    CORBA::Environment &ACE_TRY_ENV =
+                                      TAO_default_environment ()
+                                  )
+                                  ACE_THROW_SPEC ((
+                                    CORBA::SystemException
+                                  ));
+
+                                virtual CORBA::Boolean _is_a (
+                                    const CORBA::Char *type_id,
+                                    CORBA::Environment &ACE_TRY_ENV =
+                                      TAO_default_environment ()
+                                  );
+
+                                virtual void *_tao_QueryInterface (ptr_arith_t type);
+
+                                virtual const char* _interface_repository_id (void) const;
+
+                              private:
+                                _TAO_CORBA_OperationDef_Proxy_Broker *the_TAO_CORBA_OperationDef_Proxy_Broker_;
+
+                              protected:
+                                CORBA_OperationDef (int collocated = 0);
+
+                                // This methods travese the inheritance tree and set the
+                                // parents piece of the given class in the right mode
+                                virtual void CORBA_OperationDef_setup_collocation (int collocated);
+
+                                CORBA_OperationDef (
+                                    TAO_Stub *objref,
+                                    CORBA::Boolean _tao_collocated = 0,
+                                    TAO_Abstract_ServantBase *servant = 0
+                                  );
+
+                                friend class _TAO_CORBA_OperationDef_Remote_Proxy_Impl;
+                                friend class _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl;
+                                friend class _TAO_CORBA_OperationDef_Direct_Proxy_Impl;
+
+                                virtual ~CORBA_OperationDef (void);
+
+                              private:
+                                CORBA_OperationDef (const CORBA_OperationDef &);
+                                void operator= (const CORBA_OperationDef &);
+                              };
+
+                              // The Proxy Implementations are used by each interface to
+                              // perform a call. Each different implementation encapsulate
+                              // an invocation logics.
+
+
+                              ///////////////////////////////////////////////////////////////////////
+                              //                    Base Proxy Impl. Declaration
+                              //
+
+                              class TAO_IFR_Client_Export _TAO_CORBA_OperationDef_Proxy_Impl
+                                : public virtual _TAO_CORBA_Contained_Proxy_Impl
+                              {
+                              public:
+                                virtual ~_TAO_CORBA_OperationDef_Proxy_Impl (void) { }
+                                virtual CORBA::TypeCode_ptr result (
+                                    CORBA_Object *_collocated_tao_target_,
+                                    CORBA::Environment &ACE_TRY_ENV
+                                  )
+                                  ACE_THROW_SPEC ((
+                                    CORBA::SystemException
+                                  )) = 0;
+
+                                virtual CORBA_IDLType_ptr result_def (
+                                    CORBA_Object *_collocated_tao_target_,
+                                    CORBA::Environment &ACE_TRY_ENV
+                                  )
+                                  ACE_THROW_SPEC ((
+                                    CORBA::SystemException
+                                  )) = 0;
+
+                                virtual void result_def (
+                                    CORBA_Object *_collocated_tao_target_,
+                                    CORBA_IDLType_ptr result_def,
+                                    CORBA::Environment &ACE_TRY_ENV
+                                  )
+                                  ACE_THROW_SPEC ((
+                                    CORBA::SystemException
+                                  )) = 0;
+
+                                virtual CORBA_ParDescriptionSeq * params (
+                                    CORBA_Object *_collocated_tao_target_,
+                                    CORBA::Environment &ACE_TRY_ENV
+                                  )
+                                  ACE_THROW_SPEC ((
+                                    CORBA::SystemException
+                                  )) = 0;
+
+                                virtual void params (
+                                    CORBA_Object *_collocated_tao_target_,
+                                    const CORBA_ParDescriptionSeq & params,
+                                    CORBA::Environment &ACE_TRY_ENV
+                                  )
+                                  ACE_THROW_SPEC ((
+                                    CORBA::SystemException
+                                  )) = 0;
+
+                                virtual CORBA::OperationMode mode (
+                                    CORBA_Object *_collocated_tao_target_,
+                                    CORBA::Environment &ACE_TRY_ENV
+                                  )
+                                  ACE_THROW_SPEC ((
+                                    CORBA::SystemException
+                                  )) = 0;
+
+                                virtual void mode (
+                                    CORBA_Object *_collocated_tao_target_,
+                                    CORBA::OperationMode mode,
+                                    CORBA::Environment &ACE_TRY_ENV
+                                  )
+                                  ACE_THROW_SPEC ((
+                                    CORBA::SystemException
+                                  )) = 0;
+
+                                virtual CORBA_ContextIdSeq * contexts (
+                                    CORBA_Object *_collocated_tao_target_,
+                                    CORBA::Environment &ACE_TRY_ENV
+                                  )
+                                  ACE_THROW_SPEC ((
+                                    CORBA::SystemException
+                                  )) = 0;
+
+                                virtual void contexts (
+                                    CORBA_Object *_collocated_tao_target_,
+                                    const CORBA_ContextIdSeq & contexts,
+                                    CORBA::Environment &ACE_TRY_ENV
+                                  )
+                                  ACE_THROW_SPEC ((
+                                    CORBA::SystemException
+                                  )) = 0;
+
+                                virtual CORBA_ExceptionDefSeq * exceptions (
+                                    CORBA_Object *_collocated_tao_target_,
+                                    CORBA::Environment &ACE_TRY_ENV
+                                  )
+                                  ACE_THROW_SPEC ((
+                                    CORBA::SystemException
+                                  )) = 0;
+
+                                virtual void exceptions (
+                                    CORBA_Object *_collocated_tao_target_,
+                                    const CORBA_ExceptionDefSeq & exceptions,
+                                    CORBA::Environment &ACE_TRY_ENV
+                                  )
+                                  ACE_THROW_SPEC ((
+                                    CORBA::SystemException
+                                  )) = 0;
+
+
+                              protected:
+                                _TAO_CORBA_OperationDef_Proxy_Impl (void);
+                              };
+
+                              //
+                              //               End Base Proxy Impl. Declaration
+                              ///////////////////////////////////////////////////////////////////////
+
+
+                              ///////////////////////////////////////////////////////////////////////
+                              //                Remote Proxy Impl. Declaration
+                              //
+
+                              class TAO_IFR_Client_Export _TAO_CORBA_OperationDef_Remote_Proxy_Impl
+                                : public virtual _TAO_CORBA_OperationDef_Proxy_Impl,
+                                  public virtual TAO_Remote_Object_Proxy_Impl,
+                                  public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl
+                              {
+                              public:
+                                _TAO_CORBA_OperationDef_Remote_Proxy_Impl (void);
+
+                                virtual ~_TAO_CORBA_OperationDef_Remote_Proxy_Impl (void) { }
+                                virtual CORBA::TypeCode_ptr result (
+                                    CORBA_Object *_collocated_tao_target_,
+                                    CORBA::Environment &ACE_TRY_ENV
+                                  )
+                                  ACE_THROW_SPEC ((
+                                    CORBA::SystemException
+                                  ));
+
+                                virtual CORBA_IDLType_ptr result_def (
+                                    CORBA_Object *_collocated_tao_target_,
+                                    CORBA::Environment &ACE_TRY_ENV
+                                  )
+                                  ACE_THROW_SPEC ((
+                                    CORBA::SystemException
+                                  ));
+
+                                virtual void result_def (
+                                    CORBA_Object *_collocated_tao_target_,
+                                    CORBA_IDLType_ptr result_def,
+                                    CORBA::Environment &ACE_TRY_ENV
+                                  )
+                                  ACE_THROW_SPEC ((
+                                    CORBA::SystemException
+                                  ));
+
+                                virtual CORBA_ParDescriptionSeq * params (
+                                    CORBA_Object *_collocated_tao_target_,
+                                    CORBA::Environment &ACE_TRY_ENV
+                                  )
+                                  ACE_THROW_SPEC ((
+                                    CORBA::SystemException
+                                  ));
+
+                                virtual void params (
+                                    CORBA_Object *_collocated_tao_target_,
+                                    const CORBA_ParDescriptionSeq & params,
+                                    CORBA::Environment &ACE_TRY_ENV
+                                  )
+                                  ACE_THROW_SPEC ((
+                                    CORBA::SystemException
+                                  ));
+
+                                virtual CORBA::OperationMode mode (
+                                    CORBA_Object *_collocated_tao_target_,
+                                    CORBA::Environment &ACE_TRY_ENV
+                                  )
+                                  ACE_THROW_SPEC ((
+                                    CORBA::SystemException
+                                  ));
+
+                                virtual void mode (
+                                    CORBA_Object *_collocated_tao_target_,
+                                    CORBA::OperationMode mode,
+                                    CORBA::Environment &ACE_TRY_ENV
+                                  )
+                                  ACE_THROW_SPEC ((
+                                    CORBA::SystemException
+                                  ));
+
+                                virtual CORBA_ContextIdSeq * contexts (
+                                    CORBA_Object *_collocated_tao_target_,
+                                    CORBA::Environment &ACE_TRY_ENV
+                                  )
+                                  ACE_THROW_SPEC ((
+                                    CORBA::SystemException
+                                  ));
+
+                                virtual void contexts (
+                                    CORBA_Object *_collocated_tao_target_,
+                                    const CORBA_ContextIdSeq & contexts,
+                                    CORBA::Environment &ACE_TRY_ENV
+                                  )
+                                  ACE_THROW_SPEC ((
+                                    CORBA::SystemException
+                                  ));
+
+                                virtual CORBA_ExceptionDefSeq * exceptions (
+                                    CORBA_Object *_collocated_tao_target_,
+                                    CORBA::Environment &ACE_TRY_ENV
+                                  )
+                                  ACE_THROW_SPEC ((
+                                    CORBA::SystemException
+                                  ));
+
+                                virtual void exceptions (
+                                    CORBA_Object *_collocated_tao_target_,
+                                    const CORBA_ExceptionDefSeq & exceptions,
+                                    CORBA::Environment &ACE_TRY_ENV
+                                  )
+                                  ACE_THROW_SPEC ((
+                                    CORBA::SystemException
+                                  ));
+
+
+                              };
+
+                              //
+                              //             End Remote Proxy Impl. Declaration
+                              ///////////////////////////////////////////////////////////////////////
+
+                              // The Proxy Brokers are used by each interface to get
+                              // the right proxy for performing a call. In the new
+                              // collocation scheme, the proxy to be used can vary on
+                              // a call by call basis.
+
+
+                              ///////////////////////////////////////////////////////////////////////
+                              //                 Base Proxy Broker Declaration
+                              //
+
+                                                            class TAO_IFR_Client_Export _TAO_CORBA_OperationDef_Proxy_Broker
+                              {
+                              public:
+                                virtual ~_TAO_CORBA_OperationDef_Proxy_Broker (void);
+                                virtual _TAO_CORBA_OperationDef_Proxy_Impl &select_proxy (
+                                    CORBA_OperationDef *object,
+                                    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                  ) = 0;
+
+                              protected:
+                                _TAO_CORBA_OperationDef_Proxy_Broker (void);
+
+                              };
+
+                              //
+                              //              End Base Proxy Broker Declaration
+                              ///////////////////////////////////////////////////////////////////////
+
+
+                              ///////////////////////////////////////////////////////////////////////
+                              //                 Remote Proxy Broker Declaration
+                              //
+
+                              class TAO_IFR_Client_Export _TAO_CORBA_OperationDef_Remote_Proxy_Broker
+                                : public virtual _TAO_CORBA_OperationDef_Proxy_Broker
+                              {
+                              public:
+                                _TAO_CORBA_OperationDef_Remote_Proxy_Broker (void);
+
+                                virtual ~_TAO_CORBA_OperationDef_Remote_Proxy_Broker (void);
+
+                                virtual _TAO_CORBA_OperationDef_Proxy_Impl &select_proxy (
+                                    CORBA_OperationDef *object,
+                                    CORBA_Environment &ACE_TRY_ENV
+                                  );
+
+                                private:
+                                  _TAO_CORBA_OperationDef_Remote_Proxy_Impl remote_proxy_impl_;
+
+                                public:
+                                  // This member function is used to get an handle to the unique instance
+                                  // of the Remote Proxy Broker that is available for a given
+                                  // interface.
+                                  static _TAO_CORBA_OperationDef_Remote_Proxy_Broker *the_TAO_CORBA_OperationDef_Remote_Proxy_Broker (void);
+                                };
+
+                                //
+                                //              End Remote Proxy Broker Declaration
+                                ///////////////////////////////////////////////////////////////////////
 
 
 #endif /* end #if !defined */
 
-struct CORBA_OperationDescription;
-class CORBA_OperationDescription_var;
 
-struct TAO_IFR_Client_Export CORBA_OperationDescription
-{
+                                struct CORBA_OperationDescription;
+                                class CORBA_OperationDescription_var;
+
+                                struct TAO_IFR_Client_Export CORBA_OperationDescription
+                                {
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_OperationDescription_var _var_type;
+                                  typedef CORBA_OperationDescription_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-  static void _tao_any_destructor (void*);
+                                  static void _tao_any_destructor (void*);
+
+                                  TAO_String_Manager name;
+                                  TAO_String_Manager id;
+                                  TAO_String_Manager defined_in;
+                                  TAO_String_Manager version;
+                                  CORBA::TypeCode_var result;
+                                  CORBA::OperationMode mode;
+                                  CORBA_ContextIdSeq contexts;
+                                  CORBA_ParDescriptionSeq parameters;
+                                  CORBA_ExcDescriptionSeq exceptions;
+
+                                };
+
+                                class TAO_IFR_Client_Export CORBA_OperationDescription_var
+                                {
+                                public:
+                                  CORBA_OperationDescription_var (void);
+                                  CORBA_OperationDescription_var (CORBA_OperationDescription *);
+                                  CORBA_OperationDescription_var (const CORBA_OperationDescription_var &);
+                                  ~CORBA_OperationDescription_var (void);
+
+                                  CORBA_OperationDescription_var &operator= (CORBA_OperationDescription *);
+                                  CORBA_OperationDescription_var &operator= (const CORBA_OperationDescription_var &);
+                                  CORBA_OperationDescription *operator-> (void);
+                                  const CORBA_OperationDescription *operator-> (void) const;
+
+                                  operator const CORBA_OperationDescription &() const;
+                                  operator CORBA_OperationDescription &();
+                                  operator CORBA_OperationDescription &() const;
+                                  // Variable-size types only.
+                                  operator CORBA_OperationDescription *&();
+
+                                  // in, inout, out, _retn
+                                  const CORBA_OperationDescription &in (void) const;
+                                  CORBA_OperationDescription &inout (void);
+                                  CORBA_OperationDescription *&out (void);
+                                  CORBA_OperationDescription *_retn (void);
+                                  CORBA_OperationDescription *ptr (void) const;
+
+                                private:
+                                  CORBA_OperationDescription *ptr_;
+                                };
+
+                                class TAO_IFR_Client_Export CORBA_OperationDescription_out
+                                {
+                                public:
+                                  CORBA_OperationDescription_out (CORBA_OperationDescription *&);
+                                  CORBA_OperationDescription_out (CORBA_OperationDescription_var &);
+                                  CORBA_OperationDescription_out (const CORBA_OperationDescription_out &);
+                                  CORBA_OperationDescription_out &operator= (const CORBA_OperationDescription_out &);
+                                  CORBA_OperationDescription_out &operator= (CORBA_OperationDescription *);
+                                  operator CORBA_OperationDescription *&();
+                                  CORBA_OperationDescription *&ptr (void);
+                                  CORBA_OperationDescription *operator-> (void);
+
+                                private:
+                                  CORBA_OperationDescription *&ptr_;
+                                  // Assignment from T_var not allowed.
+                                  void operator= (const CORBA_OperationDescription_var &);
+                                };
 
-  TAO_String_Manager name;
-  TAO_String_Manager id;
-  TAO_String_Manager defined_in;
-  TAO_String_Manager version;
-  CORBA::TypeCode_var result;
-  CORBA::OperationMode mode;
-  CORBA_ContextIdSeq contexts;
-  CORBA_ParDescriptionSeq parameters;
-  CORBA_ExcDescriptionSeq exceptions;
-};
-
-class TAO_IFR_Client_Export CORBA_OperationDescription_var
-{
-public:
-  CORBA_OperationDescription_var (void); // default constructor
-  CORBA_OperationDescription_var (CORBA_OperationDescription *);
-  CORBA_OperationDescription_var (const CORBA_OperationDescription_var &); // copy constructor
-  ~CORBA_OperationDescription_var (void); // destructor
-  
-  CORBA_OperationDescription_var &operator= (CORBA_OperationDescription *);
-  CORBA_OperationDescription_var &operator= (const CORBA_OperationDescription_var &);
-  CORBA_OperationDescription *operator-> (void);
-  const CORBA_OperationDescription *operator-> (void) const;
-  
-  operator const CORBA_OperationDescription &() const;
-  operator CORBA_OperationDescription &();
-  operator CORBA_OperationDescription &() const;
-  operator CORBA_OperationDescription *&(); // variable-size types only
-  
-  // in, inout, out, _retn 
-  const CORBA_OperationDescription &in (void) const;
-  CORBA_OperationDescription &inout (void);
-  CORBA_OperationDescription *&out (void);
-  CORBA_OperationDescription *_retn (void);
-  CORBA_OperationDescription *ptr (void) const;
-
-private:
-  CORBA_OperationDescription *ptr_;
-};
-
-class TAO_IFR_Client_Export CORBA_OperationDescription_out
-{
-public:
-  CORBA_OperationDescription_out (CORBA_OperationDescription *&);
-  CORBA_OperationDescription_out (CORBA_OperationDescription_var &);
-  CORBA_OperationDescription_out (const CORBA_OperationDescription_out &);
-  CORBA_OperationDescription_out &operator= (const CORBA_OperationDescription_out &);
-  CORBA_OperationDescription_out &operator= (CORBA_OperationDescription *);
-  operator CORBA_OperationDescription *&();
-  CORBA_OperationDescription *&ptr (void);
-  CORBA_OperationDescription *operator-> (void);
-  
-private:
-  CORBA_OperationDescription *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_OperationDescription_var &);
-};
 
 
 #if !defined (_CORBA_REPOSITORYIDSEQ_CH_)
 #define _CORBA_REPOSITORYIDSEQ_CH_
 
-class CORBA_RepositoryIdSeq;
-class CORBA_RepositoryIdSeq_var;
+                                class CORBA_RepositoryIdSeq;
+                                class CORBA_RepositoryIdSeq_var;
 
-// *************************************************************
-// CORBA_RepositoryIdSeq
-// *************************************************************
+                                // *************************************************************
+                                // CORBA_RepositoryIdSeq
+                                // *************************************************************
 
-class TAO_IFR_Client_Export CORBA_RepositoryIdSeq : public 
+                                class TAO_IFR_Client_Export CORBA_RepositoryIdSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
+                                TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-{
-public:
-  CORBA_RepositoryIdSeq (void); // default ctor
-  CORBA_RepositoryIdSeq (CORBA::ULong max); // uses max size
-  CORBA_RepositoryIdSeq (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    char * *buffer, 
-    CORBA::Boolean release = 0
-  );
-  CORBA_RepositoryIdSeq (const CORBA_RepositoryIdSeq &); // copy ctor
-  ~CORBA_RepositoryIdSeq (void);
-  static void _tao_any_destructor (void*);
+                                TAO_Unbounded_String_Sequence
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+                                {
+                                public:
+                                  CORBA_RepositoryIdSeq (void); // default ctor
+                                  CORBA_RepositoryIdSeq (CORBA::ULong max); // uses max size
+                                  CORBA_RepositoryIdSeq (
+                                      CORBA::ULong max,
+                                      CORBA::ULong length,
+                                      char * *buffer,
+                                      CORBA::Boolean release = 0
+                                    );
+                                  CORBA_RepositoryIdSeq (const CORBA_RepositoryIdSeq &); // copy ctor
+                                  ~CORBA_RepositoryIdSeq (void);
+                                  static void _tao_any_destructor (void*);
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_RepositoryIdSeq_var _var_type;
+                                  typedef CORBA_RepositoryIdSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-};
+
+                                };
 
 #endif /* end #if !defined */
 
@@ -6780,40 +6930,40 @@ public:
 #if !defined (_CORBA_REPOSITORYIDSEQ___VAR_CH_)
 #define _CORBA_REPOSITORYIDSEQ___VAR_CH_
 
-// *************************************************************
-// class CORBA_RepositoryIdSeq_var
-// *************************************************************
+                                // *************************************************************
+                                // class CORBA_RepositoryIdSeq_var
+                                // *************************************************************
 
-class TAO_IFR_Client_Export CORBA_RepositoryIdSeq_var
-{
-public:
-  CORBA_RepositoryIdSeq_var (void); // default constructor
-  CORBA_RepositoryIdSeq_var (CORBA_RepositoryIdSeq *);
-  CORBA_RepositoryIdSeq_var (const CORBA_RepositoryIdSeq_var &); // copy constructor
-  ~CORBA_RepositoryIdSeq_var (void); // destructor
-  
-  CORBA_RepositoryIdSeq_var &operator= (CORBA_RepositoryIdSeq *);
-  CORBA_RepositoryIdSeq_var &operator= (const CORBA_RepositoryIdSeq_var &);
-  CORBA_RepositoryIdSeq *operator-> (void);
-  const CORBA_RepositoryIdSeq *operator-> (void) const;
-  
-  operator const CORBA_RepositoryIdSeq &() const;
-  operator CORBA_RepositoryIdSeq &();
-  operator CORBA_RepositoryIdSeq &() const;
-  operator CORBA_RepositoryIdSeq *&(); // variable-size base types only
-  
-  TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-  
-  // in, inout, out, _retn 
-  const CORBA_RepositoryIdSeq &in (void) const;
-  CORBA_RepositoryIdSeq &inout (void);
-  CORBA_RepositoryIdSeq *&out (void);
-  CORBA_RepositoryIdSeq *_retn (void);
-  CORBA_RepositoryIdSeq *ptr (void) const;
+                                class TAO_IFR_Client_Export CORBA_RepositoryIdSeq_var
+                                {
+                                public:
+                                  CORBA_RepositoryIdSeq_var (void);
+                                  CORBA_RepositoryIdSeq_var (CORBA_RepositoryIdSeq *);
+                                  CORBA_RepositoryIdSeq_var (const CORBA_RepositoryIdSeq_var &);
+                                  ~CORBA_RepositoryIdSeq_var (void);
 
-private:
-  CORBA_RepositoryIdSeq *ptr_;
-};
+                                  CORBA_RepositoryIdSeq_var &operator= (CORBA_RepositoryIdSeq *);
+                                  CORBA_RepositoryIdSeq_var &operator= (const CORBA_RepositoryIdSeq_var &);
+                                  CORBA_RepositoryIdSeq *operator-> (void);
+                                  const CORBA_RepositoryIdSeq *operator-> (void) const;
+
+                                  operator const CORBA_RepositoryIdSeq &() const;
+                                  operator CORBA_RepositoryIdSeq &();
+                                  operator CORBA_RepositoryIdSeq &() const;
+                                  operator CORBA_RepositoryIdSeq *&(); // variable-size base types only
+
+                                  TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
+
+                                  // in, inout, out, _retn
+                                  const CORBA_RepositoryIdSeq &in (void) const;
+                                  CORBA_RepositoryIdSeq &inout (void);
+                                  CORBA_RepositoryIdSeq *&out (void);
+                                  CORBA_RepositoryIdSeq *_retn (void);
+                                  CORBA_RepositoryIdSeq *ptr (void) const;
+
+                                private:
+                                  CORBA_RepositoryIdSeq *ptr_;
+                                };
 
 
 #endif /* end #if !defined */
@@ -6822,106 +6972,117 @@ private:
 #if !defined (_CORBA_REPOSITORYIDSEQ___OUT_CH_)
 #define _CORBA_REPOSITORYIDSEQ___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_RepositoryIdSeq_out
-{
-public:
-  CORBA_RepositoryIdSeq_out (CORBA_RepositoryIdSeq *&);
-  CORBA_RepositoryIdSeq_out (CORBA_RepositoryIdSeq_var &);
-  CORBA_RepositoryIdSeq_out (const CORBA_RepositoryIdSeq_out &);
-  CORBA_RepositoryIdSeq_out &operator= (const CORBA_RepositoryIdSeq_out &);
-  CORBA_RepositoryIdSeq_out &operator= (CORBA_RepositoryIdSeq *);
-  operator CORBA_RepositoryIdSeq *&();
-  CORBA_RepositoryIdSeq *&ptr (void);
-  CORBA_RepositoryIdSeq *operator-> (void);
-  TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-  
-private:
-  CORBA_RepositoryIdSeq *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_RepositoryIdSeq_var &);
-};
+                                class TAO_IFR_Client_Export CORBA_RepositoryIdSeq_out
+                                {
+                                public:
+                                  CORBA_RepositoryIdSeq_out (CORBA_RepositoryIdSeq *&);
+                                  CORBA_RepositoryIdSeq_out (CORBA_RepositoryIdSeq_var &);
+                                  CORBA_RepositoryIdSeq_out (const CORBA_RepositoryIdSeq_out &);
+                                  CORBA_RepositoryIdSeq_out &operator= (const CORBA_RepositoryIdSeq_out &);
+                                  CORBA_RepositoryIdSeq_out &operator= (CORBA_RepositoryIdSeq *);
+                                  operator CORBA_RepositoryIdSeq *&();
+                                  CORBA_RepositoryIdSeq *&ptr (void);
+                                  CORBA_RepositoryIdSeq *operator-> (void);
+                                  TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
+
+                                private:
+                                  CORBA_RepositoryIdSeq *&ptr_;
+                                  // Assignment from T_var not allowed.
+                                  void operator= (const CORBA_RepositoryIdSeq_var &);
+                                };
 
 
 #endif /* end #if !defined */
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_OPDESCRIPTIONSEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_OPDESCRIPTIONSEQ_CH_
 
-  class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    // = Initialization and termination methods.
-    
-    _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (void); // Default constructor.
-    _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (CORBA::ULong maximum,
-      CORBA::ULong length,
-      CORBA_OperationDescription *data,
-      CORBA::Boolean release = 0);
-    _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (const _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq &rhs);
-    _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq &operator= (const _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq &rhs);
-    virtual ~_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (void); // Dtor.
-    // = Accessors.
-    CORBA_OperationDescription &operator[] (CORBA::ULong i);
-    const CORBA_OperationDescription &operator[] (CORBA::ULong i) const;
-    // = Static operations.
-    static CORBA_OperationDescription *allocbuf (CORBA::ULong size);
-    static void freebuf (CORBA_OperationDescription *buffer);
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    
-    CORBA_OperationDescription *get_buffer (CORBA::Boolean orphan = 0);
-    const CORBA_OperationDescription *get_buffer (void) const;
-    void replace (CORBA::ULong max,
-      CORBA::ULong length,
-      CORBA_OperationDescription *data,
-      CORBA::Boolean release);
-  };
+                                class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq
+                                  : public TAO_Unbounded_Base_Sequence
+                                {
+                                public:
+                                  // = Initialization and termination methods.
+                                  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (void);
+                                  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (CORBA::ULong maximum);
+                                  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (
+                                      CORBA::ULong maximum,
+                                      CORBA::ULong length,
+                                      CORBA_OperationDescription *data,
+                                      CORBA::Boolean release = 0
+                                    );
+                                  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (
+                                      const _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq &rhs
+                                    );
+                                  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq &operator= (
+                                      const _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq &rhs
+                                    );
+                                  virtual ~_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (void);
+
+                                  // = Accessors.
+                                  CORBA_OperationDescription &operator[] (CORBA::ULong i);
+                                  const CORBA_OperationDescription &operator[] (CORBA::ULong i) const;
+
+                                  // = Static operations.
+                                  static CORBA_OperationDescription *allocbuf (CORBA::ULong size);
+                                  static void freebuf (CORBA_OperationDescription *buffer);
+
+                                  // Implement the TAO_Base_Sequence methods (see Sequence.h)
+                                  virtual void _allocate_buffer (CORBA::ULong length);
+                                  virtual void _deallocate_buffer (void);
+                                  CORBA_OperationDescription *get_buffer (CORBA::Boolean orphan = 0);
+                                  const CORBA_OperationDescription *get_buffer (void) const;
+                                  void replace (
+                                      CORBA::ULong max,
+                                      CORBA::ULong length,
+                                      CORBA_OperationDescription *data,
+                                      CORBA::Boolean release
+                                    );
+                                };
 
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_OPDESCRIPTIONSEQ_CH_)
 #define _CORBA_OPDESCRIPTIONSEQ_CH_
 
-class CORBA_OpDescriptionSeq;
-class CORBA_OpDescriptionSeq_var;
+                                class CORBA_OpDescriptionSeq;
+                                class CORBA_OpDescriptionSeq_var;
 
-// *************************************************************
-// CORBA_OpDescriptionSeq
-// *************************************************************
+                                // *************************************************************
+                                // CORBA_OpDescriptionSeq
+                                // *************************************************************
 
-class TAO_IFR_Client_Export CORBA_OpDescriptionSeq : public 
+                                class TAO_IFR_Client_Export CORBA_OpDescriptionSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq
+                                _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_OperationDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-{
-public:
-  CORBA_OpDescriptionSeq (void); // default ctor
-  CORBA_OpDescriptionSeq (CORBA::ULong max); // uses max size
-  CORBA_OpDescriptionSeq (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    CORBA_OperationDescription *buffer, 
-    CORBA::Boolean release = 0
-  );
-  CORBA_OpDescriptionSeq (const CORBA_OpDescriptionSeq &); // copy ctor
-  ~CORBA_OpDescriptionSeq (void);
-  static void _tao_any_destructor (void*);
+                                TAO_Unbounded_Sequence<CORBA_OperationDescription>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+                                {
+                                public:
+                                  CORBA_OpDescriptionSeq (void); // default ctor
+                                  CORBA_OpDescriptionSeq (CORBA::ULong max); // uses max size
+                                  CORBA_OpDescriptionSeq (
+                                      CORBA::ULong max,
+                                      CORBA::ULong length,
+                                      CORBA_OperationDescription *buffer,
+                                      CORBA::Boolean release = 0
+                                    );
+                                  CORBA_OpDescriptionSeq (const CORBA_OpDescriptionSeq &); // copy ctor
+                                  ~CORBA_OpDescriptionSeq (void);
+                                  static void _tao_any_destructor (void*);
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_OpDescriptionSeq_var _var_type;
+                                  typedef CORBA_OpDescriptionSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-};
+
+                                };
 
 #endif /* end #if !defined */
 
@@ -6929,41 +7090,41 @@ public:
 #if !defined (_CORBA_OPDESCRIPTIONSEQ___VAR_CH_)
 #define _CORBA_OPDESCRIPTIONSEQ___VAR_CH_
 
-// *************************************************************
-// class CORBA_OpDescriptionSeq_var
-// *************************************************************
+                                // *************************************************************
+                                // class CORBA_OpDescriptionSeq_var
+                                // *************************************************************
 
-class TAO_IFR_Client_Export CORBA_OpDescriptionSeq_var
-{
-public:
-  CORBA_OpDescriptionSeq_var (void); // default constructor
-  CORBA_OpDescriptionSeq_var (CORBA_OpDescriptionSeq *);
-  CORBA_OpDescriptionSeq_var (const CORBA_OpDescriptionSeq_var &); // copy constructor
-  ~CORBA_OpDescriptionSeq_var (void); // destructor
-  
-  CORBA_OpDescriptionSeq_var &operator= (CORBA_OpDescriptionSeq *);
-  CORBA_OpDescriptionSeq_var &operator= (const CORBA_OpDescriptionSeq_var &);
-  CORBA_OpDescriptionSeq *operator-> (void);
-  const CORBA_OpDescriptionSeq *operator-> (void) const;
-  
-  operator const CORBA_OpDescriptionSeq &() const;
-  operator CORBA_OpDescriptionSeq &();
-  operator CORBA_OpDescriptionSeq &() const;
-  operator CORBA_OpDescriptionSeq *&(); // variable-size base types only
-  
-  CORBA_OperationDescription & operator[] (CORBA::ULong index);
-  const CORBA_OperationDescription & operator[] (CORBA::ULong index) const;
-  
-  // in, inout, out, _retn 
-  const CORBA_OpDescriptionSeq &in (void) const;
-  CORBA_OpDescriptionSeq &inout (void);
-  CORBA_OpDescriptionSeq *&out (void);
-  CORBA_OpDescriptionSeq *_retn (void);
-  CORBA_OpDescriptionSeq *ptr (void) const;
+                                class TAO_IFR_Client_Export CORBA_OpDescriptionSeq_var
+                                {
+                                public:
+                                  CORBA_OpDescriptionSeq_var (void);
+                                  CORBA_OpDescriptionSeq_var (CORBA_OpDescriptionSeq *);
+                                  CORBA_OpDescriptionSeq_var (const CORBA_OpDescriptionSeq_var &);
+                                  ~CORBA_OpDescriptionSeq_var (void);
 
-private:
-  CORBA_OpDescriptionSeq *ptr_;
-};
+                                  CORBA_OpDescriptionSeq_var &operator= (CORBA_OpDescriptionSeq *);
+                                  CORBA_OpDescriptionSeq_var &operator= (const CORBA_OpDescriptionSeq_var &);
+                                  CORBA_OpDescriptionSeq *operator-> (void);
+                                  const CORBA_OpDescriptionSeq *operator-> (void) const;
+
+                                  operator const CORBA_OpDescriptionSeq &() const;
+                                  operator CORBA_OpDescriptionSeq &();
+                                  operator CORBA_OpDescriptionSeq &() const;
+                                  operator CORBA_OpDescriptionSeq *&(); // variable-size base types only
+
+                                  CORBA_OperationDescription & operator[] (CORBA::ULong index);
+                                  const CORBA_OperationDescription & operator[] (CORBA::ULong index) const;
+
+                                  // in, inout, out, _retn
+                                  const CORBA_OpDescriptionSeq &in (void) const;
+                                  CORBA_OpDescriptionSeq &inout (void);
+                                  CORBA_OpDescriptionSeq *&out (void);
+                                  CORBA_OpDescriptionSeq *_retn (void);
+                                  CORBA_OpDescriptionSeq *ptr (void) const;
+
+                                private:
+                                  CORBA_OpDescriptionSeq *ptr_;
+                                };
 
 
 #endif /* end #if !defined */
@@ -6972,106 +7133,118 @@ private:
 #if !defined (_CORBA_OPDESCRIPTIONSEQ___OUT_CH_)
 #define _CORBA_OPDESCRIPTIONSEQ___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_OpDescriptionSeq_out
-{
-public:
-  CORBA_OpDescriptionSeq_out (CORBA_OpDescriptionSeq *&);
-  CORBA_OpDescriptionSeq_out (CORBA_OpDescriptionSeq_var &);
-  CORBA_OpDescriptionSeq_out (const CORBA_OpDescriptionSeq_out &);
-  CORBA_OpDescriptionSeq_out &operator= (const CORBA_OpDescriptionSeq_out &);
-  CORBA_OpDescriptionSeq_out &operator= (CORBA_OpDescriptionSeq *);
-  operator CORBA_OpDescriptionSeq *&();
-  CORBA_OpDescriptionSeq *&ptr (void);
-  CORBA_OpDescriptionSeq *operator-> (void);
-  CORBA_OperationDescription & operator[] (CORBA::ULong index);
-  
-private:
-  CORBA_OpDescriptionSeq *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_OpDescriptionSeq_var &);
-};
+                                class TAO_IFR_Client_Export CORBA_OpDescriptionSeq_out
+                                {
+                                public:
+                                  CORBA_OpDescriptionSeq_out (CORBA_OpDescriptionSeq *&);
+                                  CORBA_OpDescriptionSeq_out (CORBA_OpDescriptionSeq_var &);
+                                  CORBA_OpDescriptionSeq_out (const CORBA_OpDescriptionSeq_out &);
+                                  CORBA_OpDescriptionSeq_out &operator= (const CORBA_OpDescriptionSeq_out &);
+                                  CORBA_OpDescriptionSeq_out &operator= (CORBA_OpDescriptionSeq *);
+                                  operator CORBA_OpDescriptionSeq *&();
+                                  CORBA_OpDescriptionSeq *&ptr (void);
+                                  CORBA_OpDescriptionSeq *operator-> (void);
+                                  CORBA_OperationDescription & operator[] (CORBA::ULong index);
+
+                                private:
+                                  CORBA_OpDescriptionSeq *&ptr_;
+                                  // Assignment from T_var not allowed.
+                                  void operator= (const CORBA_OpDescriptionSeq_var &);
+                                };
 
 
 #endif /* end #if !defined */
 
 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_ATTRDESCRIPTIONSEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_ATTRDESCRIPTIONSEQ_CH_
 
-  class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    // = Initialization and termination methods.
-    
-    _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (void); // Default constructor.
-    _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (CORBA::ULong maximum,
-      CORBA::ULong length,
-      CORBA_AttributeDescription *data,
-      CORBA::Boolean release = 0);
-    _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (const _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq &rhs);
-    _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq &operator= (const _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq &rhs);
-    virtual ~_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (void); // Dtor.
-    // = Accessors.
-    CORBA_AttributeDescription &operator[] (CORBA::ULong i);
-    const CORBA_AttributeDescription &operator[] (CORBA::ULong i) const;
-    // = Static operations.
-    static CORBA_AttributeDescription *allocbuf (CORBA::ULong size);
-    static void freebuf (CORBA_AttributeDescription *buffer);
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    
-    CORBA_AttributeDescription *get_buffer (CORBA::Boolean orphan = 0);
-    const CORBA_AttributeDescription *get_buffer (void) const;
-    void replace (CORBA::ULong max,
-      CORBA::ULong length,
-      CORBA_AttributeDescription *data,
-      CORBA::Boolean release);
-  };
+                                class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq
+                                  : public TAO_Unbounded_Base_Sequence
+                                {
+                                public:
+                                  // = Initialization and termination methods.
+                                  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (void);
+                                  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (CORBA::ULong maximum);
+                                  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (
+                                      CORBA::ULong maximum,
+                                      CORBA::ULong length,
+                                      CORBA_AttributeDescription *data,
+                                      CORBA::Boolean release = 0
+                                    );
+                                  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (
+                                      const _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq &rhs
+                                    );
+                                  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq &operator= (
+                                      const _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq &rhs
+                                    );
+                                  virtual ~_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (void);
+
+                                  // = Accessors.
+                                  CORBA_AttributeDescription &operator[] (CORBA::ULong i);
+                                  const CORBA_AttributeDescription &operator[] (CORBA::ULong i) const;
+
+                                  // = Static operations.
+                                  static CORBA_AttributeDescription *allocbuf (CORBA::ULong size);
+                                  static void freebuf (CORBA_AttributeDescription *buffer);
+
+                                  // Implement the TAO_Base_Sequence methods (see Sequence.h)
+                                  virtual void _allocate_buffer (CORBA::ULong length);
+                                  virtual void _deallocate_buffer (void);
+                                  CORBA_AttributeDescription *get_buffer (CORBA::Boolean orphan = 0);
+                                  const CORBA_AttributeDescription *get_buffer (void) const;
+                                  void replace (
+                                      CORBA::ULong max,
+                                      CORBA::ULong length,
+                                      CORBA_AttributeDescription *data,
+                                      CORBA::Boolean release
+                                    );
+                                };
 
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_ATTRDESCRIPTIONSEQ_CH_)
 #define _CORBA_ATTRDESCRIPTIONSEQ_CH_
 
-class CORBA_AttrDescriptionSeq;
-class CORBA_AttrDescriptionSeq_var;
+                                class CORBA_AttrDescriptionSeq;
+                                class CORBA_AttrDescriptionSeq_var;
 
-// *************************************************************
-// CORBA_AttrDescriptionSeq
-// *************************************************************
+                                // *************************************************************
+                                // CORBA_AttrDescriptionSeq
+                                // *************************************************************
 
-class TAO_IFR_Client_Export CORBA_AttrDescriptionSeq : public 
+                                class TAO_IFR_Client_Export CORBA_AttrDescriptionSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq
+                                _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_AttributeDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-{
-public:
-  CORBA_AttrDescriptionSeq (void); // default ctor
-  CORBA_AttrDescriptionSeq (CORBA::ULong max); // uses max size
-  CORBA_AttrDescriptionSeq (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    CORBA_AttributeDescription *buffer, 
-    CORBA::Boolean release = 0
-  );
-  CORBA_AttrDescriptionSeq (const CORBA_AttrDescriptionSeq &); // copy ctor
-  ~CORBA_AttrDescriptionSeq (void);
-  static void _tao_any_destructor (void*);
+                                TAO_Unbounded_Sequence<CORBA_AttributeDescription>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+                                {
+                                public:
+                                  CORBA_AttrDescriptionSeq (void); // default ctor
+                                  CORBA_AttrDescriptionSeq (CORBA::ULong max); // uses max size
+                                  CORBA_AttrDescriptionSeq (
+                                      CORBA::ULong max,
+                                      CORBA::ULong length,
+                                      CORBA_AttributeDescription *buffer,
+                                      CORBA::Boolean release = 0
+                                    );
+                                  CORBA_AttrDescriptionSeq (const CORBA_AttrDescriptionSeq &); // copy ctor
+                                  ~CORBA_AttrDescriptionSeq (void);
+                                  static void _tao_any_destructor (void*);
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_AttrDescriptionSeq_var _var_type;
+                                  typedef CORBA_AttrDescriptionSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-};
+
+                                };
 
 #endif /* end #if !defined */
 
@@ -7079,41 +7252,41 @@ public:
 #if !defined (_CORBA_ATTRDESCRIPTIONSEQ___VAR_CH_)
 #define _CORBA_ATTRDESCRIPTIONSEQ___VAR_CH_
 
-// *************************************************************
-// class CORBA_AttrDescriptionSeq_var
-// *************************************************************
+                                // *************************************************************
+                                // class CORBA_AttrDescriptionSeq_var
+                                // *************************************************************
 
-class TAO_IFR_Client_Export CORBA_AttrDescriptionSeq_var
-{
-public:
-  CORBA_AttrDescriptionSeq_var (void); // default constructor
-  CORBA_AttrDescriptionSeq_var (CORBA_AttrDescriptionSeq *);
-  CORBA_AttrDescriptionSeq_var (const CORBA_AttrDescriptionSeq_var &); // copy constructor
-  ~CORBA_AttrDescriptionSeq_var (void); // destructor
-  
-  CORBA_AttrDescriptionSeq_var &operator= (CORBA_AttrDescriptionSeq *);
-  CORBA_AttrDescriptionSeq_var &operator= (const CORBA_AttrDescriptionSeq_var &);
-  CORBA_AttrDescriptionSeq *operator-> (void);
-  const CORBA_AttrDescriptionSeq *operator-> (void) const;
-  
-  operator const CORBA_AttrDescriptionSeq &() const;
-  operator CORBA_AttrDescriptionSeq &();
-  operator CORBA_AttrDescriptionSeq &() const;
-  operator CORBA_AttrDescriptionSeq *&(); // variable-size base types only
-  
-  CORBA_AttributeDescription & operator[] (CORBA::ULong index);
-  const CORBA_AttributeDescription & operator[] (CORBA::ULong index) const;
-  
-  // in, inout, out, _retn 
-  const CORBA_AttrDescriptionSeq &in (void) const;
-  CORBA_AttrDescriptionSeq &inout (void);
-  CORBA_AttrDescriptionSeq *&out (void);
-  CORBA_AttrDescriptionSeq *_retn (void);
-  CORBA_AttrDescriptionSeq *ptr (void) const;
+                                class TAO_IFR_Client_Export CORBA_AttrDescriptionSeq_var
+                                {
+                                public:
+                                  CORBA_AttrDescriptionSeq_var (void);
+                                  CORBA_AttrDescriptionSeq_var (CORBA_AttrDescriptionSeq *);
+                                  CORBA_AttrDescriptionSeq_var (const CORBA_AttrDescriptionSeq_var &);
+                                  ~CORBA_AttrDescriptionSeq_var (void);
 
-private:
-  CORBA_AttrDescriptionSeq *ptr_;
-};
+                                  CORBA_AttrDescriptionSeq_var &operator= (CORBA_AttrDescriptionSeq *);
+                                  CORBA_AttrDescriptionSeq_var &operator= (const CORBA_AttrDescriptionSeq_var &);
+                                  CORBA_AttrDescriptionSeq *operator-> (void);
+                                  const CORBA_AttrDescriptionSeq *operator-> (void) const;
+
+                                  operator const CORBA_AttrDescriptionSeq &() const;
+                                  operator CORBA_AttrDescriptionSeq &();
+                                  operator CORBA_AttrDescriptionSeq &() const;
+                                  operator CORBA_AttrDescriptionSeq *&(); // variable-size base types only
+
+                                  CORBA_AttributeDescription & operator[] (CORBA::ULong index);
+                                  const CORBA_AttributeDescription & operator[] (CORBA::ULong index) const;
+
+                                  // in, inout, out, _retn
+                                  const CORBA_AttrDescriptionSeq &in (void) const;
+                                  CORBA_AttrDescriptionSeq &inout (void);
+                                  CORBA_AttrDescriptionSeq *&out (void);
+                                  CORBA_AttrDescriptionSeq *_retn (void);
+                                  CORBA_AttrDescriptionSeq *ptr (void) const;
+
+                                private:
+                                  CORBA_AttrDescriptionSeq *ptr_;
+                                };
 
 
 #endif /* end #if !defined */
@@ -7122,24 +7295,24 @@ private:
 #if !defined (_CORBA_ATTRDESCRIPTIONSEQ___OUT_CH_)
 #define _CORBA_ATTRDESCRIPTIONSEQ___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_AttrDescriptionSeq_out
-{
-public:
-  CORBA_AttrDescriptionSeq_out (CORBA_AttrDescriptionSeq *&);
-  CORBA_AttrDescriptionSeq_out (CORBA_AttrDescriptionSeq_var &);
-  CORBA_AttrDescriptionSeq_out (const CORBA_AttrDescriptionSeq_out &);
-  CORBA_AttrDescriptionSeq_out &operator= (const CORBA_AttrDescriptionSeq_out &);
-  CORBA_AttrDescriptionSeq_out &operator= (CORBA_AttrDescriptionSeq *);
-  operator CORBA_AttrDescriptionSeq *&();
-  CORBA_AttrDescriptionSeq *&ptr (void);
-  CORBA_AttrDescriptionSeq *operator-> (void);
-  CORBA_AttributeDescription & operator[] (CORBA::ULong index);
-  
-private:
-  CORBA_AttrDescriptionSeq *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_AttrDescriptionSeq_var &);
-};
+                                class TAO_IFR_Client_Export CORBA_AttrDescriptionSeq_out
+                                {
+                                public:
+                                  CORBA_AttrDescriptionSeq_out (CORBA_AttrDescriptionSeq *&);
+                                  CORBA_AttrDescriptionSeq_out (CORBA_AttrDescriptionSeq_var &);
+                                  CORBA_AttrDescriptionSeq_out (const CORBA_AttrDescriptionSeq_out &);
+                                  CORBA_AttrDescriptionSeq_out &operator= (const CORBA_AttrDescriptionSeq_out &);
+                                  CORBA_AttrDescriptionSeq_out &operator= (CORBA_AttrDescriptionSeq *);
+                                  operator CORBA_AttrDescriptionSeq *&();
+                                  CORBA_AttrDescriptionSeq *&ptr (void);
+                                  CORBA_AttrDescriptionSeq *operator-> (void);
+                                  CORBA_AttributeDescription & operator[] (CORBA::ULong index);
+
+                                private:
+                                  CORBA_AttrDescriptionSeq *&ptr_;
+                                  // Assignment from T_var not allowed.
+                                  void operator= (const CORBA_AttrDescriptionSeq_var &);
+                                };
 
 
 #endif /* end #if !defined */
@@ -7148,8 +7321,8 @@ private:
 #if !defined (_CORBA_INTERFACEDEF___PTR_CH_)
 #define _CORBA_INTERFACEDEF___PTR_CH_
 
-class CORBA_InterfaceDef;
-typedef CORBA_InterfaceDef *CORBA_InterfaceDef_ptr;
+                                class CORBA_InterfaceDef;
+                                typedef CORBA_InterfaceDef *CORBA_InterfaceDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -7157,41 +7330,44 @@ typedef CORBA_InterfaceDef *CORBA_InterfaceDef_ptr;
 #if !defined (_CORBA_INTERFACEDEF___VAR_CH_)
 #define _CORBA_INTERFACEDEF___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_InterfaceDef_var : public TAO_Base_var
-{
-public:
-  CORBA_InterfaceDef_var (void); // default constructor
-  CORBA_InterfaceDef_var (CORBA_InterfaceDef_ptr p) : ptr_ (p) {} 
-  CORBA_InterfaceDef_var (const CORBA_InterfaceDef_var &); // copy constructor
-  ~CORBA_InterfaceDef_var (void); // destructor
-  
-  CORBA_InterfaceDef_var &operator= (CORBA_InterfaceDef_ptr);
-  CORBA_InterfaceDef_var &operator= (const CORBA_InterfaceDef_var &);
-  CORBA_InterfaceDef_ptr operator-> (void) const;
-  
-  operator const CORBA_InterfaceDef_ptr &() const;
-  operator CORBA_InterfaceDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_InterfaceDef_ptr in (void) const;
-  CORBA_InterfaceDef_ptr &inout (void);
-  CORBA_InterfaceDef_ptr &out (void);
-  CORBA_InterfaceDef_ptr _retn (void);
-  CORBA_InterfaceDef_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_InterfaceDef_ptr duplicate (CORBA_InterfaceDef_ptr);
-  static void release (CORBA_InterfaceDef_ptr);
-  static CORBA_InterfaceDef_ptr nil (void);
-  static CORBA_InterfaceDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
-
-private:
-  CORBA_InterfaceDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_InterfaceDef_var (const TAO_Base_var &rhs);
-  CORBA_InterfaceDef_var &operator= (const TAO_Base_var &rhs);
-};
+                                class TAO_IFR_Client_Export CORBA_InterfaceDef_var : public TAO_Base_var
+                                {
+                                public:
+                                  CORBA_InterfaceDef_var (void); // default constructor
+                                  CORBA_InterfaceDef_var (CORBA_InterfaceDef_ptr p) : ptr_ (p) {}
+                                  CORBA_InterfaceDef_var (const CORBA_InterfaceDef_var &); // copy constructor
+                                  ~CORBA_InterfaceDef_var (void); // destructor
+
+                                  CORBA_InterfaceDef_var &operator= (CORBA_InterfaceDef_ptr);
+                                  CORBA_InterfaceDef_var &operator= (const CORBA_InterfaceDef_var &);
+                                  CORBA_InterfaceDef_ptr operator-> (void) const;
+
+                                  operator const CORBA_InterfaceDef_ptr &() const;
+                                  operator CORBA_InterfaceDef_ptr &();
+                                  // in, inout, out, _retn
+                                  CORBA_InterfaceDef_ptr in (void) const;
+                                  CORBA_InterfaceDef_ptr &inout (void);
+                                  CORBA_InterfaceDef_ptr &out (void);
+                                  CORBA_InterfaceDef_ptr _retn (void);
+                                  CORBA_InterfaceDef_ptr ptr (void) const;
+
+                                  // Hooks used by template sequence and object manager classes
+                                  // for non-defined forward declared interfaces.
+                                  static CORBA_InterfaceDef_ptr duplicate (CORBA_InterfaceDef_ptr);
+                                  static void release (CORBA_InterfaceDef_ptr);
+                                  static CORBA_InterfaceDef_ptr nil (void);
+                                  static CORBA_InterfaceDef_ptr narrow (
+                                      CORBA::Object *,
+                                      CORBA::Environment &
+                                    );
+                                  static CORBA::Object * upcast (void *);
+
+                                private:
+                                  CORBA_InterfaceDef_ptr ptr_;
+                                  // Unimplemented - prevents widening assignment.
+                                  CORBA_InterfaceDef_var (const TAO_Base_var &rhs);
+                                  CORBA_InterfaceDef_var &operator= (const TAO_Base_var &rhs);
+                                };
 
 
 #endif /* end #if !defined */
@@ -7200,22 +7376,22 @@ private:
 #if !defined (_CORBA_INTERFACEDEF___OUT_CH_)
 #define _CORBA_INTERFACEDEF___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_InterfaceDef_out
-{
-public:
-  CORBA_InterfaceDef_out (CORBA_InterfaceDef_ptr &);
-  CORBA_InterfaceDef_out (CORBA_InterfaceDef_var &);
-  CORBA_InterfaceDef_out (const CORBA_InterfaceDef_out &);
-  CORBA_InterfaceDef_out &operator= (const CORBA_InterfaceDef_out &);
-  CORBA_InterfaceDef_out &operator= (const CORBA_InterfaceDef_var &);
-  CORBA_InterfaceDef_out &operator= (CORBA_InterfaceDef_ptr);
-  operator CORBA_InterfaceDef_ptr &();
-  CORBA_InterfaceDef_ptr &ptr (void);
-  CORBA_InterfaceDef_ptr operator-> (void);
+                                class TAO_IFR_Client_Export CORBA_InterfaceDef_out
+                                {
+                                public:
+                                  CORBA_InterfaceDef_out (CORBA_InterfaceDef_ptr &);
+                                  CORBA_InterfaceDef_out (CORBA_InterfaceDef_var &);
+                                  CORBA_InterfaceDef_out (const CORBA_InterfaceDef_out &);
+                                  CORBA_InterfaceDef_out &operator= (const CORBA_InterfaceDef_out &);
+                                  CORBA_InterfaceDef_out &operator= (const CORBA_InterfaceDef_var &);
+                                  CORBA_InterfaceDef_out &operator= (CORBA_InterfaceDef_ptr);
+                                  operator CORBA_InterfaceDef_ptr &();
+                                  CORBA_InterfaceDef_ptr &ptr (void);
+                                  CORBA_InterfaceDef_ptr operator-> (void);
 
-private:
-  CORBA_InterfaceDef_ptr &ptr_;
-};
+                                private:
+                                  CORBA_InterfaceDef_ptr &ptr_;
+                                };
 
 
 #endif /* end #if !defined */
@@ -7224,1483 +7400,1499 @@ private:
 #if !defined (_CORBA_INTERFACEDEF_CH_)
 #define _CORBA_INTERFACEDEF_CH_
 
-// Forward Classes Declaration
-class _TAO_CORBA_InterfaceDef_Proxy_Impl;
-class _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl;
-class _TAO_CORBA_InterfaceDef_Proxy_Broker;
-class _TAO_CORBA_InterfaceDef_Remote_Proxy_Broker;
+                                // Forward Classes Declaration
+                                class _TAO_CORBA_InterfaceDef_Proxy_Impl;
+                                class _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl;
+                                class _TAO_CORBA_InterfaceDef_Proxy_Broker;
+                                class _TAO_CORBA_InterfaceDef_Remote_Proxy_Broker;
+
+                                class TAO_IFR_Client_Export CORBA_InterfaceDef
+                                  : public virtual CORBA_Container,
+                                    public virtual CORBA_Contained,
+                                    public virtual CORBA_IDLType
+                                {
+                                public:
+                                #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+                                  typedef CORBA_InterfaceDef_ptr _ptr_type;
+                                  typedef CORBA_InterfaceDef_var _var_type;
+                                #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+                                  // the static operations
+                                  static CORBA_InterfaceDef_ptr _duplicate (CORBA_InterfaceDef_ptr obj);
+
+                                  static CORBA_InterfaceDef_ptr _narrow (
+                                      CORBA::Object_ptr obj,
+                                      CORBA::Environment &ACE_TRY_ENV =
+                                        TAO_default_environment ()
+                                    );
+
+                                  static CORBA_InterfaceDef_ptr _unchecked_narrow (
+                                      CORBA::Object_ptr obj,
+                                      CORBA::Environment &ACE_TRY_ENV =
+                                        TAO_default_environment ()
+                                    );
+
+                                  static CORBA_InterfaceDef_ptr _nil (void)
+                                    {
+                                      return (CORBA_InterfaceDef_ptr)0;
+                                    }
+
+                                  static void _tao_any_destructor (void*);
+
+                                  virtual CORBA_InterfaceDefSeq * base_interfaces (
+                                      CORBA::Environment &ACE_TRY_ENV =
+                                        TAO_default_environment ()
+                                    )
+                                    ACE_THROW_SPEC ((
+                                      CORBA::SystemException
+                                    ));
+
+                                  virtual void base_interfaces (
+                                      const CORBA_InterfaceDefSeq & base_interfaces,
+                                      CORBA::Environment &ACE_TRY_ENV =
+                                        TAO_default_environment ()
+                                    )
+                                    ACE_THROW_SPEC ((
+                                      CORBA::SystemException
+                                    ));
+
+                                  virtual CORBA::Boolean is_a (
+                                      const char * interface_id,
+                                      CORBA::Environment &ACE_TRY_ENV =
+                                        TAO_default_environment ()
+                                    )
+                                    ACE_THROW_SPEC ((
+                                      CORBA::SystemException
+                                    ));
+
+                                  struct FullInterfaceDescription;
+                                  class FullInterfaceDescription_var;
+
+                                  struct TAO_IFR_Client_Export FullInterfaceDescription
+                                  {
 
-class TAO_IFR_Client_Export CORBA_InterfaceDef: public virtual CORBA_Container, public virtual CORBA_Contained, public virtual CORBA_IDLType
-{
-public:
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_InterfaceDef_ptr _ptr_type;
-  typedef CORBA_InterfaceDef_var _var_type;
+                                    typedef FullInterfaceDescription_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-  // the static operations
-  static CORBA_InterfaceDef_ptr _duplicate (CORBA_InterfaceDef_ptr obj);
-  static CORBA_InterfaceDef_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_InterfaceDef_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_InterfaceDef_ptr _nil (void)
-    {
-      return (CORBA_InterfaceDef_ptr)0;
-    }
+                                    static void _tao_any_destructor (void*);
+
+                                    TAO_String_Manager name;
+                                    TAO_String_Manager id;
+                                    TAO_String_Manager defined_in;
+                                    TAO_String_Manager version;
+                                    CORBA_OpDescriptionSeq operations;
+                                    CORBA_AttrDescriptionSeq attributes;
+                                    CORBA_RepositoryIdSeq base_interfaces;
+                                    CORBA::TypeCode_var type;
+
+                                  };
+
+                                  class TAO_IFR_Client_Export FullInterfaceDescription_var
+                                  {
+                                  public:
+                                    FullInterfaceDescription_var (void);
+                                    FullInterfaceDescription_var (FullInterfaceDescription *);
+                                    FullInterfaceDescription_var (const FullInterfaceDescription_var &);
+                                    ~FullInterfaceDescription_var (void);
+
+                                    FullInterfaceDescription_var &operator= (FullInterfaceDescription *);
+                                    FullInterfaceDescription_var &operator= (const FullInterfaceDescription_var &);
+                                    FullInterfaceDescription *operator-> (void);
+                                    const FullInterfaceDescription *operator-> (void) const;
+
+                                    operator const FullInterfaceDescription &() const;
+                                    operator FullInterfaceDescription &();
+                                    operator FullInterfaceDescription &() const;
+                                    // Variable-size types only.
+                                    operator FullInterfaceDescription *&();
+
+                                    // in, inout, out, _retn
+                                    const FullInterfaceDescription &in (void) const;
+                                    FullInterfaceDescription &inout (void);
+                                    FullInterfaceDescription *&out (void);
+                                    FullInterfaceDescription *_retn (void);
+                                    FullInterfaceDescription *ptr (void) const;
+
+                                  private:
+                                    FullInterfaceDescription *ptr_;
+                                  };
+
+                                  class TAO_IFR_Client_Export FullInterfaceDescription_out
+                                  {
+                                  public:
+                                    FullInterfaceDescription_out (FullInterfaceDescription *&);
+                                    FullInterfaceDescription_out (FullInterfaceDescription_var &);
+                                    FullInterfaceDescription_out (const FullInterfaceDescription_out &);
+                                    FullInterfaceDescription_out &operator= (const FullInterfaceDescription_out &);
+                                    FullInterfaceDescription_out &operator= (FullInterfaceDescription *);
+                                    operator FullInterfaceDescription *&();
+                                    FullInterfaceDescription *&ptr (void);
+                                    FullInterfaceDescription *operator-> (void);
+
+                                  private:
+                                    FullInterfaceDescription *&ptr_;
+                                    // Assignment from T_var not allowed.
+                                    void operator= (const FullInterfaceDescription_var &);
+                                  };
+
+
+                                  static CORBA::TypeCode_ptr _tc_FullInterfaceDescription;
+
+                                  virtual CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
+                                      CORBA::Environment &ACE_TRY_ENV =
+                                        TAO_default_environment ()
+                                    )
+                                    ACE_THROW_SPEC ((
+                                      CORBA::SystemException
+                                    ));
+
+                                  virtual CORBA_AttributeDef_ptr create_attribute (
+                                      const char * id,
+                                      const char * name,
+                                      const char * version,
+                                      CORBA_IDLType_ptr type,
+                                      CORBA::AttributeMode mode,
+                                      CORBA::Environment &ACE_TRY_ENV =
+                                        TAO_default_environment ()
+                                    )
+                                    ACE_THROW_SPEC ((
+                                      CORBA::SystemException
+                                    ));
+
+                                  virtual CORBA_OperationDef_ptr create_operation (
+                                      const char * id,
+                                      const char * name,
+                                      const char * version,
+                                      CORBA_IDLType_ptr result,
+                                      CORBA::OperationMode mode,
+                                      const CORBA_ParDescriptionSeq & params,
+                                      const CORBA_ExceptionDefSeq & exceptions,
+                                      const CORBA_ContextIdSeq & contexts,
+                                      CORBA::Environment &ACE_TRY_ENV =
+                                        TAO_default_environment ()
+                                    )
+                                    ACE_THROW_SPEC ((
+                                      CORBA::SystemException
+                                    ));
+
+                                  virtual CORBA::Boolean _is_a (
+                                      const CORBA::Char *type_id,
+                                      CORBA::Environment &ACE_TRY_ENV =
+                                        TAO_default_environment ()
+                                    );
+
+                                  virtual void *_tao_QueryInterface (ptr_arith_t type);
+
+                                  virtual const char* _interface_repository_id (void) const;
+
+                                private:
+                                  _TAO_CORBA_InterfaceDef_Proxy_Broker *the_TAO_CORBA_InterfaceDef_Proxy_Broker_;
+
+                                protected:
+                                  CORBA_InterfaceDef (int collocated = 0);
+
+                                  // This methods travese the inheritance tree and set the
+                                  // parents piece of the given class in the right mode
+                                  virtual void CORBA_InterfaceDef_setup_collocation (int collocated);
+
+                                  CORBA_InterfaceDef (
+                                      TAO_Stub *objref,
+                                      CORBA::Boolean _tao_collocated = 0,
+                                      TAO_Abstract_ServantBase *servant = 0
+                                    );
+
+                                  friend class _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl;
+                                  friend class _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl;
+                                  friend class _TAO_CORBA_InterfaceDef_Direct_Proxy_Impl;
+
+                                  virtual ~CORBA_InterfaceDef (void);
+
+                                private:
+                                  CORBA_InterfaceDef (const CORBA_InterfaceDef &);
+                                  void operator= (const CORBA_InterfaceDef &);
+                                };
+
+                                // The Proxy Implementations are used by each interface to
+                                // perform a call. Each different implementation encapsulate
+                                // an invocation logics.
+
+
+                                ///////////////////////////////////////////////////////////////////////
+                                //                    Base Proxy Impl. Declaration
+                                //
+
+                                class TAO_IFR_Client_Export _TAO_CORBA_InterfaceDef_Proxy_Impl
+                                  : public virtual _TAO_CORBA_Container_Proxy_Impl,
+                                    public virtual _TAO_CORBA_Contained_Proxy_Impl,
+                                    public virtual _TAO_CORBA_IDLType_Proxy_Impl
+                                {
+                                public:
+                                  virtual ~_TAO_CORBA_InterfaceDef_Proxy_Impl (void) { }
+                                  virtual CORBA_InterfaceDefSeq * base_interfaces (
+                                      CORBA_Object *_collocated_tao_target_,
+                                      CORBA::Environment &ACE_TRY_ENV
+                                    )
+                                    ACE_THROW_SPEC ((
+                                      CORBA::SystemException
+                                    )) = 0;
+
+                                  virtual void base_interfaces (
+                                      CORBA_Object *_collocated_tao_target_,
+                                      const CORBA_InterfaceDefSeq & base_interfaces,
+                                      CORBA::Environment &ACE_TRY_ENV
+                                    )
+                                    ACE_THROW_SPEC ((
+                                      CORBA::SystemException
+                                    )) = 0;
+
+                                  virtual CORBA::Boolean is_a (
+                                      CORBA_Object *_collocated_tao_target_,
+                                      const char * interface_id,
+                                      CORBA::Environment &ACE_TRY_ENV
+                                    )
+                                    ACE_THROW_SPEC ((
+                                      CORBA::SystemException
+                                    )) = 0;
+
+                                  virtual CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
+                                      CORBA_Object *_collocated_tao_target_,
+                                      CORBA::Environment &ACE_TRY_ENV
+                                    )
+                                    ACE_THROW_SPEC ((
+                                      CORBA::SystemException
+                                    )) = 0;
+
+                                  virtual CORBA_AttributeDef_ptr create_attribute (
+                                      CORBA_Object *_collocated_tao_target_,
+                                      const char * id,
+                                      const char * name,
+                                      const char * version,
+                                      CORBA_IDLType_ptr type,
+                                      CORBA::AttributeMode mode,
+                                      CORBA::Environment &ACE_TRY_ENV
+                                    )
+                                    ACE_THROW_SPEC ((
+                                      CORBA::SystemException
+                                    )) = 0;
+
+                                  virtual CORBA_OperationDef_ptr create_operation (
+                                      CORBA_Object *_collocated_tao_target_,
+                                      const char * id,
+                                      const char * name,
+                                      const char * version,
+                                      CORBA_IDLType_ptr result,
+                                      CORBA::OperationMode mode,
+                                      const CORBA_ParDescriptionSeq & params,
+                                      const CORBA_ExceptionDefSeq & exceptions,
+                                      const CORBA_ContextIdSeq & contexts,
+                                      CORBA::Environment &ACE_TRY_ENV
+                                    )
+                                    ACE_THROW_SPEC ((
+                                      CORBA::SystemException
+                                    )) = 0;
+
+
+                                protected:
+                                  _TAO_CORBA_InterfaceDef_Proxy_Impl (void);
+                                };
+
+                                //
+                                //               End Base Proxy Impl. Declaration
+                                ///////////////////////////////////////////////////////////////////////
+
+
+                                ///////////////////////////////////////////////////////////////////////
+                                //                Remote Proxy Impl. Declaration
+                                //
+
+                                class TAO_IFR_Client_Export _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl
+                                  : public virtual _TAO_CORBA_InterfaceDef_Proxy_Impl,
+                                    public virtual TAO_Remote_Object_Proxy_Impl,
+                                    public virtual _TAO_CORBA_Container_Remote_Proxy_Impl,
+                                    public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl,
+                                    public virtual _TAO_CORBA_IDLType_Remote_Proxy_Impl
+                                {
+                                public:
+                                  _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl (void);
+
+                                  virtual ~_TAO_CORBA_InterfaceDef_Remote_Proxy_Impl (void) { }
+                                  virtual CORBA_InterfaceDefSeq * base_interfaces (
+                                      CORBA_Object *_collocated_tao_target_,
+                                      CORBA::Environment &ACE_TRY_ENV
+                                    )
+                                    ACE_THROW_SPEC ((
+                                      CORBA::SystemException
+                                    ));
+
+                                  virtual void base_interfaces (
+                                      CORBA_Object *_collocated_tao_target_,
+                                      const CORBA_InterfaceDefSeq & base_interfaces,
+                                      CORBA::Environment &ACE_TRY_ENV
+                                    )
+                                    ACE_THROW_SPEC ((
+                                      CORBA::SystemException
+                                    ));
+
+                                  virtual CORBA::Boolean is_a (
+                                      CORBA_Object *_collocated_tao_target_,
+                                      const char * interface_id,
+                                      CORBA::Environment &ACE_TRY_ENV
+                                    )
+                                    ACE_THROW_SPEC ((
+                                      CORBA::SystemException
+                                    ));
+
+                                  virtual CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
+                                      CORBA_Object *_collocated_tao_target_,
+                                      CORBA::Environment &ACE_TRY_ENV
+                                    )
+                                    ACE_THROW_SPEC ((
+                                      CORBA::SystemException
+                                    ));
+
+                                  virtual CORBA_AttributeDef_ptr create_attribute (
+                                      CORBA_Object *_collocated_tao_target_,
+                                      const char * id,
+                                      const char * name,
+                                      const char * version,
+                                      CORBA_IDLType_ptr type,
+                                      CORBA::AttributeMode mode,
+                                      CORBA::Environment &ACE_TRY_ENV
+                                    )
+                                    ACE_THROW_SPEC ((
+                                      CORBA::SystemException
+                                    ));
+
+                                  virtual CORBA_OperationDef_ptr create_operation (
+                                      CORBA_Object *_collocated_tao_target_,
+                                      const char * id,
+                                      const char * name,
+                                      const char * version,
+                                      CORBA_IDLType_ptr result,
+                                      CORBA::OperationMode mode,
+                                      const CORBA_ParDescriptionSeq & params,
+                                      const CORBA_ExceptionDefSeq & exceptions,
+                                      const CORBA_ContextIdSeq & contexts,
+                                      CORBA::Environment &ACE_TRY_ENV
+                                    )
+                                    ACE_THROW_SPEC ((
+                                      CORBA::SystemException
+                                    ));
+
+
+                                };
+
+                                //
+                                //             End Remote Proxy Impl. Declaration
+                                ///////////////////////////////////////////////////////////////////////
+
+                                // The Proxy Brokers are used by each interface to get
+                                // the right proxy for performing a call. In the new
+                                // collocation scheme, the proxy to be used can vary on
+                                // a call by call basis.
+
+
+                                ///////////////////////////////////////////////////////////////////////
+                                //                 Base Proxy Broker Declaration
+                                //
+
+                                                                class TAO_IFR_Client_Export _TAO_CORBA_InterfaceDef_Proxy_Broker
+                                {
+                                public:
+                                  virtual ~_TAO_CORBA_InterfaceDef_Proxy_Broker (void);
+                                  virtual _TAO_CORBA_InterfaceDef_Proxy_Impl &select_proxy (
+                                      CORBA_InterfaceDef *object,
+                                      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                    ) = 0;
+
+                                protected:
+                                  _TAO_CORBA_InterfaceDef_Proxy_Broker (void);
+
+                                };
+
+                                //
+                                //              End Base Proxy Broker Declaration
+                                ///////////////////////////////////////////////////////////////////////
+
+
+                                ///////////////////////////////////////////////////////////////////////
+                                //                 Remote Proxy Broker Declaration
+                                //
+
+                                class TAO_IFR_Client_Export _TAO_CORBA_InterfaceDef_Remote_Proxy_Broker
+                                  : public virtual _TAO_CORBA_InterfaceDef_Proxy_Broker
+                                {
+                                public:
+                                  _TAO_CORBA_InterfaceDef_Remote_Proxy_Broker (void);
+
+                                  virtual ~_TAO_CORBA_InterfaceDef_Remote_Proxy_Broker (void);
+
+                                  virtual _TAO_CORBA_InterfaceDef_Proxy_Impl &select_proxy (
+                                      CORBA_InterfaceDef *object,
+                                      CORBA_Environment &ACE_TRY_ENV
+                                    );
+
+                                  private:
+                                    _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl remote_proxy_impl_;
+
+                                  public:
+                                    // This member function is used to get an handle to the unique instance
+                                    // of the Remote Proxy Broker that is available for a given
+                                    // interface.
+                                    static _TAO_CORBA_InterfaceDef_Remote_Proxy_Broker *the_TAO_CORBA_InterfaceDef_Remote_Proxy_Broker (void);
+                                  };
+
+                                  //
+                                  //              End Remote Proxy Broker Declaration
+                                  ///////////////////////////////////////////////////////////////////////
 
-  static void _tao_any_destructor (void*);
 
-  virtual CORBA_InterfaceDefSeq * base_interfaces (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+#endif /* end #if !defined */
 
-  virtual void base_interfaces (
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
 
-  virtual CORBA::Boolean is_a (
-      const char * interface_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+                                  struct CORBA_InterfaceDescription;
+                                  class CORBA_InterfaceDescription_var;
 
-  struct FullInterfaceDescription;
-  class FullInterfaceDescription_var;
-  
-  struct TAO_IFR_Client_Export FullInterfaceDescription
-  {
+                                  struct TAO_IFR_Client_Export CORBA_InterfaceDescription
+                                  {
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef FullInterfaceDescription_var _var_type;
+                                    typedef CORBA_InterfaceDescription_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-    static void _tao_any_destructor (void*);
+                                    static void _tao_any_destructor (void*);
+
+                                    TAO_String_Manager name;
+                                    TAO_String_Manager id;
+                                    TAO_String_Manager defined_in;
+                                    TAO_String_Manager version;
+                                    CORBA_RepositoryIdSeq base_interfaces;
+
+                                  };
+
+                                  class TAO_IFR_Client_Export CORBA_InterfaceDescription_var
+                                  {
+                                  public:
+                                    CORBA_InterfaceDescription_var (void);
+                                    CORBA_InterfaceDescription_var (CORBA_InterfaceDescription *);
+                                    CORBA_InterfaceDescription_var (const CORBA_InterfaceDescription_var &);
+                                    ~CORBA_InterfaceDescription_var (void);
+
+                                    CORBA_InterfaceDescription_var &operator= (CORBA_InterfaceDescription *);
+                                    CORBA_InterfaceDescription_var &operator= (const CORBA_InterfaceDescription_var &);
+                                    CORBA_InterfaceDescription *operator-> (void);
+                                    const CORBA_InterfaceDescription *operator-> (void) const;
+
+                                    operator const CORBA_InterfaceDescription &() const;
+                                    operator CORBA_InterfaceDescription &();
+                                    operator CORBA_InterfaceDescription &() const;
+                                    // Variable-size types only.
+                                    operator CORBA_InterfaceDescription *&();
+
+                                    // in, inout, out, _retn
+                                    const CORBA_InterfaceDescription &in (void) const;
+                                    CORBA_InterfaceDescription &inout (void);
+                                    CORBA_InterfaceDescription *&out (void);
+                                    CORBA_InterfaceDescription *_retn (void);
+                                    CORBA_InterfaceDescription *ptr (void) const;
+
+                                  private:
+                                    CORBA_InterfaceDescription *ptr_;
+                                  };
+
+                                  class TAO_IFR_Client_Export CORBA_InterfaceDescription_out
+                                  {
+                                  public:
+                                    CORBA_InterfaceDescription_out (CORBA_InterfaceDescription *&);
+                                    CORBA_InterfaceDescription_out (CORBA_InterfaceDescription_var &);
+                                    CORBA_InterfaceDescription_out (const CORBA_InterfaceDescription_out &);
+                                    CORBA_InterfaceDescription_out &operator= (const CORBA_InterfaceDescription_out &);
+                                    CORBA_InterfaceDescription_out &operator= (CORBA_InterfaceDescription *);
+                                    operator CORBA_InterfaceDescription *&();
+                                    CORBA_InterfaceDescription *&ptr (void);
+                                    CORBA_InterfaceDescription *operator-> (void);
+
+                                  private:
+                                    CORBA_InterfaceDescription *&ptr_;
+                                    // Assignment from T_var not allowed.
+                                    void operator= (const CORBA_InterfaceDescription_var &);
+                                  };
 
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
-    CORBA_OpDescriptionSeq operations;
-    CORBA_AttrDescriptionSeq attributes;
-    CORBA_RepositoryIdSeq base_interfaces;
-    CORBA::TypeCode_var type;
-  };
 
-  class TAO_IFR_Client_Export FullInterfaceDescription_var
-  {
-  public:
-    FullInterfaceDescription_var (void); // default constructor
-    FullInterfaceDescription_var (FullInterfaceDescription *);
-    FullInterfaceDescription_var (const FullInterfaceDescription_var &); // copy constructor
-    ~FullInterfaceDescription_var (void); // destructor
-    
-    FullInterfaceDescription_var &operator= (FullInterfaceDescription *);
-    FullInterfaceDescription_var &operator= (const FullInterfaceDescription_var &);
-    FullInterfaceDescription *operator-> (void);
-    const FullInterfaceDescription *operator-> (void) const;
-    
-    operator const FullInterfaceDescription &() const;
-    operator FullInterfaceDescription &();
-    operator FullInterfaceDescription &() const;
-    operator FullInterfaceDescription *&(); // variable-size types only
-    
-    // in, inout, out, _retn 
-    const FullInterfaceDescription &in (void) const;
-    FullInterfaceDescription &inout (void);
-    FullInterfaceDescription *&out (void);
-    FullInterfaceDescription *_retn (void);
-    FullInterfaceDescription *ptr (void) const;
 
-  private:
-    FullInterfaceDescription *ptr_;
-  };
+#if !defined (_CORBA_ABSTRACTINTERFACEDEF___PTR_CH_)
+#define _CORBA_ABSTRACTINTERFACEDEF___PTR_CH_
 
-  class TAO_IFR_Client_Export FullInterfaceDescription_out
-  {
-  public:
-    FullInterfaceDescription_out (FullInterfaceDescription *&);
-    FullInterfaceDescription_out (FullInterfaceDescription_var &);
-    FullInterfaceDescription_out (const FullInterfaceDescription_out &);
-    FullInterfaceDescription_out &operator= (const FullInterfaceDescription_out &);
-    FullInterfaceDescription_out &operator= (FullInterfaceDescription *);
-    operator FullInterfaceDescription *&();
-    FullInterfaceDescription *&ptr (void);
-    FullInterfaceDescription *operator-> (void);
-    
-  private:
-    FullInterfaceDescription *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const FullInterfaceDescription_var &);
-  };
+                                  class CORBA_AbstractInterfaceDef;
+                                  typedef CORBA_AbstractInterfaceDef *CORBA_AbstractInterfaceDef_ptr;
 
-  static CORBA::TypeCode_ptr _tc_FullInterfaceDescription;
+#endif /* end #if !defined */
 
-  virtual CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
 
-  virtual CORBA_AttributeDef_ptr create_attribute (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+#if !defined (_CORBA_ABSTRACTINTERFACEDEF___VAR_CH_)
+#define _CORBA_ABSTRACTINTERFACEDEF___VAR_CH_
 
-  virtual CORBA_OperationDef_ptr create_operation (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr result,
-      CORBA::OperationMode mode,
-      const CORBA_ParDescriptionSeq & params,
-      const CORBA_ExceptionDefSeq & exceptions,
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+                                  class TAO_IFR_Client_Export CORBA_AbstractInterfaceDef_var : public TAO_Base_var
+                                  {
+                                  public:
+                                    CORBA_AbstractInterfaceDef_var (void); // default constructor
+                                    CORBA_AbstractInterfaceDef_var (CORBA_AbstractInterfaceDef_ptr p) : ptr_ (p) {}
+                                    CORBA_AbstractInterfaceDef_var (const CORBA_AbstractInterfaceDef_var &); // copy constructor
+                                    ~CORBA_AbstractInterfaceDef_var (void); // destructor
+
+                                    CORBA_AbstractInterfaceDef_var &operator= (CORBA_AbstractInterfaceDef_ptr);
+                                    CORBA_AbstractInterfaceDef_var &operator= (const CORBA_AbstractInterfaceDef_var &);
+                                    CORBA_AbstractInterfaceDef_ptr operator-> (void) const;
+
+                                    operator const CORBA_AbstractInterfaceDef_ptr &() const;
+                                    operator CORBA_AbstractInterfaceDef_ptr &();
+                                    // in, inout, out, _retn
+                                    CORBA_AbstractInterfaceDef_ptr in (void) const;
+                                    CORBA_AbstractInterfaceDef_ptr &inout (void);
+                                    CORBA_AbstractInterfaceDef_ptr &out (void);
+                                    CORBA_AbstractInterfaceDef_ptr _retn (void);
+                                    CORBA_AbstractInterfaceDef_ptr ptr (void) const;
+
+                                    // Hooks used by template sequence and object manager classes
+                                    // for non-defined forward declared interfaces.
+                                    static CORBA_AbstractInterfaceDef_ptr duplicate (CORBA_AbstractInterfaceDef_ptr);
+                                    static void release (CORBA_AbstractInterfaceDef_ptr);
+                                    static CORBA_AbstractInterfaceDef_ptr nil (void);
+                                    static CORBA_AbstractInterfaceDef_ptr narrow (
+                                        CORBA::Object *,
+                                        CORBA::Environment &
+                                      );
+                                    static CORBA::Object * upcast (void *);
+
+                                  private:
+                                    CORBA_AbstractInterfaceDef_ptr ptr_;
+                                    // Unimplemented - prevents widening assignment.
+                                    CORBA_AbstractInterfaceDef_var (const TAO_Base_var &rhs);
+                                    CORBA_AbstractInterfaceDef_var &operator= (const TAO_Base_var &rhs);
+                                  };
 
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
 
-private:
-  _TAO_CORBA_InterfaceDef_Proxy_Broker *the_TAO_CORBA_InterfaceDef_Proxy_Broker_;
-  
-protected:
-  CORBA_InterfaceDef (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void CORBA_InterfaceDef_setup_collocation (int collocated);
-    
-    CORBA_InterfaceDef (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl;
-    friend class _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_CORBA_InterfaceDef_Direct_Proxy_Impl;
-  
-  virtual ~CORBA_InterfaceDef (void);
-private:
-  CORBA_InterfaceDef (const CORBA_InterfaceDef &);
-  void operator= (const CORBA_InterfaceDef &);
-};
+#endif /* end #if !defined */
 
 
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
+#if !defined (_CORBA_ABSTRACTINTERFACEDEF___OUT_CH_)
+#define _CORBA_ABSTRACTINTERFACEDEF___OUT_CH_
 
+                                  class TAO_IFR_Client_Export CORBA_AbstractInterfaceDef_out
+                                  {
+                                  public:
+                                    CORBA_AbstractInterfaceDef_out (CORBA_AbstractInterfaceDef_ptr &);
+                                    CORBA_AbstractInterfaceDef_out (CORBA_AbstractInterfaceDef_var &);
+                                    CORBA_AbstractInterfaceDef_out (const CORBA_AbstractInterfaceDef_out &);
+                                    CORBA_AbstractInterfaceDef_out &operator= (const CORBA_AbstractInterfaceDef_out &);
+                                    CORBA_AbstractInterfaceDef_out &operator= (const CORBA_AbstractInterfaceDef_var &);
+                                    CORBA_AbstractInterfaceDef_out &operator= (CORBA_AbstractInterfaceDef_ptr);
+                                    operator CORBA_AbstractInterfaceDef_ptr &();
+                                    CORBA_AbstractInterfaceDef_ptr &ptr (void);
+                                    CORBA_AbstractInterfaceDef_ptr operator-> (void);
 
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
+                                  private:
+                                    CORBA_AbstractInterfaceDef_ptr &ptr_;
+                                  };
 
-class TAO_IFR_Client_Export _TAO_CORBA_InterfaceDef_Proxy_Impl : 
-  public virtual _TAO_CORBA_Container_Proxy_Impl, 
-  public virtual _TAO_CORBA_Contained_Proxy_Impl, 
-  public virtual _TAO_CORBA_IDLType_Proxy_Impl
-{
-public:
-  virtual ~_TAO_CORBA_InterfaceDef_Proxy_Impl (void) { }
-  
-    virtual CORBA_InterfaceDefSeq * base_interfaces (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
 
-  virtual void base_interfaces (
-      CORBA_Object *_collocated_tao_target_,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA::Boolean is_a (
-      CORBA_Object *_collocated_tao_target_,
-      const char * interface_id,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
+#endif /* end #if !defined */
 
-  virtual CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
 
-  virtual CORBA_AttributeDef_ptr create_attribute (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
+#if !defined (_CORBA_ABSTRACTINTERFACEDEF_CH_)
+#define _CORBA_ABSTRACTINTERFACEDEF_CH_
 
-  virtual CORBA_OperationDef_ptr create_operation (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr result,
-      CORBA::OperationMode mode,
-      const CORBA_ParDescriptionSeq & params,
-      const CORBA_ExceptionDefSeq & exceptions,
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
+                                  // Forward Classes Declaration
+                                  class _TAO_CORBA_AbstractInterfaceDef_Proxy_Impl;
+                                  class _TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Impl;
+                                  class _TAO_CORBA_AbstractInterfaceDef_Proxy_Broker;
+                                  class _TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker;
 
-protected:
-  _TAO_CORBA_InterfaceDef_Proxy_Impl (void);
+                                  class TAO_IFR_Client_Export CORBA_AbstractInterfaceDef
+                                    : public virtual CORBA_InterfaceDef
+                                  {
+                                  public:
+                                  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+                                    typedef CORBA_AbstractInterfaceDef_ptr _ptr_type;
+                                    typedef CORBA_AbstractInterfaceDef_var _var_type;
+                                  #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
+                                    // the static operations
+                                    static CORBA_AbstractInterfaceDef_ptr _duplicate (CORBA_AbstractInterfaceDef_ptr obj);
 
+                                    static CORBA_AbstractInterfaceDef_ptr _narrow (
+                                        CORBA::Object_ptr obj,
+                                        CORBA::Environment &ACE_TRY_ENV =
+                                          TAO_default_environment ()
+                                      );
 
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
+                                    static CORBA_AbstractInterfaceDef_ptr _unchecked_narrow (
+                                        CORBA::Object_ptr obj,
+                                        CORBA::Environment &ACE_TRY_ENV =
+                                          TAO_default_environment ()
+                                      );
 
-class TAO_IFR_Client_Export _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl : 
-  public virtual _TAO_CORBA_InterfaceDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_Container_Remote_Proxy_Impl, 
-  public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl, 
-  public virtual _TAO_CORBA_IDLType_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_CORBA_InterfaceDef_Remote_Proxy_Impl (void) { }
-  
-    virtual CORBA_InterfaceDefSeq * base_interfaces (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+                                    static CORBA_AbstractInterfaceDef_ptr _nil (void)
+                                      {
+                                        return (CORBA_AbstractInterfaceDef_ptr)0;
+                                      }
+
+                                    static void _tao_any_destructor (void*);
 
-  virtual void base_interfaces (
-      CORBA_Object *_collocated_tao_target_,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+                                    virtual CORBA::Boolean _is_a (
+                                        const CORBA::Char *type_id,
+                                        CORBA::Environment &ACE_TRY_ENV =
+                                          TAO_default_environment ()
+                                      );
 
-  virtual CORBA::Boolean is_a (
-      CORBA_Object *_collocated_tao_target_,
-      const char * interface_id,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+                                    virtual void *_tao_QueryInterface (ptr_arith_t type);
 
-  virtual CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_AttributeDef_ptr create_attribute (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+                                    virtual const char* _interface_repository_id (void) const;
 
-  virtual CORBA_OperationDef_ptr create_operation (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr result,
-      CORBA::OperationMode mode,
-      const CORBA_ParDescriptionSeq & params,
-      const CORBA_ExceptionDefSeq & exceptions,
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+                                  private:
+                                    _TAO_CORBA_AbstractInterfaceDef_Proxy_Broker *the_TAO_CORBA_AbstractInterfaceDef_Proxy_Broker_;
 
-};
+                                  protected:
+                                    CORBA_AbstractInterfaceDef (int collocated = 0);
 
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
+                                    // This methods travese the inheritance tree and set the
+                                    // parents piece of the given class in the right mode
+                                    virtual void CORBA_AbstractInterfaceDef_setup_collocation (int collocated);
 
+                                    CORBA_AbstractInterfaceDef (
+                                        TAO_Stub *objref,
+                                        CORBA::Boolean _tao_collocated = 0,
+                                        TAO_Abstract_ServantBase *servant = 0
+                                      );
 
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
+                                    friend class _TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Impl;
+                                    friend class _TAO_CORBA_AbstractInterfaceDef_ThruPOA_Proxy_Impl;
+                                    friend class _TAO_CORBA_AbstractInterfaceDef_Direct_Proxy_Impl;
 
+                                    virtual ~CORBA_AbstractInterfaceDef (void);
 
+                                  private:
+                                    CORBA_AbstractInterfaceDef (const CORBA_AbstractInterfaceDef &);
+                                    void operator= (const CORBA_AbstractInterfaceDef &);
+                                  };
 
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
+                                  // The Proxy Implementations are used by each interface to
+                                  // perform a call. Each different implementation encapsulate
+                                  // an invocation logics.
 
-class TAO_IFR_Client_Export _TAO_CORBA_InterfaceDef_Proxy_Broker
-{
-public:
-  virtual ~_TAO_CORBA_InterfaceDef_Proxy_Broker (void);
-  virtual _TAO_CORBA_InterfaceDef_Proxy_Impl &select_proxy (
-    CORBA_InterfaceDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
 
-protected:
-  _TAO_CORBA_InterfaceDef_Proxy_Broker (void);
-  
-};
+                                  ///////////////////////////////////////////////////////////////////////
+                                  //                    Base Proxy Impl. Declaration
+                                  //
 
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+                                  class TAO_IFR_Client_Export _TAO_CORBA_AbstractInterfaceDef_Proxy_Impl
+                                    : public virtual _TAO_CORBA_InterfaceDef_Proxy_Impl
+                                  {
+                                  public:
+                                    virtual ~_TAO_CORBA_AbstractInterfaceDef_Proxy_Impl (void) { }
 
+                                  protected:
+                                    _TAO_CORBA_AbstractInterfaceDef_Proxy_Impl (void);
+                                  };
 
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
+                                  //
+                                  //               End Base Proxy Impl. Declaration
+                                  ///////////////////////////////////////////////////////////////////////
 
-class TAO_IFR_Client_Export _TAO_CORBA_InterfaceDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_InterfaceDef_Proxy_Broker
-{
-public: 
-  _TAO_CORBA_InterfaceDef_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_CORBA_InterfaceDef_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_CORBA_InterfaceDef_Proxy_Impl &select_proxy (
-    CORBA_InterfaceDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
 
-private:
-  _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
+                                  ///////////////////////////////////////////////////////////////////////
+                                  //                Remote Proxy Impl. Declaration
+                                  //
 
-public:
-  static _TAO_CORBA_InterfaceDef_Remote_Proxy_Broker *the_TAO_CORBA_InterfaceDef_Remote_Proxy_Broker (void);
-};
+                                  class TAO_IFR_Client_Export _TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Impl
+                                    : public virtual _TAO_CORBA_AbstractInterfaceDef_Proxy_Impl,
+                                      public virtual TAO_Remote_Object_Proxy_Impl,
+                                      public virtual _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl
+                                  {
+                                  public:
+                                    _TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Impl (void);
 
+                                    virtual ~_TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Impl (void) { }
 
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+                                  };
 
+                                  //
+                                  //             End Remote Proxy Impl. Declaration
+                                  ///////////////////////////////////////////////////////////////////////
 
-#endif /* end #if !defined */
+                                  // The Proxy Brokers are used by each interface to get
+                                  // the right proxy for performing a call. In the new
+                                  // collocation scheme, the proxy to be used can vary on
+                                  // a call by call basis.
 
-struct CORBA_InterfaceDescription;
-class CORBA_InterfaceDescription_var;
 
-struct TAO_IFR_Client_Export CORBA_InterfaceDescription
-{
+                                  ///////////////////////////////////////////////////////////////////////
+                                  //                 Base Proxy Broker Declaration
+                                  //
 
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_InterfaceDescription_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
+                                                                    class TAO_IFR_Client_Export _TAO_CORBA_AbstractInterfaceDef_Proxy_Broker
+                                  {
+                                  public:
+                                    virtual ~_TAO_CORBA_AbstractInterfaceDef_Proxy_Broker (void);
+                                    virtual _TAO_CORBA_AbstractInterfaceDef_Proxy_Impl &select_proxy (
+                                        CORBA_AbstractInterfaceDef *object,
+                                        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                      ) = 0;
 
-  static void _tao_any_destructor (void*);
+                                  protected:
+                                    _TAO_CORBA_AbstractInterfaceDef_Proxy_Broker (void);
 
-  TAO_String_Manager name;
-  TAO_String_Manager id;
-  TAO_String_Manager defined_in;
-  TAO_String_Manager version;
-  CORBA_RepositoryIdSeq base_interfaces;
-};
+                                  };
 
-class TAO_IFR_Client_Export CORBA_InterfaceDescription_var
-{
-public:
-  CORBA_InterfaceDescription_var (void); // default constructor
-  CORBA_InterfaceDescription_var (CORBA_InterfaceDescription *);
-  CORBA_InterfaceDescription_var (const CORBA_InterfaceDescription_var &); // copy constructor
-  ~CORBA_InterfaceDescription_var (void); // destructor
-  
-  CORBA_InterfaceDescription_var &operator= (CORBA_InterfaceDescription *);
-  CORBA_InterfaceDescription_var &operator= (const CORBA_InterfaceDescription_var &);
-  CORBA_InterfaceDescription *operator-> (void);
-  const CORBA_InterfaceDescription *operator-> (void) const;
-  
-  operator const CORBA_InterfaceDescription &() const;
-  operator CORBA_InterfaceDescription &();
-  operator CORBA_InterfaceDescription &() const;
-  operator CORBA_InterfaceDescription *&(); // variable-size types only
-  
-  // in, inout, out, _retn 
-  const CORBA_InterfaceDescription &in (void) const;
-  CORBA_InterfaceDescription &inout (void);
-  CORBA_InterfaceDescription *&out (void);
-  CORBA_InterfaceDescription *_retn (void);
-  CORBA_InterfaceDescription *ptr (void) const;
+                                  //
+                                  //              End Base Proxy Broker Declaration
+                                  ///////////////////////////////////////////////////////////////////////
 
-private:
-  CORBA_InterfaceDescription *ptr_;
-};
 
-class TAO_IFR_Client_Export CORBA_InterfaceDescription_out
-{
-public:
-  CORBA_InterfaceDescription_out (CORBA_InterfaceDescription *&);
-  CORBA_InterfaceDescription_out (CORBA_InterfaceDescription_var &);
-  CORBA_InterfaceDescription_out (const CORBA_InterfaceDescription_out &);
-  CORBA_InterfaceDescription_out &operator= (const CORBA_InterfaceDescription_out &);
-  CORBA_InterfaceDescription_out &operator= (CORBA_InterfaceDescription *);
-  operator CORBA_InterfaceDescription *&();
-  CORBA_InterfaceDescription *&ptr (void);
-  CORBA_InterfaceDescription *operator-> (void);
-  
-private:
-  CORBA_InterfaceDescription *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_InterfaceDescription_var &);
-};
+                                  ///////////////////////////////////////////////////////////////////////
+                                  //                 Remote Proxy Broker Declaration
+                                  //
 
+                                  class TAO_IFR_Client_Export _TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker
+                                    : public virtual _TAO_CORBA_AbstractInterfaceDef_Proxy_Broker
+                                  {
+                                  public:
+                                    _TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker (void);
 
-#if !defined (_CORBA_ABSTRACTINTERFACEDEF___PTR_CH_)
-#define _CORBA_ABSTRACTINTERFACEDEF___PTR_CH_
+                                    virtual ~_TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker (void);
 
-class CORBA_AbstractInterfaceDef;
-typedef CORBA_AbstractInterfaceDef *CORBA_AbstractInterfaceDef_ptr;
+                                    virtual _TAO_CORBA_AbstractInterfaceDef_Proxy_Impl &select_proxy (
+                                        CORBA_AbstractInterfaceDef *object,
+                                        CORBA_Environment &ACE_TRY_ENV
+                                      );
 
-#endif /* end #if !defined */
+                                    private:
+                                      _TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Impl remote_proxy_impl_;
 
+                                    public:
+                                      // This member function is used to get an handle to the unique instance
+                                      // of the Remote Proxy Broker that is available for a given
+                                      // interface.
+                                      static _TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker *the_TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker (void);
+                                    };
 
-#if !defined (_CORBA_ABSTRACTINTERFACEDEF___VAR_CH_)
-#define _CORBA_ABSTRACTINTERFACEDEF___VAR_CH_
-
-class TAO_IFR_Client_Export CORBA_AbstractInterfaceDef_var : public TAO_Base_var
-{
-public:
-  CORBA_AbstractInterfaceDef_var (void); // default constructor
-  CORBA_AbstractInterfaceDef_var (CORBA_AbstractInterfaceDef_ptr p) : ptr_ (p) {} 
-  CORBA_AbstractInterfaceDef_var (const CORBA_AbstractInterfaceDef_var &); // copy constructor
-  ~CORBA_AbstractInterfaceDef_var (void); // destructor
-  
-  CORBA_AbstractInterfaceDef_var &operator= (CORBA_AbstractInterfaceDef_ptr);
-  CORBA_AbstractInterfaceDef_var &operator= (const CORBA_AbstractInterfaceDef_var &);
-  CORBA_AbstractInterfaceDef_ptr operator-> (void) const;
-  
-  operator const CORBA_AbstractInterfaceDef_ptr &() const;
-  operator CORBA_AbstractInterfaceDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_AbstractInterfaceDef_ptr in (void) const;
-  CORBA_AbstractInterfaceDef_ptr &inout (void);
-  CORBA_AbstractInterfaceDef_ptr &out (void);
-  CORBA_AbstractInterfaceDef_ptr _retn (void);
-  CORBA_AbstractInterfaceDef_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_AbstractInterfaceDef_ptr duplicate (CORBA_AbstractInterfaceDef_ptr);
-  static void release (CORBA_AbstractInterfaceDef_ptr);
-  static CORBA_AbstractInterfaceDef_ptr nil (void);
-  static CORBA_AbstractInterfaceDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
-
-private:
-  CORBA_AbstractInterfaceDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_AbstractInterfaceDef_var (const TAO_Base_var &rhs);
-  CORBA_AbstractInterfaceDef_var &operator= (const TAO_Base_var &rhs);
-};
+                                    //
+                                    //              End Remote Proxy Broker Declaration
+                                    ///////////////////////////////////////////////////////////////////////
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_ABSTRACTINTERFACEDEF___OUT_CH_)
-#define _CORBA_ABSTRACTINTERFACEDEF___OUT_CH_
-
-class TAO_IFR_Client_Export CORBA_AbstractInterfaceDef_out
-{
-public:
-  CORBA_AbstractInterfaceDef_out (CORBA_AbstractInterfaceDef_ptr &);
-  CORBA_AbstractInterfaceDef_out (CORBA_AbstractInterfaceDef_var &);
-  CORBA_AbstractInterfaceDef_out (const CORBA_AbstractInterfaceDef_out &);
-  CORBA_AbstractInterfaceDef_out &operator= (const CORBA_AbstractInterfaceDef_out &);
-  CORBA_AbstractInterfaceDef_out &operator= (const CORBA_AbstractInterfaceDef_var &);
-  CORBA_AbstractInterfaceDef_out &operator= (CORBA_AbstractInterfaceDef_ptr);
-  operator CORBA_AbstractInterfaceDef_ptr &();
-  CORBA_AbstractInterfaceDef_ptr &ptr (void);
-  CORBA_AbstractInterfaceDef_ptr operator-> (void);
 
-private:
-  CORBA_AbstractInterfaceDef_ptr &ptr_;
-};
+#if !defined (_CORBA_LOCALINTERFACEDEF___PTR_CH_)
+#define _CORBA_LOCALINTERFACEDEF___PTR_CH_
 
+                                    class CORBA_LocalInterfaceDef;
+                                    typedef CORBA_LocalInterfaceDef *CORBA_LocalInterfaceDef_ptr;
 
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_ABSTRACTINTERFACEDEF_CH_)
-#define _CORBA_ABSTRACTINTERFACEDEF_CH_
-
-// Forward Classes Declaration
-class _TAO_CORBA_AbstractInterfaceDef_Proxy_Impl;
-class _TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Impl;
-class _TAO_CORBA_AbstractInterfaceDef_Proxy_Broker;
-class _TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker;
-
-class TAO_IFR_Client_Export CORBA_AbstractInterfaceDef: public virtual CORBA_InterfaceDef
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_AbstractInterfaceDef_ptr _ptr_type;
-  typedef CORBA_AbstractInterfaceDef_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static CORBA_AbstractInterfaceDef_ptr _duplicate (CORBA_AbstractInterfaceDef_ptr obj);
-  static CORBA_AbstractInterfaceDef_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_AbstractInterfaceDef_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_AbstractInterfaceDef_ptr _nil (void)
-    {
-      return (CORBA_AbstractInterfaceDef_ptr)0;
-    }
-
-  static void _tao_any_destructor (void*);
-
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
-
-private:
-  _TAO_CORBA_AbstractInterfaceDef_Proxy_Broker *the_TAO_CORBA_AbstractInterfaceDef_Proxy_Broker_;
-  
-protected:
-  CORBA_AbstractInterfaceDef (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void CORBA_AbstractInterfaceDef_setup_collocation (int collocated);
-    
-    CORBA_AbstractInterfaceDef (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Impl;
-    friend class _TAO_CORBA_AbstractInterfaceDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_CORBA_AbstractInterfaceDef_Direct_Proxy_Impl;
-  
-  virtual ~CORBA_AbstractInterfaceDef (void);
-private:
-  CORBA_AbstractInterfaceDef (const CORBA_AbstractInterfaceDef &);
-  void operator= (const CORBA_AbstractInterfaceDef &);
-};
-
-
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_AbstractInterfaceDef_Proxy_Impl : 
-  public virtual _TAO_CORBA_InterfaceDef_Proxy_Impl
-{
-public:
-  virtual ~_TAO_CORBA_AbstractInterfaceDef_Proxy_Impl (void) { }
-  
-  protected:
-  _TAO_CORBA_AbstractInterfaceDef_Proxy_Impl (void);
-
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Impl : 
-  public virtual _TAO_CORBA_AbstractInterfaceDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Impl (void) { }
-  
-  };
-
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
-
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_AbstractInterfaceDef_Proxy_Broker
-{
-public:
-  virtual ~_TAO_CORBA_AbstractInterfaceDef_Proxy_Broker (void);
-  virtual _TAO_CORBA_AbstractInterfaceDef_Proxy_Impl &select_proxy (
-    CORBA_AbstractInterfaceDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
-
-protected:
-  _TAO_CORBA_AbstractInterfaceDef_Proxy_Broker (void);
-  
-};
-
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_AbstractInterfaceDef_Proxy_Broker
-{
-public: 
-  _TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_CORBA_AbstractInterfaceDef_Proxy_Impl &select_proxy (
-    CORBA_AbstractInterfaceDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
-
-private:
-  _TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
+#if !defined (_CORBA_LOCALINTERFACEDEF___VAR_CH_)
+#define _CORBA_LOCALINTERFACEDEF___VAR_CH_
 
-public:
-  static _TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker *the_TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker (void);
-};
+                                    class TAO_IFR_Client_Export CORBA_LocalInterfaceDef_var : public TAO_Base_var
+                                    {
+                                    public:
+                                      CORBA_LocalInterfaceDef_var (void); // default constructor
+                                      CORBA_LocalInterfaceDef_var (CORBA_LocalInterfaceDef_ptr p) : ptr_ (p) {}
+                                      CORBA_LocalInterfaceDef_var (const CORBA_LocalInterfaceDef_var &); // copy constructor
+                                      ~CORBA_LocalInterfaceDef_var (void); // destructor
+
+                                      CORBA_LocalInterfaceDef_var &operator= (CORBA_LocalInterfaceDef_ptr);
+                                      CORBA_LocalInterfaceDef_var &operator= (const CORBA_LocalInterfaceDef_var &);
+                                      CORBA_LocalInterfaceDef_ptr operator-> (void) const;
+
+                                      operator const CORBA_LocalInterfaceDef_ptr &() const;
+                                      operator CORBA_LocalInterfaceDef_ptr &();
+                                      // in, inout, out, _retn
+                                      CORBA_LocalInterfaceDef_ptr in (void) const;
+                                      CORBA_LocalInterfaceDef_ptr &inout (void);
+                                      CORBA_LocalInterfaceDef_ptr &out (void);
+                                      CORBA_LocalInterfaceDef_ptr _retn (void);
+                                      CORBA_LocalInterfaceDef_ptr ptr (void) const;
+
+                                      // Hooks used by template sequence and object manager classes
+                                      // for non-defined forward declared interfaces.
+                                      static CORBA_LocalInterfaceDef_ptr duplicate (CORBA_LocalInterfaceDef_ptr);
+                                      static void release (CORBA_LocalInterfaceDef_ptr);
+                                      static CORBA_LocalInterfaceDef_ptr nil (void);
+                                      static CORBA_LocalInterfaceDef_ptr narrow (
+                                          CORBA::Object *,
+                                          CORBA::Environment &
+                                        );
+                                      static CORBA::Object * upcast (void *);
+
+                                    private:
+                                      CORBA_LocalInterfaceDef_ptr ptr_;
+                                      // Unimplemented - prevents widening assignment.
+                                      CORBA_LocalInterfaceDef_var (const TAO_Base_var &rhs);
+                                      CORBA_LocalInterfaceDef_var &operator= (const TAO_Base_var &rhs);
+                                    };
 
 
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+#endif /* end #if !defined */
 
 
-#endif /* end #if !defined */
+#if !defined (_CORBA_LOCALINTERFACEDEF___OUT_CH_)
+#define _CORBA_LOCALINTERFACEDEF___OUT_CH_
 
+                                    class TAO_IFR_Client_Export CORBA_LocalInterfaceDef_out
+                                    {
+                                    public:
+                                      CORBA_LocalInterfaceDef_out (CORBA_LocalInterfaceDef_ptr &);
+                                      CORBA_LocalInterfaceDef_out (CORBA_LocalInterfaceDef_var &);
+                                      CORBA_LocalInterfaceDef_out (const CORBA_LocalInterfaceDef_out &);
+                                      CORBA_LocalInterfaceDef_out &operator= (const CORBA_LocalInterfaceDef_out &);
+                                      CORBA_LocalInterfaceDef_out &operator= (const CORBA_LocalInterfaceDef_var &);
+                                      CORBA_LocalInterfaceDef_out &operator= (CORBA_LocalInterfaceDef_ptr);
+                                      operator CORBA_LocalInterfaceDef_ptr &();
+                                      CORBA_LocalInterfaceDef_ptr &ptr (void);
+                                      CORBA_LocalInterfaceDef_ptr operator-> (void);
 
-#if !defined (_CORBA_LOCALINTERFACEDEF___PTR_CH_)
-#define _CORBA_LOCALINTERFACEDEF___PTR_CH_
+                                    private:
+                                      CORBA_LocalInterfaceDef_ptr &ptr_;
+                                    };
 
-class CORBA_LocalInterfaceDef;
-typedef CORBA_LocalInterfaceDef *CORBA_LocalInterfaceDef_ptr;
 
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_LOCALINTERFACEDEF___VAR_CH_)
-#define _CORBA_LOCALINTERFACEDEF___VAR_CH_
+#if !defined (_CORBA_LOCALINTERFACEDEF_CH_)
+#define _CORBA_LOCALINTERFACEDEF_CH_
 
-class TAO_IFR_Client_Export CORBA_LocalInterfaceDef_var : public TAO_Base_var
-{
-public:
-  CORBA_LocalInterfaceDef_var (void); // default constructor
-  CORBA_LocalInterfaceDef_var (CORBA_LocalInterfaceDef_ptr p) : ptr_ (p) {} 
-  CORBA_LocalInterfaceDef_var (const CORBA_LocalInterfaceDef_var &); // copy constructor
-  ~CORBA_LocalInterfaceDef_var (void); // destructor
-  
-  CORBA_LocalInterfaceDef_var &operator= (CORBA_LocalInterfaceDef_ptr);
-  CORBA_LocalInterfaceDef_var &operator= (const CORBA_LocalInterfaceDef_var &);
-  CORBA_LocalInterfaceDef_ptr operator-> (void) const;
-  
-  operator const CORBA_LocalInterfaceDef_ptr &() const;
-  operator CORBA_LocalInterfaceDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_LocalInterfaceDef_ptr in (void) const;
-  CORBA_LocalInterfaceDef_ptr &inout (void);
-  CORBA_LocalInterfaceDef_ptr &out (void);
-  CORBA_LocalInterfaceDef_ptr _retn (void);
-  CORBA_LocalInterfaceDef_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_LocalInterfaceDef_ptr duplicate (CORBA_LocalInterfaceDef_ptr);
-  static void release (CORBA_LocalInterfaceDef_ptr);
-  static CORBA_LocalInterfaceDef_ptr nil (void);
-  static CORBA_LocalInterfaceDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
+                                    // Forward Classes Declaration
+                                    class _TAO_CORBA_LocalInterfaceDef_Proxy_Impl;
+                                    class _TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Impl;
+                                    class _TAO_CORBA_LocalInterfaceDef_Proxy_Broker;
+                                    class _TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker;
 
-private:
-  CORBA_LocalInterfaceDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_LocalInterfaceDef_var (const TAO_Base_var &rhs);
-  CORBA_LocalInterfaceDef_var &operator= (const TAO_Base_var &rhs);
-};
+                                    class TAO_IFR_Client_Export CORBA_LocalInterfaceDef
+                                      : public virtual CORBA_InterfaceDef
+                                    {
+                                    public:
+                                    #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+                                      typedef CORBA_LocalInterfaceDef_ptr _ptr_type;
+                                      typedef CORBA_LocalInterfaceDef_var _var_type;
+                                    #endif /* ! __GNUC__ || g++ >= 2.8 */
 
+                                      // the static operations
+                                      static CORBA_LocalInterfaceDef_ptr _duplicate (CORBA_LocalInterfaceDef_ptr obj);
 
-#endif /* end #if !defined */
+                                      static CORBA_LocalInterfaceDef_ptr _narrow (
+                                          CORBA::Object_ptr obj,
+                                          CORBA::Environment &ACE_TRY_ENV =
+                                            TAO_default_environment ()
+                                        );
 
+                                      static CORBA_LocalInterfaceDef_ptr _unchecked_narrow (
+                                          CORBA::Object_ptr obj,
+                                          CORBA::Environment &ACE_TRY_ENV =
+                                            TAO_default_environment ()
+                                        );
 
-#if !defined (_CORBA_LOCALINTERFACEDEF___OUT_CH_)
-#define _CORBA_LOCALINTERFACEDEF___OUT_CH_
+                                      static CORBA_LocalInterfaceDef_ptr _nil (void)
+                                        {
+                                          return (CORBA_LocalInterfaceDef_ptr)0;
+                                        }
+
+                                      static void _tao_any_destructor (void*);
 
-class TAO_IFR_Client_Export CORBA_LocalInterfaceDef_out
-{
-public:
-  CORBA_LocalInterfaceDef_out (CORBA_LocalInterfaceDef_ptr &);
-  CORBA_LocalInterfaceDef_out (CORBA_LocalInterfaceDef_var &);
-  CORBA_LocalInterfaceDef_out (const CORBA_LocalInterfaceDef_out &);
-  CORBA_LocalInterfaceDef_out &operator= (const CORBA_LocalInterfaceDef_out &);
-  CORBA_LocalInterfaceDef_out &operator= (const CORBA_LocalInterfaceDef_var &);
-  CORBA_LocalInterfaceDef_out &operator= (CORBA_LocalInterfaceDef_ptr);
-  operator CORBA_LocalInterfaceDef_ptr &();
-  CORBA_LocalInterfaceDef_ptr &ptr (void);
-  CORBA_LocalInterfaceDef_ptr operator-> (void);
+                                      virtual CORBA::Boolean _is_a (
+                                          const CORBA::Char *type_id,
+                                          CORBA::Environment &ACE_TRY_ENV =
+                                            TAO_default_environment ()
+                                        );
 
-private:
-  CORBA_LocalInterfaceDef_ptr &ptr_;
-};
+                                      virtual void *_tao_QueryInterface (ptr_arith_t type);
 
+                                      virtual const char* _interface_repository_id (void) const;
 
-#endif /* end #if !defined */
+                                    private:
+                                      _TAO_CORBA_LocalInterfaceDef_Proxy_Broker *the_TAO_CORBA_LocalInterfaceDef_Proxy_Broker_;
 
+                                    protected:
+                                      CORBA_LocalInterfaceDef (int collocated = 0);
 
-#if !defined (_CORBA_LOCALINTERFACEDEF_CH_)
-#define _CORBA_LOCALINTERFACEDEF_CH_
+                                      // This methods travese the inheritance tree and set the
+                                      // parents piece of the given class in the right mode
+                                      virtual void CORBA_LocalInterfaceDef_setup_collocation (int collocated);
 
-// Forward Classes Declaration
-class _TAO_CORBA_LocalInterfaceDef_Proxy_Impl;
-class _TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Impl;
-class _TAO_CORBA_LocalInterfaceDef_Proxy_Broker;
-class _TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker;
+                                      CORBA_LocalInterfaceDef (
+                                          TAO_Stub *objref,
+                                          CORBA::Boolean _tao_collocated = 0,
+                                          TAO_Abstract_ServantBase *servant = 0
+                                        );
 
-class TAO_IFR_Client_Export CORBA_LocalInterfaceDef: public virtual CORBA_InterfaceDef
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_LocalInterfaceDef_ptr _ptr_type;
-  typedef CORBA_LocalInterfaceDef_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
+                                      friend class _TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Impl;
+                                      friend class _TAO_CORBA_LocalInterfaceDef_ThruPOA_Proxy_Impl;
+                                      friend class _TAO_CORBA_LocalInterfaceDef_Direct_Proxy_Impl;
 
-  // the static operations
-  static CORBA_LocalInterfaceDef_ptr _duplicate (CORBA_LocalInterfaceDef_ptr obj);
-  static CORBA_LocalInterfaceDef_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_LocalInterfaceDef_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_LocalInterfaceDef_ptr _nil (void)
-    {
-      return (CORBA_LocalInterfaceDef_ptr)0;
-    }
+                                      virtual ~CORBA_LocalInterfaceDef (void);
 
-  static void _tao_any_destructor (void*);
+                                    private:
+                                      CORBA_LocalInterfaceDef (const CORBA_LocalInterfaceDef &);
+                                      void operator= (const CORBA_LocalInterfaceDef &);
+                                    };
 
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
+                                    // The Proxy Implementations are used by each interface to
+                                    // perform a call. Each different implementation encapsulate
+                                    // an invocation logics.
 
-private:
-  _TAO_CORBA_LocalInterfaceDef_Proxy_Broker *the_TAO_CORBA_LocalInterfaceDef_Proxy_Broker_;
-  
-protected:
-  CORBA_LocalInterfaceDef (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void CORBA_LocalInterfaceDef_setup_collocation (int collocated);
-    
-    CORBA_LocalInterfaceDef (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Impl;
-    friend class _TAO_CORBA_LocalInterfaceDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_CORBA_LocalInterfaceDef_Direct_Proxy_Impl;
-  
-  virtual ~CORBA_LocalInterfaceDef (void);
-private:
-  CORBA_LocalInterfaceDef (const CORBA_LocalInterfaceDef &);
-  void operator= (const CORBA_LocalInterfaceDef &);
-};
 
+                                    ///////////////////////////////////////////////////////////////////////
+                                    //                    Base Proxy Impl. Declaration
+                                    //
 
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
+                                    class TAO_IFR_Client_Export _TAO_CORBA_LocalInterfaceDef_Proxy_Impl
+                                      : public virtual _TAO_CORBA_InterfaceDef_Proxy_Impl
+                                    {
+                                    public:
+                                      virtual ~_TAO_CORBA_LocalInterfaceDef_Proxy_Impl (void) { }
 
+                                    protected:
+                                      _TAO_CORBA_LocalInterfaceDef_Proxy_Impl (void);
+                                    };
 
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
+                                    //
+                                    //               End Base Proxy Impl. Declaration
+                                    ///////////////////////////////////////////////////////////////////////
 
-class TAO_IFR_Client_Export _TAO_CORBA_LocalInterfaceDef_Proxy_Impl : 
-  public virtual _TAO_CORBA_InterfaceDef_Proxy_Impl
-{
-public:
-  virtual ~_TAO_CORBA_LocalInterfaceDef_Proxy_Impl (void) { }
-  
-  protected:
-  _TAO_CORBA_LocalInterfaceDef_Proxy_Impl (void);
 
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
+                                    ///////////////////////////////////////////////////////////////////////
+                                    //                Remote Proxy Impl. Declaration
+                                    //
 
+                                    class TAO_IFR_Client_Export _TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Impl
+                                      : public virtual _TAO_CORBA_LocalInterfaceDef_Proxy_Impl,
+                                        public virtual TAO_Remote_Object_Proxy_Impl,
+                                        public virtual _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl
+                                    {
+                                    public:
+                                      _TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Impl (void);
 
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
+                                      virtual ~_TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Impl (void) { }
 
-class TAO_IFR_Client_Export _TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Impl : 
-  public virtual _TAO_CORBA_LocalInterfaceDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Impl (void) { }
-  
-  };
+                                    };
 
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
+                                    //
+                                    //             End Remote Proxy Impl. Declaration
+                                    ///////////////////////////////////////////////////////////////////////
 
+                                    // The Proxy Brokers are used by each interface to get
+                                    // the right proxy for performing a call. In the new
+                                    // collocation scheme, the proxy to be used can vary on
+                                    // a call by call basis.
 
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
 
+                                    ///////////////////////////////////////////////////////////////////////
+                                    //                 Base Proxy Broker Declaration
+                                    //
 
+                                                                        class TAO_IFR_Client_Export _TAO_CORBA_LocalInterfaceDef_Proxy_Broker
+                                    {
+                                    public:
+                                      virtual ~_TAO_CORBA_LocalInterfaceDef_Proxy_Broker (void);
+                                      virtual _TAO_CORBA_LocalInterfaceDef_Proxy_Impl &select_proxy (
+                                          CORBA_LocalInterfaceDef *object,
+                                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                        ) = 0;
 
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
+                                    protected:
+                                      _TAO_CORBA_LocalInterfaceDef_Proxy_Broker (void);
 
-class TAO_IFR_Client_Export _TAO_CORBA_LocalInterfaceDef_Proxy_Broker
-{
-public:
-  virtual ~_TAO_CORBA_LocalInterfaceDef_Proxy_Broker (void);
-  virtual _TAO_CORBA_LocalInterfaceDef_Proxy_Impl &select_proxy (
-    CORBA_LocalInterfaceDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
+                                    };
 
-protected:
-  _TAO_CORBA_LocalInterfaceDef_Proxy_Broker (void);
-  
-};
+                                    //
+                                    //              End Base Proxy Broker Declaration
+                                    ///////////////////////////////////////////////////////////////////////
 
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
 
+                                    ///////////////////////////////////////////////////////////////////////
+                                    //                 Remote Proxy Broker Declaration
+                                    //
 
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
+                                    class TAO_IFR_Client_Export _TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker
+                                      : public virtual _TAO_CORBA_LocalInterfaceDef_Proxy_Broker
+                                    {
+                                    public:
+                                      _TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker (void);
 
-class TAO_IFR_Client_Export _TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_LocalInterfaceDef_Proxy_Broker
-{
-public: 
-  _TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_CORBA_LocalInterfaceDef_Proxy_Impl &select_proxy (
-    CORBA_LocalInterfaceDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
+                                      virtual ~_TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker (void);
 
-private:
-  _TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
+                                      virtual _TAO_CORBA_LocalInterfaceDef_Proxy_Impl &select_proxy (
+                                          CORBA_LocalInterfaceDef *object,
+                                          CORBA_Environment &ACE_TRY_ENV
+                                        );
 
-public:
-  static _TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker *the_TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker (void);
-};
+                                      private:
+                                        _TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Impl remote_proxy_impl_;
 
+                                      public:
+                                        // This member function is used to get an handle to the unique instance
+                                        // of the Remote Proxy Broker that is available for a given
+                                        // interface.
+                                        static _TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker *the_TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker (void);
+                                      };
 
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+                                      //
+                                      //              End Remote Proxy Broker Declaration
+                                      ///////////////////////////////////////////////////////////////////////
 
 
 #endif /* end #if !defined */
 
-// Proxy Broker Factory function pointer declarations.
-
-extern TAO_IFR_Client_Export
-_TAO_CORBA_Repository_Proxy_Broker *
-(*_TAO_CORBA_Repository_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-_TAO_CORBA_ModuleDef_Proxy_Broker *
-(*_TAO_CORBA_ModuleDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-_TAO_CORBA_ConstantDef_Proxy_Broker *
-(*_TAO_CORBA_ConstantDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-_TAO_CORBA_StructDef_Proxy_Broker *
-(*_TAO_CORBA_StructDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-_TAO_CORBA_UnionDef_Proxy_Broker *
-(*_TAO_CORBA_UnionDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-_TAO_CORBA_EnumDef_Proxy_Broker *
-(*_TAO_CORBA_EnumDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-_TAO_CORBA_AliasDef_Proxy_Broker *
-(*_TAO_CORBA_AliasDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-_TAO_CORBA_NativeDef_Proxy_Broker *
-(*_TAO_CORBA_NativeDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-_TAO_CORBA_PrimitiveDef_Proxy_Broker *
-(*_TAO_CORBA_PrimitiveDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-_TAO_CORBA_StringDef_Proxy_Broker *
-(*_TAO_CORBA_StringDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-_TAO_CORBA_WstringDef_Proxy_Broker *
-(*_TAO_CORBA_WstringDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-_TAO_CORBA_SequenceDef_Proxy_Broker *
-(*_TAO_CORBA_SequenceDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-_TAO_CORBA_ArrayDef_Proxy_Broker *
-(*_TAO_CORBA_ArrayDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-_TAO_CORBA_ExceptionDef_Proxy_Broker *
-(*_TAO_CORBA_ExceptionDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-_TAO_CORBA_AttributeDef_Proxy_Broker *
-(*_TAO_CORBA_AttributeDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-_TAO_CORBA_OperationDef_Proxy_Broker *
-(*_TAO_CORBA_OperationDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-_TAO_CORBA_InterfaceDef_Proxy_Broker *
-(*_TAO_CORBA_InterfaceDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-_TAO_CORBA_AbstractInterfaceDef_Proxy_Broker *
-(*_TAO_CORBA_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-_TAO_CORBA_LocalInterfaceDef_Proxy_Broker *
-(*_TAO_CORBA_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-// Declarations for undefined interface
-// CORBA_FixedDef
-TAO_IFR_Client_Export
-CORBA_FixedDef_ptr
-tao_CORBA_FixedDef_duplicate (
-    CORBA_FixedDef_ptr
-  );
-TAO_IFR_Client_Export
-void
-tao_CORBA_FixedDef_release (
-    CORBA_FixedDef_ptr
-  );
-TAO_IFR_Client_Export
-CORBA_FixedDef_ptr
-tao_CORBA_FixedDef_nil (
-    void
-  );
-TAO_IFR_Client_Export
-CORBA_FixedDef_ptr
-tao_CORBA_FixedDef_narrow (
-    CORBA::Object *,
-    CORBA::Environment &
-  );
-TAO_IFR_Client_Export
-CORBA::Object *
-tao_CORBA_FixedDef_upcast (
-    void *
-  );
-
-// Any operators for interface CORBA_FixedDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_FixedDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_FixedDef *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::PrimitiveKind);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PrimitiveKind &);
-// Any operators for interface CORBA_Repository
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_Repository_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_Repository *&);
-// Any operators for interface CORBA_ModuleDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ModuleDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ModuleDef *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ModuleDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ModuleDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ModuleDescription *&); // deprecated
+
+                                      // Proxy Broker Factory function pointer declarations.
+
+                                      extern TAO_IFR_Client_Export
+                                      _TAO_CORBA_Repository_Proxy_Broker *
+                                      (*_TAO_CORBA_Repository_Proxy_Broker_Factory_function_pointer) (
+                                          CORBA::Object_ptr obj
+                                        );
+
+                                      extern TAO_IFR_Client_Export
+                                      _TAO_CORBA_ModuleDef_Proxy_Broker *
+                                      (*_TAO_CORBA_ModuleDef_Proxy_Broker_Factory_function_pointer) (
+                                          CORBA::Object_ptr obj
+                                        );
+
+                                      extern TAO_IFR_Client_Export
+                                      _TAO_CORBA_ConstantDef_Proxy_Broker *
+                                      (*_TAO_CORBA_ConstantDef_Proxy_Broker_Factory_function_pointer) (
+                                          CORBA::Object_ptr obj
+                                        );
+
+                                      extern TAO_IFR_Client_Export
+                                      _TAO_CORBA_StructDef_Proxy_Broker *
+                                      (*_TAO_CORBA_StructDef_Proxy_Broker_Factory_function_pointer) (
+                                          CORBA::Object_ptr obj
+                                        );
+
+                                      extern TAO_IFR_Client_Export
+                                      _TAO_CORBA_UnionDef_Proxy_Broker *
+                                      (*_TAO_CORBA_UnionDef_Proxy_Broker_Factory_function_pointer) (
+                                          CORBA::Object_ptr obj
+                                        );
+
+                                      extern TAO_IFR_Client_Export
+                                      _TAO_CORBA_EnumDef_Proxy_Broker *
+                                      (*_TAO_CORBA_EnumDef_Proxy_Broker_Factory_function_pointer) (
+                                          CORBA::Object_ptr obj
+                                        );
+
+                                      extern TAO_IFR_Client_Export
+                                      _TAO_CORBA_AliasDef_Proxy_Broker *
+                                      (*_TAO_CORBA_AliasDef_Proxy_Broker_Factory_function_pointer) (
+                                          CORBA::Object_ptr obj
+                                        );
+
+                                      extern TAO_IFR_Client_Export
+                                      _TAO_CORBA_NativeDef_Proxy_Broker *
+                                      (*_TAO_CORBA_NativeDef_Proxy_Broker_Factory_function_pointer) (
+                                          CORBA::Object_ptr obj
+                                        );
+
+                                      extern TAO_IFR_Client_Export
+                                      _TAO_CORBA_PrimitiveDef_Proxy_Broker *
+                                      (*_TAO_CORBA_PrimitiveDef_Proxy_Broker_Factory_function_pointer) (
+                                          CORBA::Object_ptr obj
+                                        );
+
+                                      extern TAO_IFR_Client_Export
+                                      _TAO_CORBA_StringDef_Proxy_Broker *
+                                      (*_TAO_CORBA_StringDef_Proxy_Broker_Factory_function_pointer) (
+                                          CORBA::Object_ptr obj
+                                        );
+
+                                      extern TAO_IFR_Client_Export
+                                      _TAO_CORBA_WstringDef_Proxy_Broker *
+                                      (*_TAO_CORBA_WstringDef_Proxy_Broker_Factory_function_pointer) (
+                                          CORBA::Object_ptr obj
+                                        );
+
+                                      extern TAO_IFR_Client_Export
+                                      _TAO_CORBA_SequenceDef_Proxy_Broker *
+                                      (*_TAO_CORBA_SequenceDef_Proxy_Broker_Factory_function_pointer) (
+                                          CORBA::Object_ptr obj
+                                        );
+
+                                      extern TAO_IFR_Client_Export
+                                      _TAO_CORBA_ArrayDef_Proxy_Broker *
+                                      (*_TAO_CORBA_ArrayDef_Proxy_Broker_Factory_function_pointer) (
+                                          CORBA::Object_ptr obj
+                                        );
+
+                                      extern TAO_IFR_Client_Export
+                                      _TAO_CORBA_ExceptionDef_Proxy_Broker *
+                                      (*_TAO_CORBA_ExceptionDef_Proxy_Broker_Factory_function_pointer) (
+                                          CORBA::Object_ptr obj
+                                        );
+
+                                      extern TAO_IFR_Client_Export
+                                      _TAO_CORBA_AttributeDef_Proxy_Broker *
+                                      (*_TAO_CORBA_AttributeDef_Proxy_Broker_Factory_function_pointer) (
+                                          CORBA::Object_ptr obj
+                                        );
+
+                                      extern TAO_IFR_Client_Export
+                                      _TAO_CORBA_OperationDef_Proxy_Broker *
+                                      (*_TAO_CORBA_OperationDef_Proxy_Broker_Factory_function_pointer) (
+                                          CORBA::Object_ptr obj
+                                        );
+
+                                      extern TAO_IFR_Client_Export
+                                      _TAO_CORBA_InterfaceDef_Proxy_Broker *
+                                      (*_TAO_CORBA_InterfaceDef_Proxy_Broker_Factory_function_pointer) (
+                                          CORBA::Object_ptr obj
+                                        );
+
+                                      extern TAO_IFR_Client_Export
+                                      _TAO_CORBA_AbstractInterfaceDef_Proxy_Broker *
+                                      (*_TAO_CORBA_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer) (
+                                          CORBA::Object_ptr obj
+                                        );
+
+                                      extern TAO_IFR_Client_Export
+                                      _TAO_CORBA_LocalInterfaceDef_Proxy_Broker *
+                                      (*_TAO_CORBA_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer) (
+                                          CORBA::Object_ptr obj
+                                        );
+
+                                      // External declarations for undefined interface
+                                      // CORBA_FixedDef
+                                      TAO_IFR_Client_Export
+                                      CORBA_FixedDef_ptr
+                                      tao_CORBA_FixedDef_duplicate (
+                                          CORBA_FixedDef_ptr
+                                        );
+                                      TAO_IFR_Client_Export
+                                      void
+                                      tao_CORBA_FixedDef_release (
+                                          CORBA_FixedDef_ptr
+                                        );
+                                      TAO_IFR_Client_Export
+                                      CORBA_FixedDef_ptr
+                                      tao_CORBA_FixedDef_nil (
+                                          void
+                                        );
+                                      TAO_IFR_Client_Export
+                                      CORBA_FixedDef_ptr
+                                      tao_CORBA_FixedDef_narrow (
+                                          CORBA::Object *,
+                                          CORBA::Environment &
+                                        );
+                                      TAO_IFR_Client_Export
+                                      CORBA::Object *
+                                      tao_CORBA_FixedDef_upcast (
+                                          void *
+                                        );
+
+                                                                            TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::PrimitiveKind);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PrimitiveKind &);
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AttributeMode);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AttributeMode &);
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::OperationMode);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OperationMode &);
+                                      // Any operators for interface CORBA_FixedDef
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_FixedDef_ptr);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_FixedDef *&);
+                                      // Any operators for interface CORBA_Repository
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_Repository_ptr);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_Repository *&);
+                                      // Any operators for interface CORBA_ModuleDef
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ModuleDef_ptr);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ModuleDef *&);
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ModuleDescription &); // copying version
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ModuleDescription*); // noncopying version
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ModuleDescription *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_ModuleDescription *&);
-// Any operators for interface CORBA_ConstantDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ConstantDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ConstantDef *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ConstantDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ConstantDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ConstantDescription *&); // deprecated
+                                      // Any operators for interface CORBA_ConstantDef
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ConstantDef_ptr);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ConstantDef *&);
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ConstantDescription &); // copying version
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ConstantDescription*); // noncopying version
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ConstantDescription *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_ConstantDescription *&);
-// Any operators for interface CORBA_StructDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_StructDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_StructDef *&);
-// Any operators for interface CORBA_UnionDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_UnionDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_UnionDef *&);
-// Any operators for interface CORBA_EnumDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_EnumDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_EnumDef *&);
-// Any operators for interface CORBA_AliasDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_AliasDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_AliasDef *&);
-// Any operators for interface CORBA_NativeDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_NativeDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_NativeDef *&);
-// Any operators for interface CORBA_PrimitiveDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::PrimitiveDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_PrimitiveDef *&);
-// Any operators for interface CORBA_StringDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_StringDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_StringDef *&);
-// Any operators for interface CORBA_WstringDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_WstringDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_WstringDef *&);
-// Any operators for interface CORBA_SequenceDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_SequenceDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_SequenceDef *&);
-// Any operators for interface CORBA_ArrayDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ArrayDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ArrayDef *&);
-// Any operators for interface CORBA_ExceptionDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ExceptionDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ExceptionDef *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ExceptionDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ExceptionDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ExceptionDescription *&); // deprecated
+                                      // Any operators for interface CORBA_StructDef
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_StructDef_ptr);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_StructDef *&);
+                                      // Any operators for interface CORBA_UnionDef
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_UnionDef_ptr);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_UnionDef *&);
+                                      // Any operators for interface CORBA_EnumDef
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_EnumDef_ptr);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_EnumDef *&);
+                                      // Any operators for interface CORBA_AliasDef
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_AliasDef_ptr);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_AliasDef *&);
+                                      // Any operators for interface CORBA_NativeDef
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_NativeDef_ptr);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_NativeDef *&);
+                                      // Any operators for interface CORBA_PrimitiveDef
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_PrimitiveDef_ptr);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_PrimitiveDef *&);
+                                      // Any operators for interface CORBA_StringDef
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_StringDef_ptr);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_StringDef *&);
+                                      // Any operators for interface CORBA_WstringDef
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_WstringDef_ptr);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_WstringDef *&);
+                                      // Any operators for interface CORBA_SequenceDef
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_SequenceDef_ptr);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_SequenceDef *&);
+                                      // Any operators for interface CORBA_ArrayDef
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ArrayDef_ptr);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ArrayDef *&);
+                                      // Any operators for interface CORBA_ExceptionDef
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ExceptionDef_ptr);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ExceptionDef *&);
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ExceptionDescription &); // copying version
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ExceptionDescription*); // noncopying version
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ExceptionDescription *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_ExceptionDescription *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ExceptionDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ExceptionDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ExceptionDefSeq *&); // deprecated
+                                                                            TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ExceptionDefSeq &); // copying version
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ExceptionDefSeq*); // noncopying version
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ExceptionDefSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_ExceptionDefSeq *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ExcDescriptionSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ExcDescriptionSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ExcDescriptionSeq *&); // deprecated
+                                                                            TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ExcDescriptionSeq &); // copying version
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ExcDescriptionSeq*); // noncopying version
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ExcDescriptionSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_ExcDescriptionSeq *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AttributeMode);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AttributeMode &);
-// Any operators for interface CORBA_AttributeDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_AttributeDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_AttributeDef *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_AttributeDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_AttributeDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_AttributeDescription *&); // deprecated
+                                      // Any operators for interface CORBA_AttributeDef
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_AttributeDef_ptr);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_AttributeDef *&);
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_AttributeDescription &); // copying version
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_AttributeDescription*); // noncopying version
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_AttributeDescription *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_AttributeDescription *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::OperationMode);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OperationMode &);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ParameterMode);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ParameterMode &);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ParameterDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ParameterDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ParameterDescription *&); // deprecated
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ParameterDescription &); // copying version
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ParameterDescription*); // noncopying version
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ParameterDescription *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_ParameterDescription *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ParDescriptionSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ParDescriptionSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ParDescriptionSeq *&); // deprecated
+                                                                            TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ParDescriptionSeq &); // copying version
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ParDescriptionSeq*); // noncopying version
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ParDescriptionSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_ParDescriptionSeq *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ContextIdSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ContextIdSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ContextIdSeq *&); // deprecated
+                                                                            TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ContextIdSeq &); // copying version
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ContextIdSeq*); // noncopying version
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ContextIdSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_ContextIdSeq *&);
-// Any operators for interface CORBA_OperationDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_OperationDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_OperationDef *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_OperationDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_OperationDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_OperationDescription *&); // deprecated
+                                      // Any operators for interface CORBA_OperationDef
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_OperationDef_ptr);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_OperationDef *&);
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_OperationDescription &); // copying version
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_OperationDescription*); // noncopying version
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_OperationDescription *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_OperationDescription *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_RepositoryIdSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_RepositoryIdSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_RepositoryIdSeq *&); // deprecated
+                                                                            TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_RepositoryIdSeq &); // copying version
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_RepositoryIdSeq*); // noncopying version
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_RepositoryIdSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_RepositoryIdSeq *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_OpDescriptionSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_OpDescriptionSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_OpDescriptionSeq *&); // deprecated
+                                                                            TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_OpDescriptionSeq &); // copying version
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_OpDescriptionSeq*); // noncopying version
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_OpDescriptionSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_OpDescriptionSeq *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_AttrDescriptionSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_AttrDescriptionSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_AttrDescriptionSeq *&); // deprecated
+                                                                            TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_AttrDescriptionSeq &); // copying version
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_AttrDescriptionSeq*); // noncopying version
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_AttrDescriptionSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_AttrDescriptionSeq *&);
-// Any operators for interface CORBA_InterfaceDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_InterfaceDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_InterfaceDef *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_InterfaceDef::FullInterfaceDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_InterfaceDef::FullInterfaceDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_InterfaceDef::FullInterfaceDescription *&); // deprecated
+                                      // Any operators for interface CORBA_InterfaceDef
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_InterfaceDef_ptr);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_InterfaceDef *&);
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_InterfaceDef::FullInterfaceDescription &); // copying version
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_InterfaceDef::FullInterfaceDescription*); // noncopying version
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_InterfaceDef::FullInterfaceDescription *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_InterfaceDef::FullInterfaceDescription *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_InterfaceDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_InterfaceDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_InterfaceDescription *&); // deprecated
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_InterfaceDescription &); // copying version
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_InterfaceDescription*); // noncopying version
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_InterfaceDescription *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_InterfaceDescription *&);
-// Any operators for interface CORBA_AbstractInterfaceDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_AbstractInterfaceDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_AbstractInterfaceDef *&);
-// Any operators for interface CORBA_LocalInterfaceDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_LocalInterfaceDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_LocalInterfaceDef *&);
-
-#ifndef __ACE_INLINE__
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_FixedDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_FixedDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::PrimitiveKind &); // 
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::PrimitiveKind &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_Repository_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_Repository_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ModuleDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ModuleDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ModuleDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ModuleDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ConstantDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ConstantDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ConstantDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ConstantDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_StructDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_StructDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_UnionDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_UnionDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_EnumDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_EnumDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_AliasDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_AliasDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_NativeDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_NativeDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::PrimitiveDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::PrimitiveDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_StringDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_StringDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_WstringDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_WstringDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_SequenceDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_SequenceDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ArrayDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ArrayDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ExceptionDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ExceptionDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ExceptionDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ExceptionDescription &);
+                                      // Any operators for interface CORBA_AbstractInterfaceDef
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_AbstractInterfaceDef_ptr);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_AbstractInterfaceDef *&);
+                                      // Any operators for interface CORBA_LocalInterfaceDef
+                                      TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_LocalInterfaceDef_ptr);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_LocalInterfaceDef *&);
+
+                                      #ifndef __ACE_INLINE__
+
+                                      TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::PrimitiveKind &); //
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::PrimitiveKind &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::AttributeMode &); //
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::AttributeMode &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::OperationMode &); //
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::OperationMode &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_FixedDef_ptr );
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_FixedDef_ptr &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_Repository_ptr );
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_Repository_ptr &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ModuleDef_ptr );
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ModuleDef_ptr &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ModuleDescription &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ModuleDescription &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ConstantDef_ptr );
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ConstantDef_ptr &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ConstantDescription &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ConstantDescription &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_StructDef_ptr );
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_StructDef_ptr &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_UnionDef_ptr );
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_UnionDef_ptr &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_EnumDef_ptr );
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_EnumDef_ptr &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_AliasDef_ptr );
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_AliasDef_ptr &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_NativeDef_ptr );
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_NativeDef_ptr &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_PrimitiveDef_ptr );
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_PrimitiveDef_ptr &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_StringDef_ptr );
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_StringDef_ptr &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_WstringDef_ptr );
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_WstringDef_ptr &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_SequenceDef_ptr );
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_SequenceDef_ptr &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ArrayDef_ptr );
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ArrayDef_ptr &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ExceptionDef_ptr );
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ExceptionDef_ptr &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ExceptionDescription &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ExceptionDescription &);
 
 #if !defined _TAO_CDR_OP_CORBA_ExceptionDefSeq_H_
-#define _TAO_CDR_OP_CORBA_ExceptionDefSeq_H_
+                                      #define _TAO_CDR_OP_CORBA_ExceptionDefSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA_ExceptionDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA_ExceptionDefSeq &
-  );
+                                          TAO_OutputCDR &,
+                                          const CORBA_ExceptionDefSeq &
+                                        );
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (
+                                          TAO_InputCDR &,
+                                          CORBA_ExceptionDefSeq &
+                                        );
 
 #endif /* _TAO_CDR_OP_CORBA_ExceptionDefSeq_H_ */
 
 
 #if !defined _TAO_CDR_OP_CORBA_ExcDescriptionSeq_H_
-#define _TAO_CDR_OP_CORBA_ExcDescriptionSeq_H_
+                                      #define _TAO_CDR_OP_CORBA_ExcDescriptionSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA_ExcDescriptionSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA_ExcDescriptionSeq &
-  );
+                                          TAO_OutputCDR &,
+                                          const CORBA_ExcDescriptionSeq &
+                                        );
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (
+                                          TAO_InputCDR &,
+                                          CORBA_ExcDescriptionSeq &
+                                        );
 
 #endif /* _TAO_CDR_OP_CORBA_ExcDescriptionSeq_H_ */
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::AttributeMode &); // 
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::AttributeMode &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_AttributeDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_AttributeDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_AttributeDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_AttributeDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::OperationMode &); // 
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::OperationMode &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ParameterMode &); // 
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ParameterMode &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ParameterDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ParameterDescription &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_AttributeDef_ptr );
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_AttributeDef_ptr &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_AttributeDescription &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_AttributeDescription &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ParameterDescription &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ParameterDescription &);
 
 #if !defined _TAO_CDR_OP_CORBA_ParDescriptionSeq_H_
-#define _TAO_CDR_OP_CORBA_ParDescriptionSeq_H_
+                                      #define _TAO_CDR_OP_CORBA_ParDescriptionSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA_ParDescriptionSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA_ParDescriptionSeq &
-  );
+                                          TAO_OutputCDR &,
+                                          const CORBA_ParDescriptionSeq &
+                                        );
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (
+                                          TAO_InputCDR &,
+                                          CORBA_ParDescriptionSeq &
+                                        );
 
 #endif /* _TAO_CDR_OP_CORBA_ParDescriptionSeq_H_ */
 
 
 #if !defined _TAO_CDR_OP_CORBA_ContextIdSeq_H_
-#define _TAO_CDR_OP_CORBA_ContextIdSeq_H_
+                                      #define _TAO_CDR_OP_CORBA_ContextIdSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA_ContextIdSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA_ContextIdSeq &
-  );
+                                          TAO_OutputCDR &,
+                                          const CORBA_ContextIdSeq &
+                                        );
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (
+                                          TAO_InputCDR &,
+                                          CORBA_ContextIdSeq &
+                                        );
 
 #endif /* _TAO_CDR_OP_CORBA_ContextIdSeq_H_ */
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_OperationDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_OperationDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_OperationDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_OperationDescription &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_OperationDef_ptr );
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_OperationDef_ptr &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_OperationDescription &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_OperationDescription &);
 
 #if !defined _TAO_CDR_OP_CORBA_RepositoryIdSeq_H_
-#define _TAO_CDR_OP_CORBA_RepositoryIdSeq_H_
+                                      #define _TAO_CDR_OP_CORBA_RepositoryIdSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA_RepositoryIdSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA_RepositoryIdSeq &
-  );
+                                          TAO_OutputCDR &,
+                                          const CORBA_RepositoryIdSeq &
+                                        );
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (
+                                          TAO_InputCDR &,
+                                          CORBA_RepositoryIdSeq &
+                                        );
 
 #endif /* _TAO_CDR_OP_CORBA_RepositoryIdSeq_H_ */
 
 
 #if !defined _TAO_CDR_OP_CORBA_OpDescriptionSeq_H_
-#define _TAO_CDR_OP_CORBA_OpDescriptionSeq_H_
+                                      #define _TAO_CDR_OP_CORBA_OpDescriptionSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA_OpDescriptionSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA_OpDescriptionSeq &
-  );
+                                          TAO_OutputCDR &,
+                                          const CORBA_OpDescriptionSeq &
+                                        );
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (
+                                          TAO_InputCDR &,
+                                          CORBA_OpDescriptionSeq &
+                                        );
 
 #endif /* _TAO_CDR_OP_CORBA_OpDescriptionSeq_H_ */
 
 
 #if !defined _TAO_CDR_OP_CORBA_AttrDescriptionSeq_H_
-#define _TAO_CDR_OP_CORBA_AttrDescriptionSeq_H_
+                                      #define _TAO_CDR_OP_CORBA_AttrDescriptionSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA_AttrDescriptionSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA_AttrDescriptionSeq &
-  );
+                                          TAO_OutputCDR &,
+                                          const CORBA_AttrDescriptionSeq &
+                                        );
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (
+                                          TAO_InputCDR &,
+                                          CORBA_AttrDescriptionSeq &
+                                        );
 
 #endif /* _TAO_CDR_OP_CORBA_AttrDescriptionSeq_H_ */
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_InterfaceDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_InterfaceDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_InterfaceDef::FullInterfaceDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_InterfaceDef::FullInterfaceDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_InterfaceDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_InterfaceDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_AbstractInterfaceDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_AbstractInterfaceDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_LocalInterfaceDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_LocalInterfaceDef_ptr &);
-
-#endif /* __ACE_INLINE__ */
+                                      TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_InterfaceDef_ptr );
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_InterfaceDef_ptr &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_InterfaceDef::FullInterfaceDescription &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_InterfaceDef::FullInterfaceDescription &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_InterfaceDescription &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_InterfaceDescription &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_AbstractInterfaceDef_ptr );
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_AbstractInterfaceDef_ptr &);
+                                      TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_LocalInterfaceDef_ptr );
+                                      TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_LocalInterfaceDef_ptr &);
+
+                                      #endif /* __ACE_INLINE__ */
 
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.i b/TAO/tao/IFR_Client/IFR_BasicC.i
index a54bc4d955a..b8f5f1ee041 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.i
+++ b/TAO/tao/IFR_Client/IFR_BasicC.i
@@ -4648,25 +4648,6 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::OperationMode &
   return _tao_result;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::ParameterMode &_tao_enumval)
-{
-  CORBA::ULong _tao_temp = _tao_enumval;
-  return strm << _tao_temp;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::ParameterMode &_tao_enumval)
-{
-  CORBA::ULong _tao_temp = 0;
-  CORBA::Boolean _tao_result = strm >> _tao_temp;
-  
-  if (_tao_result == 1)
-    {
-      _tao_enumval = ACE_static_cast (CORBA::ParameterMode, _tao_temp);
-    }
-  
-  return _tao_result;
-}
-
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_ParameterDescription &_tao_aggregate)
 {
   if (
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
index d2713d5fac4..e50029fd65d 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
@@ -21,9 +21,12 @@
 
 #include "IFR_ComponentsC.h"
 
-#include "tao/ClientRequestInfo.h"
+#include "tao/PortableInterceptor.h"
+
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
+#include "tao/ClientRequestInfo.h"
+#include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 #if defined (__BORLANDC__)
@@ -38,19 +41,19 @@ static const CORBA::Long _oc_IR_Identifier[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f49), 
-  ACE_NTOHL (0x64656e74), 
-  ACE_NTOHL (0x69666965), 
-  ACE_NTOHL (0x723a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49522f49),
+  ACE_NTOHL (0x64656e74),
+  ACE_NTOHL (0x69666965),
+  ACE_NTOHL (0x723a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/Identifier:1.0
   11,
-  ACE_NTOHL (0x4964656e), 
-  ACE_NTOHL (0x74696669), 
+  ACE_NTOHL (0x4964656e),
+  ACE_NTOHL (0x74696669),
   ACE_NTOHL (0x65720000),  // name = Identifier
-  CORBA::tk_string, 
+  CORBA::tk_string,
   0U, // string length
 };
 
@@ -71,19 +74,19 @@ static const CORBA::Long _oc_IR_ScopedName[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f53), 
-  ACE_NTOHL (0x636f7065), 
-  ACE_NTOHL (0x644e616d), 
-  ACE_NTOHL (0x653a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49522f53),
+  ACE_NTOHL (0x636f7065),
+  ACE_NTOHL (0x644e616d),
+  ACE_NTOHL (0x653a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/ScopedName:1.0
   11,
-  ACE_NTOHL (0x53636f70), 
-  ACE_NTOHL (0x65644e61), 
+  ACE_NTOHL (0x53636f70),
+  ACE_NTOHL (0x65644e61),
   ACE_NTOHL (0x6d650000),  // name = ScopedName
-  CORBA::tk_string, 
+  CORBA::tk_string,
   0U, // string length
 };
 
@@ -104,20 +107,20 @@ static const CORBA::Long _oc_IR_RepositoryId[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   32,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f52), 
-  ACE_NTOHL (0x65706f73), 
-  ACE_NTOHL (0x69746f72), 
-  ACE_NTOHL (0x7949643a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49522f52),
+  ACE_NTOHL (0x65706f73),
+  ACE_NTOHL (0x69746f72),
+  ACE_NTOHL (0x7949643a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
   13,
-  ACE_NTOHL (0x5265706f), 
-  ACE_NTOHL (0x7369746f), 
-  ACE_NTOHL (0x72794964), 
+  ACE_NTOHL (0x5265706f),
+  ACE_NTOHL (0x7369746f),
+  ACE_NTOHL (0x72794964),
   ACE_NTOHL (0x0),  // name = RepositoryId
-  CORBA::tk_string, 
+  CORBA::tk_string,
   0U, // string length
 };
 
@@ -145,37 +148,37 @@ TAO_NAMESPACE_END
 IR::RepositoryIdSeq::RepositoryIdSeq (void)
 {}
 IR::RepositoryIdSeq::RepositoryIdSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
+TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_String_Sequence
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 IR::RepositoryIdSeq::RepositoryIdSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
+TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_String_Sequence
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 IR::RepositoryIdSeq::RepositoryIdSeq (const RepositoryIdSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
+TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_String_Sequence
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 IR::RepositoryIdSeq::~RepositoryIdSeq (void) // dtor
 {}
-void IR::RepositoryIdSeq::_tao_any_destructor (void *x)
+void IR::RepositoryIdSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  RepositoryIdSeq *tmp = ACE_static_cast (RepositoryIdSeq*,x);
+  RepositoryIdSeq *tmp = ACE_static_cast (RepositoryIdSeq*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -186,19 +189,19 @@ static const CORBA::Long _oc_IR_RepositoryIdSeq[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f52), 
-  ACE_NTOHL (0x65706f73), 
-  ACE_NTOHL (0x69746f72), 
-  ACE_NTOHL (0x79496453), 
-  ACE_NTOHL (0x65713a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49522f52),
+  ACE_NTOHL (0x65706f73),
+  ACE_NTOHL (0x69746f72),
+  ACE_NTOHL (0x79496453),
+  ACE_NTOHL (0x65713a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/RepositoryIdSeq:1.0
   16,
-  ACE_NTOHL (0x5265706f), 
-  ACE_NTOHL (0x7369746f), 
-  ACE_NTOHL (0x72794964), 
+  ACE_NTOHL (0x5265706f),
+  ACE_NTOHL (0x7369746f),
+  ACE_NTOHL (0x72794964),
   ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
   CORBA::tk_sequence, // typecode kind
   84, // encapsulation length
@@ -207,20 +210,20 @@ static const CORBA::Long _oc_IR_RepositoryIdSeq[] =
     68, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       32,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x49522f52), 
-      ACE_NTOHL (0x65706f73), 
-      ACE_NTOHL (0x69746f72), 
-      ACE_NTOHL (0x7949643a), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x49522f52),
+      ACE_NTOHL (0x65706f73),
+      ACE_NTOHL (0x69746f72),
+      ACE_NTOHL (0x7949643a),
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
       13,
-      ACE_NTOHL (0x5265706f), 
-      ACE_NTOHL (0x7369746f), 
-      ACE_NTOHL (0x72794964), 
+      ACE_NTOHL (0x5265706f),
+      ACE_NTOHL (0x7369746f),
+      ACE_NTOHL (0x72794964),
       ACE_NTOHL (0x0),  // name = RepositoryId
-      CORBA::tk_string, 
+      CORBA::tk_string,
       0U, // string length
 
     0U,
@@ -244,19 +247,19 @@ static const CORBA::Long _oc_IR_VersionSpec[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   31,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f56), 
-  ACE_NTOHL (0x65727369), 
-  ACE_NTOHL (0x6f6e5370), 
-  ACE_NTOHL (0x65633a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49522f56),
+  ACE_NTOHL (0x65727369),
+  ACE_NTOHL (0x6f6e5370),
+  ACE_NTOHL (0x65633a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/VersionSpec:1.0
   12,
-  ACE_NTOHL (0x56657273), 
-  ACE_NTOHL (0x696f6e53), 
+  ACE_NTOHL (0x56657273),
+  ACE_NTOHL (0x696f6e53),
   ACE_NTOHL (0x70656300),  // name = VersionSpec
-  CORBA::tk_string, 
+  CORBA::tk_string,
   0U, // string length
 };
 
@@ -275,97 +278,97 @@ TAO_NAMESPACE_END
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CS_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CS_
 
-  // The Base_Sequence functions, please see tao/Sequence.h
-  void
-  IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    IR::ComponentDef **tmp = 0;
-    tmp = _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      IR::ComponentDef **old = ACE_reinterpret_cast (IR::ComponentDef**, this->buffer_);
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = IR::ComponentDef::_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete[] old;
-        }
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_deallocate_buffer (void)
+// The Base_Sequence functions, please see tao/Sequence.h
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_allocate_buffer (CORBA::ULong length)
+{
+  IR::ComponentDef **tmp = 0;
+  tmp = _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (length);
+
+  if (this->buffer_ != 0)
   {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    IR::ComponentDef **tmp = ACE_reinterpret_cast (IR::ComponentDef**, this->buffer_);
-    
+    IR::ComponentDef **old = ACE_reinterpret_cast (IR::ComponentDef**, this->buffer_);
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
-        CORBA::release (tmp[i]);
-        tmp[i] = IR::ComponentDef::_nil ();
+        if (!this->release_)
+          {
+            tmp[i] = IR::ComponentDef::_duplicate (old[i]);
+          }
+        else
+          {
+            tmp[i] = old[i];
+          }
       }
-    
-    _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  }
-  
-  IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::~_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (void)
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  void
-  IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-  {
-    IR::ComponentDef **tmp = ACE_reinterpret_cast (IR::ComponentDef**, this->buffer_);
-    
-    for (CORBA::ULong i = nl; i < ol; ++i)
+
+    if (this->release_)
       {
-        CORBA::release (tmp[i]);
-        tmp[i] = IR::ComponentDef::_nil ();
+        delete[] old;
       }
   }
-  
-  void 
-  IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_downcast (
-      void* target,
-      CORBA_Object *src,
-      CORBA_Environment &ACE_TRY_ENV
-    )
-  {
-    IR::ComponentDef **tmp = ACE_static_cast (IR::ComponentDef**, target);
-    *tmp = IR::ComponentDef::_narrow (src, ACE_TRY_ENV);
-    ACE_CHECK;
-  }
+  this->buffer_ = tmp;
+}
+
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    return;
+  IR::ComponentDef **tmp = ACE_reinterpret_cast (IR::ComponentDef**, this->buffer_);
+
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      CORBA::release (tmp[i]);
+      tmp[i] = IR::ComponentDef::_nil ();
+    }
+
+  _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::freebuf (tmp);
+  this->buffer_ = 0;
+}
+
+IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::~_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (void)
+{
+  this->_deallocate_buffer ();
+}
+
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+{
+  IR::ComponentDef **tmp = ACE_reinterpret_cast (IR::ComponentDef**, this->buffer_);
+
+  for (CORBA::ULong i = nl; i < ol; ++i)
+    {
+      CORBA::release (tmp[i]);
+      tmp[i] = IR::ComponentDef::_nil ();
+    }
+}
+
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_downcast (
+    void* target,
+    CORBA_Object *src,
+    CORBA_Environment &ACE_TRY_ENV
+  )
+{
+  IR::ComponentDef **tmp = ACE_static_cast (IR::ComponentDef**, target);
+  *tmp = IR::ComponentDef::_narrow (src, ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+CORBA_Object*
+IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_upcast (void *src) const
+{
+  IR::ComponentDef **tmp = ACE_static_cast (IR::ComponentDef**, src);
+  return *tmp;
+}
 
-  CORBA_Object*
-  IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_upcast (void *src) const
-  {
-    IR::ComponentDef **tmp = ACE_static_cast (IR::ComponentDef**, src);
-    return *tmp;
-  }
-  
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_COMPONENTDEFSEQ_CS_)
 #define _IR_COMPONENTDEFSEQ_CS_
@@ -377,37 +380,37 @@ TAO_NAMESPACE_END
 IR::ComponentDefSeq::ComponentDefSeq (void)
 {}
 IR::ComponentDefSeq::ComponentDefSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq
+_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<IR::ComponentDef,IR::ComponentDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Object_Sequence<IR::ComponentDef,IR::ComponentDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 IR::ComponentDefSeq::ComponentDefSeq (CORBA::ULong max, CORBA::ULong length, IR::ComponentDef_ptr *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq
+_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<IR::ComponentDef,IR::ComponentDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Object_Sequence<IR::ComponentDef,IR::ComponentDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 IR::ComponentDefSeq::ComponentDefSeq (const ComponentDefSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq
+_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<IR::ComponentDef,IR::ComponentDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Object_Sequence<IR::ComponentDef,IR::ComponentDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 IR::ComponentDefSeq::~ComponentDefSeq (void) // dtor
 {}
-void IR::ComponentDefSeq::_tao_any_destructor (void *x)
+void IR::ComponentDefSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ComponentDefSeq *tmp = ACE_static_cast (ComponentDefSeq*,x);
+  ComponentDefSeq *tmp = ACE_static_cast (ComponentDefSeq*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -418,19 +421,19 @@ static const CORBA::Long _oc_IR_ComponentDefSeq[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f43), 
-  ACE_NTOHL (0x6f6d706f), 
-  ACE_NTOHL (0x6e656e74), 
-  ACE_NTOHL (0x44656653), 
-  ACE_NTOHL (0x65713a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49522f43),
+  ACE_NTOHL (0x6f6d706f),
+  ACE_NTOHL (0x6e656e74),
+  ACE_NTOHL (0x44656653),
+  ACE_NTOHL (0x65713a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/ComponentDefSeq:1.0
   16,
-  ACE_NTOHL (0x436f6d70), 
-  ACE_NTOHL (0x6f6e656e), 
-  ACE_NTOHL (0x74446566), 
+  ACE_NTOHL (0x436f6d70),
+  ACE_NTOHL (0x6f6e656e),
+  ACE_NTOHL (0x74446566),
   ACE_NTOHL (0x53657100),  // name = ComponentDefSeq
   CORBA::tk_sequence, // typecode kind
   76, // encapsulation length
@@ -439,18 +442,18 @@ static const CORBA::Long _oc_IR_ComponentDefSeq[] =
     60, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       32,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x49522f43), 
-      ACE_NTOHL (0x6f6d706f), 
-      ACE_NTOHL (0x6e656e74), 
-      ACE_NTOHL (0x4465663a), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x49522f43),
+      ACE_NTOHL (0x6f6d706f),
+      ACE_NTOHL (0x6e656e74),
+      ACE_NTOHL (0x4465663a),
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/ComponentDef:1.0
       13,
-      ACE_NTOHL (0x436f6d70), 
-      ACE_NTOHL (0x6f6e656e), 
-      ACE_NTOHL (0x74446566), 
+      ACE_NTOHL (0x436f6d70),
+      ACE_NTOHL (0x6f6e656e),
+      ACE_NTOHL (0x74446566),
       ACE_NTOHL (0x0),  // name = ComponentDef
 
     0U,
@@ -472,97 +475,97 @@ TAO_NAMESPACE_END
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CS_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CS_
 
-  // The Base_Sequence functions, please see tao/Sequence.h
-  void
-  IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    IR::ProvidesDef **tmp = 0;
-    tmp = _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      IR::ProvidesDef **old = ACE_reinterpret_cast (IR::ProvidesDef**, this->buffer_);
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = IR::ProvidesDef::_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete[] old;
-        }
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_deallocate_buffer (void)
+// The Base_Sequence functions, please see tao/Sequence.h
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_allocate_buffer (CORBA::ULong length)
+{
+  IR::ProvidesDef **tmp = 0;
+  tmp = _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (length);
+
+  if (this->buffer_ != 0)
   {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    IR::ProvidesDef **tmp = ACE_reinterpret_cast (IR::ProvidesDef**, this->buffer_);
-    
+    IR::ProvidesDef **old = ACE_reinterpret_cast (IR::ProvidesDef**, this->buffer_);
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
-        CORBA::release (tmp[i]);
-        tmp[i] = IR::ProvidesDef::_nil ();
+        if (!this->release_)
+          {
+            tmp[i] = IR::ProvidesDef::_duplicate (old[i]);
+          }
+        else
+          {
+            tmp[i] = old[i];
+          }
       }
-    
-    _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  }
-  
-  IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::~_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (void)
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  void
-  IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-  {
-    IR::ProvidesDef **tmp = ACE_reinterpret_cast (IR::ProvidesDef**, this->buffer_);
-    
-    for (CORBA::ULong i = nl; i < ol; ++i)
+
+    if (this->release_)
       {
-        CORBA::release (tmp[i]);
-        tmp[i] = IR::ProvidesDef::_nil ();
+        delete[] old;
       }
   }
-  
-  void 
-  IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_downcast (
-      void* target,
-      CORBA_Object *src,
-      CORBA_Environment &ACE_TRY_ENV
-    )
-  {
-    IR::ProvidesDef **tmp = ACE_static_cast (IR::ProvidesDef**, target);
-    *tmp = IR::ProvidesDef::_narrow (src, ACE_TRY_ENV);
-    ACE_CHECK;
-  }
+  this->buffer_ = tmp;
+}
+
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    return;
+  IR::ProvidesDef **tmp = ACE_reinterpret_cast (IR::ProvidesDef**, this->buffer_);
+
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      CORBA::release (tmp[i]);
+      tmp[i] = IR::ProvidesDef::_nil ();
+    }
+
+  _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::freebuf (tmp);
+  this->buffer_ = 0;
+}
+
+IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::~_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (void)
+{
+  this->_deallocate_buffer ();
+}
+
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+{
+  IR::ProvidesDef **tmp = ACE_reinterpret_cast (IR::ProvidesDef**, this->buffer_);
+
+  for (CORBA::ULong i = nl; i < ol; ++i)
+    {
+      CORBA::release (tmp[i]);
+      tmp[i] = IR::ProvidesDef::_nil ();
+    }
+}
+
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_downcast (
+    void* target,
+    CORBA_Object *src,
+    CORBA_Environment &ACE_TRY_ENV
+  )
+{
+  IR::ProvidesDef **tmp = ACE_static_cast (IR::ProvidesDef**, target);
+  *tmp = IR::ProvidesDef::_narrow (src, ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+CORBA_Object*
+IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_upcast (void *src) const
+{
+  IR::ProvidesDef **tmp = ACE_static_cast (IR::ProvidesDef**, src);
+  return *tmp;
+}
 
-  CORBA_Object*
-  IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_upcast (void *src) const
-  {
-    IR::ProvidesDef **tmp = ACE_static_cast (IR::ProvidesDef**, src);
-    return *tmp;
-  }
-  
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_PROVIDESDEFSEQ_CS_)
 #define _IR_PROVIDESDEFSEQ_CS_
@@ -574,37 +577,37 @@ TAO_NAMESPACE_END
 IR::ProvidesDefSeq::ProvidesDefSeq (void)
 {}
 IR::ProvidesDefSeq::ProvidesDefSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq
+_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<IR::ProvidesDef,IR::ProvidesDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Object_Sequence<IR::ProvidesDef,IR::ProvidesDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 IR::ProvidesDefSeq::ProvidesDefSeq (CORBA::ULong max, CORBA::ULong length, IR::ProvidesDef_ptr *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq
+_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<IR::ProvidesDef,IR::ProvidesDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Object_Sequence<IR::ProvidesDef,IR::ProvidesDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 IR::ProvidesDefSeq::ProvidesDefSeq (const ProvidesDefSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq
+_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<IR::ProvidesDef,IR::ProvidesDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Object_Sequence<IR::ProvidesDef,IR::ProvidesDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 IR::ProvidesDefSeq::~ProvidesDefSeq (void) // dtor
 {}
-void IR::ProvidesDefSeq::_tao_any_destructor (void *x)
+void IR::ProvidesDefSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ProvidesDefSeq *tmp = ACE_static_cast (ProvidesDefSeq*,x);
+  ProvidesDefSeq *tmp = ACE_static_cast (ProvidesDefSeq*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -615,19 +618,19 @@ static const CORBA::Long _oc_IR_ProvidesDefSeq[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   34,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f50), 
-  ACE_NTOHL (0x726f7669), 
-  ACE_NTOHL (0x64657344), 
-  ACE_NTOHL (0x65665365), 
-  ACE_NTOHL (0x713a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49522f50),
+  ACE_NTOHL (0x726f7669),
+  ACE_NTOHL (0x64657344),
+  ACE_NTOHL (0x65665365),
+  ACE_NTOHL (0x713a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/ProvidesDefSeq:1.0
   15,
-  ACE_NTOHL (0x50726f76), 
-  ACE_NTOHL (0x69646573), 
-  ACE_NTOHL (0x44656653), 
+  ACE_NTOHL (0x50726f76),
+  ACE_NTOHL (0x69646573),
+  ACE_NTOHL (0x44656653),
   ACE_NTOHL (0x65710000),  // name = ProvidesDefSeq
   CORBA::tk_sequence, // typecode kind
   72, // encapsulation length
@@ -636,17 +639,17 @@ static const CORBA::Long _oc_IR_ProvidesDefSeq[] =
     56, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       31,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x49522f50), 
-      ACE_NTOHL (0x726f7669), 
-      ACE_NTOHL (0x64657344), 
-      ACE_NTOHL (0x65663a31), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x49522f50),
+      ACE_NTOHL (0x726f7669),
+      ACE_NTOHL (0x64657344),
+      ACE_NTOHL (0x65663a31),
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/ProvidesDef:1.0
       12,
-      ACE_NTOHL (0x50726f76), 
-      ACE_NTOHL (0x69646573), 
+      ACE_NTOHL (0x50726f76),
+      ACE_NTOHL (0x69646573),
       ACE_NTOHL (0x44656600),  // name = ProvidesDef
 
     0U,
@@ -668,97 +671,97 @@ TAO_NAMESPACE_END
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CS_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CS_
 
-  // The Base_Sequence functions, please see tao/Sequence.h
-  void
-  IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    IR::UsesDef **tmp = 0;
-    tmp = _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      IR::UsesDef **old = ACE_reinterpret_cast (IR::UsesDef**, this->buffer_);
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = IR::UsesDef::_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete[] old;
-        }
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_deallocate_buffer (void)
+// The Base_Sequence functions, please see tao/Sequence.h
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_allocate_buffer (CORBA::ULong length)
+{
+  IR::UsesDef **tmp = 0;
+  tmp = _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (length);
+
+  if (this->buffer_ != 0)
   {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    IR::UsesDef **tmp = ACE_reinterpret_cast (IR::UsesDef**, this->buffer_);
-    
+    IR::UsesDef **old = ACE_reinterpret_cast (IR::UsesDef**, this->buffer_);
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
-        CORBA::release (tmp[i]);
-        tmp[i] = IR::UsesDef::_nil ();
+        if (!this->release_)
+          {
+            tmp[i] = IR::UsesDef::_duplicate (old[i]);
+          }
+        else
+          {
+            tmp[i] = old[i];
+          }
       }
-    
-    _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  }
-  
-  IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::~_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (void)
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  void
-  IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-  {
-    IR::UsesDef **tmp = ACE_reinterpret_cast (IR::UsesDef**, this->buffer_);
-    
-    for (CORBA::ULong i = nl; i < ol; ++i)
+
+    if (this->release_)
       {
-        CORBA::release (tmp[i]);
-        tmp[i] = IR::UsesDef::_nil ();
+        delete[] old;
       }
   }
-  
-  void 
-  IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_downcast (
-      void* target,
-      CORBA_Object *src,
-      CORBA_Environment &ACE_TRY_ENV
-    )
-  {
-    IR::UsesDef **tmp = ACE_static_cast (IR::UsesDef**, target);
-    *tmp = IR::UsesDef::_narrow (src, ACE_TRY_ENV);
-    ACE_CHECK;
-  }
+  this->buffer_ = tmp;
+}
+
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    return;
+  IR::UsesDef **tmp = ACE_reinterpret_cast (IR::UsesDef**, this->buffer_);
+
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      CORBA::release (tmp[i]);
+      tmp[i] = IR::UsesDef::_nil ();
+    }
+
+  _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::freebuf (tmp);
+  this->buffer_ = 0;
+}
+
+IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::~_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (void)
+{
+  this->_deallocate_buffer ();
+}
+
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+{
+  IR::UsesDef **tmp = ACE_reinterpret_cast (IR::UsesDef**, this->buffer_);
+
+  for (CORBA::ULong i = nl; i < ol; ++i)
+    {
+      CORBA::release (tmp[i]);
+      tmp[i] = IR::UsesDef::_nil ();
+    }
+}
+
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_downcast (
+    void* target,
+    CORBA_Object *src,
+    CORBA_Environment &ACE_TRY_ENV
+  )
+{
+  IR::UsesDef **tmp = ACE_static_cast (IR::UsesDef**, target);
+  *tmp = IR::UsesDef::_narrow (src, ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+CORBA_Object*
+IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_upcast (void *src) const
+{
+  IR::UsesDef **tmp = ACE_static_cast (IR::UsesDef**, src);
+  return *tmp;
+}
 
-  CORBA_Object*
-  IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_upcast (void *src) const
-  {
-    IR::UsesDef **tmp = ACE_static_cast (IR::UsesDef**, src);
-    return *tmp;
-  }
-  
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_USESDEFSEQ_CS_)
 #define _IR_USESDEFSEQ_CS_
@@ -770,37 +773,37 @@ TAO_NAMESPACE_END
 IR::UsesDefSeq::UsesDefSeq (void)
 {}
 IR::UsesDefSeq::UsesDefSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq
+_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<IR::UsesDef,IR::UsesDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Object_Sequence<IR::UsesDef,IR::UsesDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 IR::UsesDefSeq::UsesDefSeq (CORBA::ULong max, CORBA::ULong length, IR::UsesDef_ptr *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq
+_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<IR::UsesDef,IR::UsesDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Object_Sequence<IR::UsesDef,IR::UsesDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 IR::UsesDefSeq::UsesDefSeq (const UsesDefSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq
+_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<IR::UsesDef,IR::UsesDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Object_Sequence<IR::UsesDef,IR::UsesDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 IR::UsesDefSeq::~UsesDefSeq (void) // dtor
 {}
-void IR::UsesDefSeq::_tao_any_destructor (void *x)
+void IR::UsesDefSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  UsesDefSeq *tmp = ACE_static_cast (UsesDefSeq*,x);
+  UsesDefSeq *tmp = ACE_static_cast (UsesDefSeq*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -811,17 +814,17 @@ static const CORBA::Long _oc_IR_UsesDefSeq[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f55), 
-  ACE_NTOHL (0x73657344), 
-  ACE_NTOHL (0x65665365), 
-  ACE_NTOHL (0x713a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49522f55),
+  ACE_NTOHL (0x73657344),
+  ACE_NTOHL (0x65665365),
+  ACE_NTOHL (0x713a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/UsesDefSeq:1.0
   11,
-  ACE_NTOHL (0x55736573), 
-  ACE_NTOHL (0x44656653), 
+  ACE_NTOHL (0x55736573),
+  ACE_NTOHL (0x44656653),
   ACE_NTOHL (0x65710000),  // name = UsesDefSeq
   CORBA::tk_sequence, // typecode kind
   64, // encapsulation length
@@ -830,15 +833,15 @@ static const CORBA::Long _oc_IR_UsesDefSeq[] =
     48, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       27,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x49522f55), 
-      ACE_NTOHL (0x73657344), 
-      ACE_NTOHL (0x65663a31), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x49522f55),
+      ACE_NTOHL (0x73657344),
+      ACE_NTOHL (0x65663a31),
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/UsesDef:1.0
       8,
-      ACE_NTOHL (0x55736573), 
+      ACE_NTOHL (0x55736573),
       ACE_NTOHL (0x44656600),  // name = UsesDef
 
     0U,
@@ -860,97 +863,97 @@ TAO_NAMESPACE_END
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CS_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CS_
 
-  // The Base_Sequence functions, please see tao/Sequence.h
-  void
-  IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    IR::HomeDef **tmp = 0;
-    tmp = _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      IR::HomeDef **old = ACE_reinterpret_cast (IR::HomeDef**, this->buffer_);
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = IR::HomeDef::_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete[] old;
-        }
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_deallocate_buffer (void)
+// The Base_Sequence functions, please see tao/Sequence.h
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_allocate_buffer (CORBA::ULong length)
+{
+  IR::HomeDef **tmp = 0;
+  tmp = _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (length);
+
+  if (this->buffer_ != 0)
   {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    IR::HomeDef **tmp = ACE_reinterpret_cast (IR::HomeDef**, this->buffer_);
-    
+    IR::HomeDef **old = ACE_reinterpret_cast (IR::HomeDef**, this->buffer_);
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
-        CORBA::release (tmp[i]);
-        tmp[i] = IR::HomeDef::_nil ();
+        if (!this->release_)
+          {
+            tmp[i] = IR::HomeDef::_duplicate (old[i]);
+          }
+        else
+          {
+            tmp[i] = old[i];
+          }
       }
-    
-    _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  }
-  
-  IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::~_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (void)
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  void
-  IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-  {
-    IR::HomeDef **tmp = ACE_reinterpret_cast (IR::HomeDef**, this->buffer_);
-    
-    for (CORBA::ULong i = nl; i < ol; ++i)
+
+    if (this->release_)
       {
-        CORBA::release (tmp[i]);
-        tmp[i] = IR::HomeDef::_nil ();
+        delete[] old;
       }
   }
-  
-  void 
-  IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_downcast (
-      void* target,
-      CORBA_Object *src,
-      CORBA_Environment &ACE_TRY_ENV
-    )
-  {
-    IR::HomeDef **tmp = ACE_static_cast (IR::HomeDef**, target);
-    *tmp = IR::HomeDef::_narrow (src, ACE_TRY_ENV);
-    ACE_CHECK;
-  }
+  this->buffer_ = tmp;
+}
+
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    return;
+  IR::HomeDef **tmp = ACE_reinterpret_cast (IR::HomeDef**, this->buffer_);
+
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      CORBA::release (tmp[i]);
+      tmp[i] = IR::HomeDef::_nil ();
+    }
+
+  _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::freebuf (tmp);
+  this->buffer_ = 0;
+}
+
+IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::~_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (void)
+{
+  this->_deallocate_buffer ();
+}
+
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+{
+  IR::HomeDef **tmp = ACE_reinterpret_cast (IR::HomeDef**, this->buffer_);
+
+  for (CORBA::ULong i = nl; i < ol; ++i)
+    {
+      CORBA::release (tmp[i]);
+      tmp[i] = IR::HomeDef::_nil ();
+    }
+}
+
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_downcast (
+    void* target,
+    CORBA_Object *src,
+    CORBA_Environment &ACE_TRY_ENV
+  )
+{
+  IR::HomeDef **tmp = ACE_static_cast (IR::HomeDef**, target);
+  *tmp = IR::HomeDef::_narrow (src, ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+CORBA_Object*
+IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_upcast (void *src) const
+{
+  IR::HomeDef **tmp = ACE_static_cast (IR::HomeDef**, src);
+  return *tmp;
+}
 
-  CORBA_Object*
-  IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_upcast (void *src) const
-  {
-    IR::HomeDef **tmp = ACE_static_cast (IR::HomeDef**, src);
-    return *tmp;
-  }
-  
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_HOMEDEFSEQ_CS_)
 #define _IR_HOMEDEFSEQ_CS_
@@ -962,37 +965,37 @@ TAO_NAMESPACE_END
 IR::HomeDefSeq::HomeDefSeq (void)
 {}
 IR::HomeDefSeq::HomeDefSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq
+_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<IR::HomeDef,IR::HomeDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Object_Sequence<IR::HomeDef,IR::HomeDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 IR::HomeDefSeq::HomeDefSeq (CORBA::ULong max, CORBA::ULong length, IR::HomeDef_ptr *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq
+_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<IR::HomeDef,IR::HomeDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Object_Sequence<IR::HomeDef,IR::HomeDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 IR::HomeDefSeq::HomeDefSeq (const HomeDefSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq
+_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<IR::HomeDef,IR::HomeDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Object_Sequence<IR::HomeDef,IR::HomeDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 IR::HomeDefSeq::~HomeDefSeq (void) // dtor
 {}
-void IR::HomeDefSeq::_tao_any_destructor (void *x)
+void IR::HomeDefSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  HomeDefSeq *tmp = ACE_static_cast (HomeDefSeq*,x);
+  HomeDefSeq *tmp = ACE_static_cast (HomeDefSeq*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -1003,17 +1006,17 @@ static const CORBA::Long _oc_IR_HomeDefSeq[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f48), 
-  ACE_NTOHL (0x6f6d6544), 
-  ACE_NTOHL (0x65665365), 
-  ACE_NTOHL (0x713a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49522f48),
+  ACE_NTOHL (0x6f6d6544),
+  ACE_NTOHL (0x65665365),
+  ACE_NTOHL (0x713a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/HomeDefSeq:1.0
   11,
-  ACE_NTOHL (0x486f6d65), 
-  ACE_NTOHL (0x44656653), 
+  ACE_NTOHL (0x486f6d65),
+  ACE_NTOHL (0x44656653),
   ACE_NTOHL (0x65710000),  // name = HomeDefSeq
   CORBA::tk_sequence, // typecode kind
   64, // encapsulation length
@@ -1022,15 +1025,15 @@ static const CORBA::Long _oc_IR_HomeDefSeq[] =
     48, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       27,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x49522f48), 
-      ACE_NTOHL (0x6f6d6544), 
-      ACE_NTOHL (0x65663a31), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x49522f48),
+      ACE_NTOHL (0x6f6d6544),
+      ACE_NTOHL (0x65663a31),
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/HomeDef:1.0
       8,
-      ACE_NTOHL (0x486f6d65), 
+      ACE_NTOHL (0x486f6d65),
       ACE_NTOHL (0x44656600),  // name = HomeDef
 
     0U,
@@ -1052,97 +1055,97 @@ TAO_NAMESPACE_END
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CS_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CS_
 
-  // The Base_Sequence functions, please see tao/Sequence.h
-  void
-  IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    IR::EmitsDef **tmp = 0;
-    tmp = _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      IR::EmitsDef **old = ACE_reinterpret_cast (IR::EmitsDef**, this->buffer_);
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = IR::EmitsDef::_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete[] old;
-        }
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_deallocate_buffer (void)
+// The Base_Sequence functions, please see tao/Sequence.h
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_allocate_buffer (CORBA::ULong length)
+{
+  IR::EmitsDef **tmp = 0;
+  tmp = _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (length);
+
+  if (this->buffer_ != 0)
   {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    IR::EmitsDef **tmp = ACE_reinterpret_cast (IR::EmitsDef**, this->buffer_);
-    
+    IR::EmitsDef **old = ACE_reinterpret_cast (IR::EmitsDef**, this->buffer_);
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
-        CORBA::release (tmp[i]);
-        tmp[i] = IR::EmitsDef::_nil ();
+        if (!this->release_)
+          {
+            tmp[i] = IR::EmitsDef::_duplicate (old[i]);
+          }
+        else
+          {
+            tmp[i] = old[i];
+          }
       }
-    
-    _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  }
-  
-  IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::~_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (void)
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  void
-  IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-  {
-    IR::EmitsDef **tmp = ACE_reinterpret_cast (IR::EmitsDef**, this->buffer_);
-    
-    for (CORBA::ULong i = nl; i < ol; ++i)
+
+    if (this->release_)
       {
-        CORBA::release (tmp[i]);
-        tmp[i] = IR::EmitsDef::_nil ();
+        delete[] old;
       }
   }
-  
-  void 
-  IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_downcast (
-      void* target,
-      CORBA_Object *src,
-      CORBA_Environment &ACE_TRY_ENV
-    )
-  {
-    IR::EmitsDef **tmp = ACE_static_cast (IR::EmitsDef**, target);
-    *tmp = IR::EmitsDef::_narrow (src, ACE_TRY_ENV);
-    ACE_CHECK;
-  }
+  this->buffer_ = tmp;
+}
+
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    return;
+  IR::EmitsDef **tmp = ACE_reinterpret_cast (IR::EmitsDef**, this->buffer_);
+
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      CORBA::release (tmp[i]);
+      tmp[i] = IR::EmitsDef::_nil ();
+    }
+
+  _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::freebuf (tmp);
+  this->buffer_ = 0;
+}
+
+IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::~_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (void)
+{
+  this->_deallocate_buffer ();
+}
+
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+{
+  IR::EmitsDef **tmp = ACE_reinterpret_cast (IR::EmitsDef**, this->buffer_);
+
+  for (CORBA::ULong i = nl; i < ol; ++i)
+    {
+      CORBA::release (tmp[i]);
+      tmp[i] = IR::EmitsDef::_nil ();
+    }
+}
+
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_downcast (
+    void* target,
+    CORBA_Object *src,
+    CORBA_Environment &ACE_TRY_ENV
+  )
+{
+  IR::EmitsDef **tmp = ACE_static_cast (IR::EmitsDef**, target);
+  *tmp = IR::EmitsDef::_narrow (src, ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+CORBA_Object*
+IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_upcast (void *src) const
+{
+  IR::EmitsDef **tmp = ACE_static_cast (IR::EmitsDef**, src);
+  return *tmp;
+}
 
-  CORBA_Object*
-  IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_upcast (void *src) const
-  {
-    IR::EmitsDef **tmp = ACE_static_cast (IR::EmitsDef**, src);
-    return *tmp;
-  }
-  
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_EMITSDEFSEQ_CS_)
 #define _IR_EMITSDEFSEQ_CS_
@@ -1154,37 +1157,37 @@ TAO_NAMESPACE_END
 IR::EmitsDefSeq::EmitsDefSeq (void)
 {}
 IR::EmitsDefSeq::EmitsDefSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq
+_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<IR::EmitsDef,IR::EmitsDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Object_Sequence<IR::EmitsDef,IR::EmitsDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 IR::EmitsDefSeq::EmitsDefSeq (CORBA::ULong max, CORBA::ULong length, IR::EmitsDef_ptr *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq
+_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<IR::EmitsDef,IR::EmitsDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Object_Sequence<IR::EmitsDef,IR::EmitsDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 IR::EmitsDefSeq::EmitsDefSeq (const EmitsDefSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq
+_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<IR::EmitsDef,IR::EmitsDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Object_Sequence<IR::EmitsDef,IR::EmitsDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 IR::EmitsDefSeq::~EmitsDefSeq (void) // dtor
 {}
-void IR::EmitsDefSeq::_tao_any_destructor (void *x)
+void IR::EmitsDefSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  EmitsDefSeq *tmp = ACE_static_cast (EmitsDefSeq*,x);
+  EmitsDefSeq *tmp = ACE_static_cast (EmitsDefSeq*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -1195,17 +1198,17 @@ static const CORBA::Long _oc_IR_EmitsDefSeq[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   31,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f45), 
-  ACE_NTOHL (0x6d697473), 
-  ACE_NTOHL (0x44656653), 
-  ACE_NTOHL (0x65713a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49522f45),
+  ACE_NTOHL (0x6d697473),
+  ACE_NTOHL (0x44656653),
+  ACE_NTOHL (0x65713a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/EmitsDefSeq:1.0
   12,
-  ACE_NTOHL (0x456d6974), 
-  ACE_NTOHL (0x73446566), 
+  ACE_NTOHL (0x456d6974),
+  ACE_NTOHL (0x73446566),
   ACE_NTOHL (0x53657100),  // name = EmitsDefSeq
   CORBA::tk_sequence, // typecode kind
   68, // encapsulation length
@@ -1214,16 +1217,16 @@ static const CORBA::Long _oc_IR_EmitsDefSeq[] =
     52, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       28,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x49522f45), 
-      ACE_NTOHL (0x6d697473), 
-      ACE_NTOHL (0x4465663a), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x49522f45),
+      ACE_NTOHL (0x6d697473),
+      ACE_NTOHL (0x4465663a),
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/EmitsDef:1.0
       9,
-      ACE_NTOHL (0x456d6974), 
-      ACE_NTOHL (0x73446566), 
+      ACE_NTOHL (0x456d6974),
+      ACE_NTOHL (0x73446566),
       ACE_NTOHL (0x0),  // name = EmitsDef
 
     0U,
@@ -1245,97 +1248,97 @@ TAO_NAMESPACE_END
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CS_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CS_
 
-  // The Base_Sequence functions, please see tao/Sequence.h
-  void
-  IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    IR::PublishesDef **tmp = 0;
-    tmp = _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      IR::PublishesDef **old = ACE_reinterpret_cast (IR::PublishesDef**, this->buffer_);
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = IR::PublishesDef::_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete[] old;
-        }
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_deallocate_buffer (void)
+// The Base_Sequence functions, please see tao/Sequence.h
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_allocate_buffer (CORBA::ULong length)
+{
+  IR::PublishesDef **tmp = 0;
+  tmp = _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (length);
+
+  if (this->buffer_ != 0)
   {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    IR::PublishesDef **tmp = ACE_reinterpret_cast (IR::PublishesDef**, this->buffer_);
-    
+    IR::PublishesDef **old = ACE_reinterpret_cast (IR::PublishesDef**, this->buffer_);
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
-        CORBA::release (tmp[i]);
-        tmp[i] = IR::PublishesDef::_nil ();
+        if (!this->release_)
+          {
+            tmp[i] = IR::PublishesDef::_duplicate (old[i]);
+          }
+        else
+          {
+            tmp[i] = old[i];
+          }
       }
-    
-    _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  }
-  
-  IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::~_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (void)
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  void
-  IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-  {
-    IR::PublishesDef **tmp = ACE_reinterpret_cast (IR::PublishesDef**, this->buffer_);
-    
-    for (CORBA::ULong i = nl; i < ol; ++i)
+
+    if (this->release_)
       {
-        CORBA::release (tmp[i]);
-        tmp[i] = IR::PublishesDef::_nil ();
+        delete[] old;
       }
   }
-  
-  void 
-  IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_downcast (
-      void* target,
-      CORBA_Object *src,
-      CORBA_Environment &ACE_TRY_ENV
-    )
-  {
-    IR::PublishesDef **tmp = ACE_static_cast (IR::PublishesDef**, target);
-    *tmp = IR::PublishesDef::_narrow (src, ACE_TRY_ENV);
-    ACE_CHECK;
-  }
+  this->buffer_ = tmp;
+}
+
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    return;
+  IR::PublishesDef **tmp = ACE_reinterpret_cast (IR::PublishesDef**, this->buffer_);
+
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      CORBA::release (tmp[i]);
+      tmp[i] = IR::PublishesDef::_nil ();
+    }
+
+  _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::freebuf (tmp);
+  this->buffer_ = 0;
+}
+
+IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::~_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (void)
+{
+  this->_deallocate_buffer ();
+}
+
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+{
+  IR::PublishesDef **tmp = ACE_reinterpret_cast (IR::PublishesDef**, this->buffer_);
+
+  for (CORBA::ULong i = nl; i < ol; ++i)
+    {
+      CORBA::release (tmp[i]);
+      tmp[i] = IR::PublishesDef::_nil ();
+    }
+}
+
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_downcast (
+    void* target,
+    CORBA_Object *src,
+    CORBA_Environment &ACE_TRY_ENV
+  )
+{
+  IR::PublishesDef **tmp = ACE_static_cast (IR::PublishesDef**, target);
+  *tmp = IR::PublishesDef::_narrow (src, ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+CORBA_Object*
+IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_upcast (void *src) const
+{
+  IR::PublishesDef **tmp = ACE_static_cast (IR::PublishesDef**, src);
+  return *tmp;
+}
 
-  CORBA_Object*
-  IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_upcast (void *src) const
-  {
-    IR::PublishesDef **tmp = ACE_static_cast (IR::PublishesDef**, src);
-    return *tmp;
-  }
-  
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_PUBLISHESDEFSEQ_CS_)
 #define _IR_PUBLISHESDEFSEQ_CS_
@@ -1347,37 +1350,37 @@ TAO_NAMESPACE_END
 IR::PublishesDefSeq::PublishesDefSeq (void)
 {}
 IR::PublishesDefSeq::PublishesDefSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq
+_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<IR::PublishesDef,IR::PublishesDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Object_Sequence<IR::PublishesDef,IR::PublishesDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 IR::PublishesDefSeq::PublishesDefSeq (CORBA::ULong max, CORBA::ULong length, IR::PublishesDef_ptr *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq
+_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<IR::PublishesDef,IR::PublishesDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Object_Sequence<IR::PublishesDef,IR::PublishesDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 IR::PublishesDefSeq::PublishesDefSeq (const PublishesDefSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq
+_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<IR::PublishesDef,IR::PublishesDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Object_Sequence<IR::PublishesDef,IR::PublishesDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 IR::PublishesDefSeq::~PublishesDefSeq (void) // dtor
 {}
-void IR::PublishesDefSeq::_tao_any_destructor (void *x)
+void IR::PublishesDefSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  PublishesDefSeq *tmp = ACE_static_cast (PublishesDefSeq*,x);
+  PublishesDefSeq *tmp = ACE_static_cast (PublishesDefSeq*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -1388,19 +1391,19 @@ static const CORBA::Long _oc_IR_PublishesDefSeq[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f50), 
-  ACE_NTOHL (0x75626c69), 
-  ACE_NTOHL (0x73686573), 
-  ACE_NTOHL (0x44656653), 
-  ACE_NTOHL (0x65713a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49522f50),
+  ACE_NTOHL (0x75626c69),
+  ACE_NTOHL (0x73686573),
+  ACE_NTOHL (0x44656653),
+  ACE_NTOHL (0x65713a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/PublishesDefSeq:1.0
   16,
-  ACE_NTOHL (0x5075626c), 
-  ACE_NTOHL (0x69736865), 
-  ACE_NTOHL (0x73446566), 
+  ACE_NTOHL (0x5075626c),
+  ACE_NTOHL (0x69736865),
+  ACE_NTOHL (0x73446566),
   ACE_NTOHL (0x53657100),  // name = PublishesDefSeq
   CORBA::tk_sequence, // typecode kind
   76, // encapsulation length
@@ -1409,18 +1412,18 @@ static const CORBA::Long _oc_IR_PublishesDefSeq[] =
     60, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       32,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x49522f50), 
-      ACE_NTOHL (0x75626c69), 
-      ACE_NTOHL (0x73686573), 
-      ACE_NTOHL (0x4465663a), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x49522f50),
+      ACE_NTOHL (0x75626c69),
+      ACE_NTOHL (0x73686573),
+      ACE_NTOHL (0x4465663a),
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/PublishesDef:1.0
       13,
-      ACE_NTOHL (0x5075626c), 
-      ACE_NTOHL (0x69736865), 
-      ACE_NTOHL (0x73446566), 
+      ACE_NTOHL (0x5075626c),
+      ACE_NTOHL (0x69736865),
+      ACE_NTOHL (0x73446566),
       ACE_NTOHL (0x0),  // name = PublishesDef
 
     0U,
@@ -1442,97 +1445,97 @@ TAO_NAMESPACE_END
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CS_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CS_
 
-  // The Base_Sequence functions, please see tao/Sequence.h
-  void
-  IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    IR::ConsumesDef **tmp = 0;
-    tmp = _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      IR::ConsumesDef **old = ACE_reinterpret_cast (IR::ConsumesDef**, this->buffer_);
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = IR::ConsumesDef::_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete[] old;
-        }
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_deallocate_buffer (void)
+// The Base_Sequence functions, please see tao/Sequence.h
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_allocate_buffer (CORBA::ULong length)
+{
+  IR::ConsumesDef **tmp = 0;
+  tmp = _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (length);
+
+  if (this->buffer_ != 0)
   {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    IR::ConsumesDef **tmp = ACE_reinterpret_cast (IR::ConsumesDef**, this->buffer_);
-    
+    IR::ConsumesDef **old = ACE_reinterpret_cast (IR::ConsumesDef**, this->buffer_);
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
-        CORBA::release (tmp[i]);
-        tmp[i] = IR::ConsumesDef::_nil ();
+        if (!this->release_)
+          {
+            tmp[i] = IR::ConsumesDef::_duplicate (old[i]);
+          }
+        else
+          {
+            tmp[i] = old[i];
+          }
       }
-    
-    _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  }
-  
-  IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::~_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (void)
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  void
-  IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-  {
-    IR::ConsumesDef **tmp = ACE_reinterpret_cast (IR::ConsumesDef**, this->buffer_);
-    
-    for (CORBA::ULong i = nl; i < ol; ++i)
+
+    if (this->release_)
       {
-        CORBA::release (tmp[i]);
-        tmp[i] = IR::ConsumesDef::_nil ();
+        delete[] old;
       }
   }
-  
-  void 
-  IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_downcast (
-      void* target,
-      CORBA_Object *src,
-      CORBA_Environment &ACE_TRY_ENV
-    )
-  {
-    IR::ConsumesDef **tmp = ACE_static_cast (IR::ConsumesDef**, target);
-    *tmp = IR::ConsumesDef::_narrow (src, ACE_TRY_ENV);
-    ACE_CHECK;
-  }
+  this->buffer_ = tmp;
+}
+
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    return;
+  IR::ConsumesDef **tmp = ACE_reinterpret_cast (IR::ConsumesDef**, this->buffer_);
+
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      CORBA::release (tmp[i]);
+      tmp[i] = IR::ConsumesDef::_nil ();
+    }
+
+  _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::freebuf (tmp);
+  this->buffer_ = 0;
+}
+
+IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::~_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (void)
+{
+  this->_deallocate_buffer ();
+}
+
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+{
+  IR::ConsumesDef **tmp = ACE_reinterpret_cast (IR::ConsumesDef**, this->buffer_);
+
+  for (CORBA::ULong i = nl; i < ol; ++i)
+    {
+      CORBA::release (tmp[i]);
+      tmp[i] = IR::ConsumesDef::_nil ();
+    }
+}
+
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_downcast (
+    void* target,
+    CORBA_Object *src,
+    CORBA_Environment &ACE_TRY_ENV
+  )
+{
+  IR::ConsumesDef **tmp = ACE_static_cast (IR::ConsumesDef**, target);
+  *tmp = IR::ConsumesDef::_narrow (src, ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+CORBA_Object*
+IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_upcast (void *src) const
+{
+  IR::ConsumesDef **tmp = ACE_static_cast (IR::ConsumesDef**, src);
+  return *tmp;
+}
 
-  CORBA_Object*
-  IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_upcast (void *src) const
-  {
-    IR::ConsumesDef **tmp = ACE_static_cast (IR::ConsumesDef**, src);
-    return *tmp;
-  }
-  
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_CONSUMESDEFSEQ_CS_)
 #define _IR_CONSUMESDEFSEQ_CS_
@@ -1544,37 +1547,37 @@ TAO_NAMESPACE_END
 IR::ConsumesDefSeq::ConsumesDefSeq (void)
 {}
 IR::ConsumesDefSeq::ConsumesDefSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq
+_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<IR::ConsumesDef,IR::ConsumesDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Object_Sequence<IR::ConsumesDef,IR::ConsumesDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 IR::ConsumesDefSeq::ConsumesDefSeq (CORBA::ULong max, CORBA::ULong length, IR::ConsumesDef_ptr *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq
+_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<IR::ConsumesDef,IR::ConsumesDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Object_Sequence<IR::ConsumesDef,IR::ConsumesDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 IR::ConsumesDefSeq::ConsumesDefSeq (const ConsumesDefSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq
+_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<IR::ConsumesDef,IR::ConsumesDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Object_Sequence<IR::ConsumesDef,IR::ConsumesDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 IR::ConsumesDefSeq::~ConsumesDefSeq (void) // dtor
 {}
-void IR::ConsumesDefSeq::_tao_any_destructor (void *x)
+void IR::ConsumesDefSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ConsumesDefSeq *tmp = ACE_static_cast (ConsumesDefSeq*,x);
+  ConsumesDefSeq *tmp = ACE_static_cast (ConsumesDefSeq*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -1585,19 +1588,19 @@ static const CORBA::Long _oc_IR_ConsumesDefSeq[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   34,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f43), 
-  ACE_NTOHL (0x6f6e7375), 
-  ACE_NTOHL (0x6d657344), 
-  ACE_NTOHL (0x65665365), 
-  ACE_NTOHL (0x713a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49522f43),
+  ACE_NTOHL (0x6f6e7375),
+  ACE_NTOHL (0x6d657344),
+  ACE_NTOHL (0x65665365),
+  ACE_NTOHL (0x713a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/ConsumesDefSeq:1.0
   15,
-  ACE_NTOHL (0x436f6e73), 
-  ACE_NTOHL (0x756d6573), 
-  ACE_NTOHL (0x44656653), 
+  ACE_NTOHL (0x436f6e73),
+  ACE_NTOHL (0x756d6573),
+  ACE_NTOHL (0x44656653),
   ACE_NTOHL (0x65710000),  // name = ConsumesDefSeq
   CORBA::tk_sequence, // typecode kind
   72, // encapsulation length
@@ -1606,17 +1609,17 @@ static const CORBA::Long _oc_IR_ConsumesDefSeq[] =
     56, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       31,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x49522f43), 
-      ACE_NTOHL (0x6f6e7375), 
-      ACE_NTOHL (0x6d657344), 
-      ACE_NTOHL (0x65663a31), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x49522f43),
+      ACE_NTOHL (0x6f6e7375),
+      ACE_NTOHL (0x6d657344),
+      ACE_NTOHL (0x65663a31),
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/ConsumesDef:1.0
       12,
-      ACE_NTOHL (0x436f6e73), 
-      ACE_NTOHL (0x756d6573), 
+      ACE_NTOHL (0x436f6e73),
+      ACE_NTOHL (0x756d6573),
       ACE_NTOHL (0x44656600),  // name = ConsumesDef
 
     0U,
@@ -1638,97 +1641,97 @@ TAO_NAMESPACE_END
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CS_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CS_
 
-  // The Base_Sequence functions, please see tao/Sequence.h
-  void
-  IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    IR::FactoryDef **tmp = 0;
-    tmp = _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      IR::FactoryDef **old = ACE_reinterpret_cast (IR::FactoryDef**, this->buffer_);
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = IR::FactoryDef::_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete[] old;
-        }
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_deallocate_buffer (void)
+// The Base_Sequence functions, please see tao/Sequence.h
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_allocate_buffer (CORBA::ULong length)
+{
+  IR::FactoryDef **tmp = 0;
+  tmp = _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (length);
+
+  if (this->buffer_ != 0)
   {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    IR::FactoryDef **tmp = ACE_reinterpret_cast (IR::FactoryDef**, this->buffer_);
-    
+    IR::FactoryDef **old = ACE_reinterpret_cast (IR::FactoryDef**, this->buffer_);
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
-        CORBA::release (tmp[i]);
-        tmp[i] = IR::FactoryDef::_nil ();
+        if (!this->release_)
+          {
+            tmp[i] = IR::FactoryDef::_duplicate (old[i]);
+          }
+        else
+          {
+            tmp[i] = old[i];
+          }
       }
-    
-    _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  }
-  
-  IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::~_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (void)
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  void
-  IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-  {
-    IR::FactoryDef **tmp = ACE_reinterpret_cast (IR::FactoryDef**, this->buffer_);
-    
-    for (CORBA::ULong i = nl; i < ol; ++i)
+
+    if (this->release_)
       {
-        CORBA::release (tmp[i]);
-        tmp[i] = IR::FactoryDef::_nil ();
+        delete[] old;
       }
   }
-  
-  void 
-  IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_downcast (
-      void* target,
-      CORBA_Object *src,
-      CORBA_Environment &ACE_TRY_ENV
-    )
-  {
-    IR::FactoryDef **tmp = ACE_static_cast (IR::FactoryDef**, target);
-    *tmp = IR::FactoryDef::_narrow (src, ACE_TRY_ENV);
-    ACE_CHECK;
-  }
+  this->buffer_ = tmp;
+}
+
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    return;
+  IR::FactoryDef **tmp = ACE_reinterpret_cast (IR::FactoryDef**, this->buffer_);
+
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      CORBA::release (tmp[i]);
+      tmp[i] = IR::FactoryDef::_nil ();
+    }
+
+  _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::freebuf (tmp);
+  this->buffer_ = 0;
+}
+
+IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::~_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (void)
+{
+  this->_deallocate_buffer ();
+}
+
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+{
+  IR::FactoryDef **tmp = ACE_reinterpret_cast (IR::FactoryDef**, this->buffer_);
+
+  for (CORBA::ULong i = nl; i < ol; ++i)
+    {
+      CORBA::release (tmp[i]);
+      tmp[i] = IR::FactoryDef::_nil ();
+    }
+}
+
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_downcast (
+    void* target,
+    CORBA_Object *src,
+    CORBA_Environment &ACE_TRY_ENV
+  )
+{
+  IR::FactoryDef **tmp = ACE_static_cast (IR::FactoryDef**, target);
+  *tmp = IR::FactoryDef::_narrow (src, ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+CORBA_Object*
+IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_upcast (void *src) const
+{
+  IR::FactoryDef **tmp = ACE_static_cast (IR::FactoryDef**, src);
+  return *tmp;
+}
 
-  CORBA_Object*
-  IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_upcast (void *src) const
-  {
-    IR::FactoryDef **tmp = ACE_static_cast (IR::FactoryDef**, src);
-    return *tmp;
-  }
-  
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_FACTORYDEFSEQ_CS_)
 #define _IR_FACTORYDEFSEQ_CS_
@@ -1740,37 +1743,37 @@ TAO_NAMESPACE_END
 IR::FactoryDefSeq::FactoryDefSeq (void)
 {}
 IR::FactoryDefSeq::FactoryDefSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq
+_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<IR::FactoryDef,IR::FactoryDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Object_Sequence<IR::FactoryDef,IR::FactoryDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 IR::FactoryDefSeq::FactoryDefSeq (CORBA::ULong max, CORBA::ULong length, IR::FactoryDef_ptr *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq
+_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<IR::FactoryDef,IR::FactoryDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Object_Sequence<IR::FactoryDef,IR::FactoryDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 IR::FactoryDefSeq::FactoryDefSeq (const FactoryDefSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq
+_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<IR::FactoryDef,IR::FactoryDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Object_Sequence<IR::FactoryDef,IR::FactoryDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 IR::FactoryDefSeq::~FactoryDefSeq (void) // dtor
 {}
-void IR::FactoryDefSeq::_tao_any_destructor (void *x)
+void IR::FactoryDefSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  FactoryDefSeq *tmp = ACE_static_cast (FactoryDefSeq*,x);
+  FactoryDefSeq *tmp = ACE_static_cast (FactoryDefSeq*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -1781,19 +1784,19 @@ static const CORBA::Long _oc_IR_FactoryDefSeq[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f46), 
-  ACE_NTOHL (0x6163746f), 
-  ACE_NTOHL (0x72794465), 
-  ACE_NTOHL (0x66536571), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49522f46),
+  ACE_NTOHL (0x6163746f),
+  ACE_NTOHL (0x72794465),
+  ACE_NTOHL (0x66536571),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/FactoryDefSeq:1.0
   14,
-  ACE_NTOHL (0x46616374), 
-  ACE_NTOHL (0x6f727944), 
-  ACE_NTOHL (0x65665365), 
+  ACE_NTOHL (0x46616374),
+  ACE_NTOHL (0x6f727944),
+  ACE_NTOHL (0x65665365),
   ACE_NTOHL (0x71000000),  // name = FactoryDefSeq
   CORBA::tk_sequence, // typecode kind
   72, // encapsulation length
@@ -1802,17 +1805,17 @@ static const CORBA::Long _oc_IR_FactoryDefSeq[] =
     56, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       30,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x49522f46), 
-      ACE_NTOHL (0x6163746f), 
-      ACE_NTOHL (0x72794465), 
-      ACE_NTOHL (0x663a312e), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x49522f46),
+      ACE_NTOHL (0x6163746f),
+      ACE_NTOHL (0x72794465),
+      ACE_NTOHL (0x663a312e),
       ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/FactoryDef:1.0
       11,
-      ACE_NTOHL (0x46616374), 
-      ACE_NTOHL (0x6f727944), 
+      ACE_NTOHL (0x46616374),
+      ACE_NTOHL (0x6f727944),
       ACE_NTOHL (0x65660000),  // name = FactoryDef
 
     0U,
@@ -1834,97 +1837,97 @@ TAO_NAMESPACE_END
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CS_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CS_
 
-  // The Base_Sequence functions, please see tao/Sequence.h
-  void
-  IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    IR::FinderDef **tmp = 0;
-    tmp = _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      IR::FinderDef **old = ACE_reinterpret_cast (IR::FinderDef**, this->buffer_);
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = IR::FinderDef::_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete[] old;
-        }
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_deallocate_buffer (void)
+// The Base_Sequence functions, please see tao/Sequence.h
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_allocate_buffer (CORBA::ULong length)
+{
+  IR::FinderDef **tmp = 0;
+  tmp = _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (length);
+
+  if (this->buffer_ != 0)
   {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    IR::FinderDef **tmp = ACE_reinterpret_cast (IR::FinderDef**, this->buffer_);
-    
+    IR::FinderDef **old = ACE_reinterpret_cast (IR::FinderDef**, this->buffer_);
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
-        CORBA::release (tmp[i]);
-        tmp[i] = IR::FinderDef::_nil ();
+        if (!this->release_)
+          {
+            tmp[i] = IR::FinderDef::_duplicate (old[i]);
+          }
+        else
+          {
+            tmp[i] = old[i];
+          }
       }
-    
-    _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  }
-  
-  IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::~_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (void)
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  void
-  IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-  {
-    IR::FinderDef **tmp = ACE_reinterpret_cast (IR::FinderDef**, this->buffer_);
-    
-    for (CORBA::ULong i = nl; i < ol; ++i)
+
+    if (this->release_)
       {
-        CORBA::release (tmp[i]);
-        tmp[i] = IR::FinderDef::_nil ();
+        delete[] old;
       }
   }
-  
-  void 
-  IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_downcast (
-      void* target,
-      CORBA_Object *src,
-      CORBA_Environment &ACE_TRY_ENV
-    )
-  {
-    IR::FinderDef **tmp = ACE_static_cast (IR::FinderDef**, target);
-    *tmp = IR::FinderDef::_narrow (src, ACE_TRY_ENV);
-    ACE_CHECK;
-  }
+  this->buffer_ = tmp;
+}
+
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    return;
+  IR::FinderDef **tmp = ACE_reinterpret_cast (IR::FinderDef**, this->buffer_);
+
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      CORBA::release (tmp[i]);
+      tmp[i] = IR::FinderDef::_nil ();
+    }
+
+  _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::freebuf (tmp);
+  this->buffer_ = 0;
+}
+
+IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::~_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (void)
+{
+  this->_deallocate_buffer ();
+}
+
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+{
+  IR::FinderDef **tmp = ACE_reinterpret_cast (IR::FinderDef**, this->buffer_);
+
+  for (CORBA::ULong i = nl; i < ol; ++i)
+    {
+      CORBA::release (tmp[i]);
+      tmp[i] = IR::FinderDef::_nil ();
+    }
+}
+
+void
+IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_downcast (
+    void* target,
+    CORBA_Object *src,
+    CORBA_Environment &ACE_TRY_ENV
+  )
+{
+  IR::FinderDef **tmp = ACE_static_cast (IR::FinderDef**, target);
+  *tmp = IR::FinderDef::_narrow (src, ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+CORBA_Object*
+IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_upcast (void *src) const
+{
+  IR::FinderDef **tmp = ACE_static_cast (IR::FinderDef**, src);
+  return *tmp;
+}
 
-  CORBA_Object*
-  IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_upcast (void *src) const
-  {
-    IR::FinderDef **tmp = ACE_static_cast (IR::FinderDef**, src);
-    return *tmp;
-  }
-  
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_FINDERDEFSEQ_CS_)
 #define _IR_FINDERDEFSEQ_CS_
@@ -1936,37 +1939,37 @@ TAO_NAMESPACE_END
 IR::FinderDefSeq::FinderDefSeq (void)
 {}
 IR::FinderDefSeq::FinderDefSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq
+_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<IR::FinderDef,IR::FinderDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Object_Sequence<IR::FinderDef,IR::FinderDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 IR::FinderDefSeq::FinderDefSeq (CORBA::ULong max, CORBA::ULong length, IR::FinderDef_ptr *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq
+_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<IR::FinderDef,IR::FinderDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Object_Sequence<IR::FinderDef,IR::FinderDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 IR::FinderDefSeq::FinderDefSeq (const FinderDefSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq
+_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<IR::FinderDef,IR::FinderDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Object_Sequence<IR::FinderDef,IR::FinderDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 IR::FinderDefSeq::~FinderDefSeq (void) // dtor
 {}
-void IR::FinderDefSeq::_tao_any_destructor (void *x)
+void IR::FinderDefSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  FinderDefSeq *tmp = ACE_static_cast (FinderDefSeq*,x);
+  FinderDefSeq *tmp = ACE_static_cast (FinderDefSeq*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -1977,18 +1980,18 @@ static const CORBA::Long _oc_IR_FinderDefSeq[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   32,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f46), 
-  ACE_NTOHL (0x696e6465), 
-  ACE_NTOHL (0x72446566), 
-  ACE_NTOHL (0x5365713a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49522f46),
+  ACE_NTOHL (0x696e6465),
+  ACE_NTOHL (0x72446566),
+  ACE_NTOHL (0x5365713a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/FinderDefSeq:1.0
   13,
-  ACE_NTOHL (0x46696e64), 
-  ACE_NTOHL (0x65724465), 
-  ACE_NTOHL (0x66536571), 
+  ACE_NTOHL (0x46696e64),
+  ACE_NTOHL (0x65724465),
+  ACE_NTOHL (0x66536571),
   ACE_NTOHL (0x0),  // name = FinderDefSeq
   CORBA::tk_sequence, // typecode kind
   72, // encapsulation length
@@ -1997,17 +2000,17 @@ static const CORBA::Long _oc_IR_FinderDefSeq[] =
     56, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       29,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x49522f46), 
-      ACE_NTOHL (0x696e6465), 
-      ACE_NTOHL (0x72446566), 
-      ACE_NTOHL (0x3a312e30), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x49522f46),
+      ACE_NTOHL (0x696e6465),
+      ACE_NTOHL (0x72446566),
+      ACE_NTOHL (0x3a312e30),
       ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/FinderDef:1.0
       10,
-      ACE_NTOHL (0x46696e64), 
-      ACE_NTOHL (0x65724465), 
+      ACE_NTOHL (0x46696e64),
+      ACE_NTOHL (0x65724465),
       ACE_NTOHL (0x66000000),  // name = FinderDef
 
     0U,
@@ -2118,7 +2121,7 @@ IR::ComponentRepository_var::operator const ::IR::ComponentRepository_ptr &() co
   return this->ptr_;
 }
 
-IR::ComponentRepository_var::operator ::IR::ComponentRepository_ptr &() // cast 
+IR::ComponentRepository_var::operator ::IR::ComponentRepository_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -2194,7 +2197,7 @@ IR::ComponentRepository_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class IR::ComponentRepository_out
+// Operations for class IR::ComponentRepository_out
 // *************************************************************
 
 IR::ComponentRepository_out::ComponentRepository_out (ComponentRepository_ptr &p)
@@ -2265,24 +2268,24 @@ public:
       const char * version,
       IR::ComponentDef_ptr base_component,
       const CORBA_InterfaceDefSeq & supports_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -2309,7 +2312,7 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_component::TAO_ClientRequest
     const char * version,
     IR::ComponentDef_ptr base_component,
     const CORBA_InterfaceDefSeq & supports_interfaces,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -2327,36 +2330,28 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_component::arguments (CORBA:
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_base_component = parameter_list->length ();
-  parameter_list->length (length_base_component + 1);
-  (*parameter_list)[length_base_component].argument <<=  this->base_component_;
-  
-  (*parameter_list)[length_base_component].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_supports_interfaces = parameter_list->length ();
-  parameter_list->length (length_supports_interfaces + 1);
-  (*parameter_list)[length_supports_interfaces].argument <<=  this->supports_interfaces_;
-  
-  (*parameter_list)[length_supports_interfaces].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (5);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= version_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->base_component_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->supports_interfaces_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -2368,12 +2363,12 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_component::exceptions (CORBA
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_IR_ComponentRepository_create_component::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -2382,17 +2377,17 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_component::result (CORBA::En
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_IR_ComponentRepository_create_component::result (IR::ComponentDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -2408,24 +2403,24 @@ public:
       IR::HomeDef_ptr base_home,
       IR::ComponentDef_ptr managed_component,
       CORBA_ValueDef_ptr primary_key,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -2454,7 +2449,7 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_home::TAO_ClientRequestInfo_
     IR::HomeDef_ptr base_home,
     IR::ComponentDef_ptr managed_component,
     CORBA_ValueDef_ptr primary_key,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -2473,42 +2468,31 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_home::arguments (CORBA::Envi
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_base_home = parameter_list->length ();
-  parameter_list->length (length_base_home + 1);
-  (*parameter_list)[length_base_home].argument <<=  this->base_home_;
-  
-  (*parameter_list)[length_base_home].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_managed_component = parameter_list->length ();
-  parameter_list->length (length_managed_component + 1);
-  (*parameter_list)[length_managed_component].argument <<=  this->managed_component_;
-  
-  (*parameter_list)[length_managed_component].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_primary_key = parameter_list->length ();
-  parameter_list->length (length_primary_key + 1);
-  (*parameter_list)[length_primary_key].argument <<=  this->primary_key_;
-  
-  (*parameter_list)[length_primary_key].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (6);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= version_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->base_home_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->managed_component_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->primary_key_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -2520,12 +2504,12 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_home::exceptions (CORBA::Env
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_IR_ComponentRepository_create_home::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -2534,24 +2518,24 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_home::result (CORBA::Environ
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_IR_ComponentRepository_create_home::result (IR::HomeDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 IR::_TAO_ComponentRepository_Proxy_Impl::_TAO_ComponentRepository_Proxy_Impl (void)
@@ -2575,16 +2559,16 @@ IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_comp
     CORBA::SystemException
   ))
 {
-  
+
   IR::ComponentDef_ptr _tao_retval = IR::ComponentDef::_nil ();
   IR::ComponentDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_component",
@@ -2593,17 +2577,21 @@ IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_comp
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_ComponentRepository_create_component ri (
         &_tao_call,
@@ -2616,31 +2604,40 @@ IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_comp
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << id) &&
@@ -2653,20 +2650,33 @@ IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_comp
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -2676,74 +2686,55 @@ IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_comp
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              IR::ComponentDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          IR::ComponentDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
@@ -2760,16 +2751,16 @@ IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
     CORBA::SystemException
   ))
 {
-  
+
   IR::HomeDef_ptr _tao_retval = IR::HomeDef::_nil ();
   IR::HomeDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_home",
@@ -2778,17 +2769,21 @@ IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_ComponentRepository_create_home ri (
         &_tao_call,
@@ -2802,31 +2797,40 @@ IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << id) &&
@@ -2840,20 +2844,33 @@ IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -2863,79 +2880,60 @@ IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              IR::HomeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          IR::HomeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -3005,13 +3003,13 @@ IR::ComponentRepository::IR_ComponentRepository_setup_collocation (int collocate
   else
     this->the_TAO_ComponentRepository_Proxy_Broker_ =
       ::IR::_TAO_ComponentRepository_Remote_Proxy_Broker::the_TAO_ComponentRepository_Remote_Proxy_Broker ();
-  
+
   this->CORBA_Repository_setup_collocation (collocated);
 }
 
-void IR::ComponentRepository::_tao_any_destructor (void *x)
+void IR::ComponentRepository::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ComponentRepository *tmp = ACE_static_cast (ComponentRepository*,x);
+  ComponentRepository *tmp = ACE_static_cast (ComponentRepository*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -3058,14 +3056,14 @@ IR::ComponentRepository_ptr IR::ComponentRepository::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           ComponentRepository::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::IR::ComponentRepository (stub, 0, obj->_servant ()), ComponentRepository::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -3148,7 +3146,7 @@ void *IR::ComponentRepository::_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;
@@ -3171,10 +3169,10 @@ IR::ComponentDef_ptr IR::ComponentRepository::create_component (
     CORBA::SystemException
   ))
 {
-  _TAO_ComponentRepository_Proxy_Impl &proxy = 
+  _TAO_ComponentRepository_Proxy_Impl &proxy =
     this->the_TAO_ComponentRepository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_component (
       this,
       id,
@@ -3199,10 +3197,10 @@ IR::HomeDef_ptr IR::ComponentRepository::create_home (
     CORBA::SystemException
   ))
 {
-  _TAO_ComponentRepository_Proxy_Impl &proxy = 
+  _TAO_ComponentRepository_Proxy_Impl &proxy =
     this->the_TAO_ComponentRepository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_home (
       this,
       id,
@@ -3219,21 +3217,21 @@ static const CORBA::Long _oc_IR_ComponentRepository[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f43), 
-  ACE_NTOHL (0x6f6d706f), 
-  ACE_NTOHL (0x6e656e74), 
-  ACE_NTOHL (0x5265706f), 
-  ACE_NTOHL (0x7369746f), 
-  ACE_NTOHL (0x72793a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49522f43),
+  ACE_NTOHL (0x6f6d706f),
+  ACE_NTOHL (0x6e656e74),
+  ACE_NTOHL (0x5265706f),
+  ACE_NTOHL (0x7369746f),
+  ACE_NTOHL (0x72793a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/ComponentRepository:1.0
   20,
-  ACE_NTOHL (0x436f6d70), 
-  ACE_NTOHL (0x6f6e656e), 
-  ACE_NTOHL (0x74526570), 
-  ACE_NTOHL (0x6f736974), 
+  ACE_NTOHL (0x436f6d70),
+  ACE_NTOHL (0x6f6e656e),
+  ACE_NTOHL (0x74526570),
+  ACE_NTOHL (0x6f736974),
   ACE_NTOHL (0x6f727900),  // name = ComponentRepository
 };
 
@@ -3341,7 +3339,7 @@ IR::ProvidesDef_var::operator const ::IR::ProvidesDef_ptr &() const // cast
   return this->ptr_;
 }
 
-IR::ProvidesDef_var::operator ::IR::ProvidesDef_ptr &() // cast 
+IR::ProvidesDef_var::operator ::IR::ProvidesDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -3417,7 +3415,7 @@ IR::ProvidesDef_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class IR::ProvidesDef_out
+// Operations for class IR::ProvidesDef_out
 // *************************************************************
 
 IR::ProvidesDef_out::ProvidesDef_out (ProvidesDef_ptr &p)
@@ -3483,24 +3481,24 @@ public:
   TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -3517,7 +3515,7 @@ private:
 TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -3530,7 +3528,7 @@ TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::arguments (CORBA::Envir
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -3542,12 +3540,12 @@ TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::exceptions (CORBA::Envi
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -3556,24 +3554,24 @@ TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::result (CORBA::Environm
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::result (CORBA_InterfaceDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 IR::_TAO_ProvidesDef_Proxy_Impl::_TAO_ProvidesDef_Proxy_Impl (void)
@@ -3592,16 +3590,16 @@ CORBA_InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_InterfaceDef_ptr _tao_retval = CORBA_InterfaceDef::_nil ();
   CORBA_InterfaceDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_interface_type",
@@ -3610,17 +3608,21 @@ CORBA_InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get ri (
         &_tao_call,
@@ -3628,43 +3630,66 @@ CORBA_InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -3674,79 +3699,60 @@ CORBA_InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_InterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_InterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -3816,13 +3822,13 @@ IR::ProvidesDef::IR_ProvidesDef_setup_collocation (int collocated)
   else
     this->the_TAO_ProvidesDef_Proxy_Broker_ =
       ::IR::_TAO_ProvidesDef_Remote_Proxy_Broker::the_TAO_ProvidesDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_Contained_setup_collocation (collocated);
 }
 
-void IR::ProvidesDef::_tao_any_destructor (void *x)
+void IR::ProvidesDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ProvidesDef *tmp = ACE_static_cast (ProvidesDef*,x);
+  ProvidesDef *tmp = ACE_static_cast (ProvidesDef*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -3869,14 +3875,14 @@ IR::ProvidesDef_ptr IR::ProvidesDef::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           ProvidesDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::IR::ProvidesDef (stub, 0, obj->_servant ()), ProvidesDef::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -3946,7 +3952,7 @@ void *IR::ProvidesDef::_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;
@@ -3964,10 +3970,10 @@ CORBA_InterfaceDef_ptr IR::ProvidesDef::interface_type (
     CORBA::SystemException
   ))
 {
-  _TAO_ProvidesDef_Proxy_Impl &proxy = 
+  _TAO_ProvidesDef_Proxy_Impl &proxy =
     this->the_TAO_ProvidesDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.interface_type (
       this,
       ACE_TRY_ENV
@@ -3978,17 +3984,17 @@ static const CORBA::Long _oc_IR_ProvidesDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   31,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f50), 
-  ACE_NTOHL (0x726f7669), 
-  ACE_NTOHL (0x64657344), 
-  ACE_NTOHL (0x65663a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49522f50),
+  ACE_NTOHL (0x726f7669),
+  ACE_NTOHL (0x64657344),
+  ACE_NTOHL (0x65663a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/ProvidesDef:1.0
   12,
-  ACE_NTOHL (0x50726f76), 
-  ACE_NTOHL (0x69646573), 
+  ACE_NTOHL (0x50726f76),
+  ACE_NTOHL (0x69646573),
   ACE_NTOHL (0x44656600),  // name = ProvidesDef
 };
 
@@ -4009,43 +4015,43 @@ static const CORBA::Long _oc_IR_ProvidesDescription[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f50), 
-  ACE_NTOHL (0x726f7669), 
-  ACE_NTOHL (0x64657344), 
-  ACE_NTOHL (0x65736372), 
-  ACE_NTOHL (0x69707469), 
-  ACE_NTOHL (0x6f6e3a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49522f50),
+  ACE_NTOHL (0x726f7669),
+  ACE_NTOHL (0x64657344),
+  ACE_NTOHL (0x65736372),
+  ACE_NTOHL (0x69707469),
+  ACE_NTOHL (0x6f6e3a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/ProvidesDescription:1.0
   20,
-  ACE_NTOHL (0x50726f76), 
-  ACE_NTOHL (0x69646573), 
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
+  ACE_NTOHL (0x50726f76),
+  ACE_NTOHL (0x69646573),
+  ACE_NTOHL (0x44657363),
+  ACE_NTOHL (0x72697074),
   ACE_NTOHL (0x696f6e00),  // name = ProvidesDescription
   5, // member count
   5,
-  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x6e616d65),
   ACE_NTOHL (0x0),  // name = name
   CORBA::tk_alias, // typecode kind for typedefs
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     30,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f49), 
-    ACE_NTOHL (0x64656e74), 
-    ACE_NTOHL (0x69666965), 
-    ACE_NTOHL (0x723a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f49),
+    ACE_NTOHL (0x64656e74),
+    ACE_NTOHL (0x69666965),
+    ACE_NTOHL (0x723a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/Identifier:1.0
     11,
-    ACE_NTOHL (0x4964656e), 
-    ACE_NTOHL (0x74696669), 
+    ACE_NTOHL (0x4964656e),
+    ACE_NTOHL (0x74696669),
     ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
   3,
@@ -4054,90 +4060,90 @@ static const CORBA::Long _oc_IR_ProvidesDescription[] =
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     32,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f52), 
-    ACE_NTOHL (0x65706f73), 
-    ACE_NTOHL (0x69746f72), 
-    ACE_NTOHL (0x7949643a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f52),
+    ACE_NTOHL (0x65706f73),
+    ACE_NTOHL (0x69746f72),
+    ACE_NTOHL (0x7949643a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
     13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669), 
-  ACE_NTOHL (0x6e65645f), 
+  ACE_NTOHL (0x64656669),
+  ACE_NTOHL (0x6e65645f),
   ACE_NTOHL (0x696e0000),  // name = defined_in
   CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     32,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f52), 
-    ACE_NTOHL (0x65706f73), 
-    ACE_NTOHL (0x69746f72), 
-    ACE_NTOHL (0x7949643a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f52),
+    ACE_NTOHL (0x65706f73),
+    ACE_NTOHL (0x69746f72),
+    ACE_NTOHL (0x7949643a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
     13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
   8,
-  ACE_NTOHL (0x76657273), 
+  ACE_NTOHL (0x76657273),
   ACE_NTOHL (0x696f6e00),  // name = version
   CORBA::tk_alias, // typecode kind for typedefs
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f56), 
-    ACE_NTOHL (0x65727369), 
-    ACE_NTOHL (0x6f6e5370), 
-    ACE_NTOHL (0x65633a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f56),
+    ACE_NTOHL (0x65727369),
+    ACE_NTOHL (0x6f6e5370),
+    ACE_NTOHL (0x65633a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/VersionSpec:1.0
     12,
-    ACE_NTOHL (0x56657273), 
-    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x56657273),
+    ACE_NTOHL (0x696f6e53),
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
   15,
-  ACE_NTOHL (0x696e7465), 
-  ACE_NTOHL (0x72666163), 
-  ACE_NTOHL (0x655f7479), 
+  ACE_NTOHL (0x696e7465),
+  ACE_NTOHL (0x72666163),
+  ACE_NTOHL (0x655f7479),
   ACE_NTOHL (0x70650000),  // name = interface_type
   CORBA::tk_objref, // typecode kind
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f496e), 
-    ACE_NTOHL (0x74657266), 
-    ACE_NTOHL (0x61636544), 
-    ACE_NTOHL (0x65663a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f496e),
+    ACE_NTOHL (0x74657266),
+    ACE_NTOHL (0x61636544),
+    ACE_NTOHL (0x65663a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef:1.0
     13,
-    ACE_NTOHL (0x496e7465), 
-    ACE_NTOHL (0x72666163), 
-    ACE_NTOHL (0x65446566), 
+    ACE_NTOHL (0x496e7465),
+    ACE_NTOHL (0x72666163),
+    ACE_NTOHL (0x65446566),
     ACE_NTOHL (0x0),  // name = InterfaceDef
 
 };
@@ -4155,9 +4161,9 @@ TAO_NAMESPACE_BEGIN (IR)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ProvidesDescription, &_tc_TAO_tc_IR_ProvidesDescription)
 TAO_NAMESPACE_END
 
-void IR::ProvidesDescription::_tao_any_destructor (void *x)
+void IR::ProvidesDescription::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ProvidesDescription *tmp = ACE_static_cast (ProvidesDescription*,x);
+  ProvidesDescription *tmp = ACE_static_cast (ProvidesDescription*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -4252,7 +4258,7 @@ IR::UsesDef_var::operator const ::IR::UsesDef_ptr &() const // cast
   return this->ptr_;
 }
 
-IR::UsesDef_var::operator ::IR::UsesDef_ptr &() // cast 
+IR::UsesDef_var::operator ::IR::UsesDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -4328,7 +4334,7 @@ IR::UsesDef_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class IR::UsesDef_out
+// Operations for class IR::UsesDef_out
 // *************************************************************
 
 IR::UsesDef_out::UsesDef_out (UsesDef_ptr &p)
@@ -4394,24 +4400,24 @@ public:
   TAO_ClientRequestInfo_IR_UsesDef_interface_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -4428,7 +4434,7 @@ private:
 TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -4441,7 +4447,7 @@ TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::arguments (CORBA::Environme
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -4453,12 +4459,12 @@ TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::exceptions (CORBA::Environm
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -4467,17 +4473,17 @@ TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::result (CORBA::Environment
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::result (CORBA_InterfaceDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -4487,24 +4493,24 @@ public:
   TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -4521,7 +4527,7 @@ private:
 TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -4534,7 +4540,7 @@ TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::arguments (CORBA::Environment
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -4546,12 +4552,12 @@ TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::exceptions (CORBA::Environment
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -4560,24 +4566,24 @@ TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::result (CORBA::Environment &AC
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= CORBA::Any::from_boolean (this->_result);
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::result (CORBA::Boolean result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 IR::_TAO_UsesDef_Proxy_Impl::_TAO_UsesDef_Proxy_Impl (void)
@@ -4596,16 +4602,16 @@ CORBA_InterfaceDef_ptr IR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_InterfaceDef_ptr _tao_retval = CORBA_InterfaceDef::_nil ();
   CORBA_InterfaceDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_interface_type",
@@ -4614,17 +4620,21 @@ CORBA_InterfaceDef_ptr IR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_UsesDef_interface_type_get ri (
         &_tao_call,
@@ -4632,43 +4642,66 @@ CORBA_InterfaceDef_ptr IR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -4678,74 +4711,55 @@ CORBA_InterfaceDef_ptr IR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_InterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_InterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
@@ -4756,15 +4770,15 @@ CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA::Boolean _tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_is_multiple",
@@ -4773,17 +4787,21 @@ CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get ri (
         &_tao_call,
@@ -4791,43 +4809,66 @@ CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN  (_tao_retval);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
@@ -4837,78 +4878,59 @@ CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA::Boolean  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA::Boolean _tao_retval_info = _tao_retval;
+          ri.result (_tao_retval_info);
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN  (_tao_retval);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_retval;
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN  (_tao_retval);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_retval;
 }
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -4978,13 +5000,13 @@ IR::UsesDef::IR_UsesDef_setup_collocation (int collocated)
   else
     this->the_TAO_UsesDef_Proxy_Broker_ =
       ::IR::_TAO_UsesDef_Remote_Proxy_Broker::the_TAO_UsesDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_Contained_setup_collocation (collocated);
 }
 
-void IR::UsesDef::_tao_any_destructor (void *x)
+void IR::UsesDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  UsesDef *tmp = ACE_static_cast (UsesDef*,x);
+  UsesDef *tmp = ACE_static_cast (UsesDef*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -5031,14 +5053,14 @@ IR::UsesDef_ptr IR::UsesDef::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           UsesDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::IR::UsesDef (stub, 0, obj->_servant ()), UsesDef::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -5108,7 +5130,7 @@ void *IR::UsesDef::_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;
@@ -5126,10 +5148,10 @@ CORBA_InterfaceDef_ptr IR::UsesDef::interface_type (
     CORBA::SystemException
   ))
 {
-  _TAO_UsesDef_Proxy_Impl &proxy = 
+  _TAO_UsesDef_Proxy_Impl &proxy =
     this->the_TAO_UsesDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.interface_type (
       this,
       ACE_TRY_ENV
@@ -5143,10 +5165,10 @@ CORBA::Boolean IR::UsesDef::is_multiple (
     CORBA::SystemException
   ))
 {
-  _TAO_UsesDef_Proxy_Impl &proxy = 
+  _TAO_UsesDef_Proxy_Impl &proxy =
     this->the_TAO_UsesDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.is_multiple (
       this,
       ACE_TRY_ENV
@@ -5157,15 +5179,15 @@ static const CORBA::Long _oc_IR_UsesDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   27,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f55), 
-  ACE_NTOHL (0x73657344), 
-  ACE_NTOHL (0x65663a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49522f55),
+  ACE_NTOHL (0x73657344),
+  ACE_NTOHL (0x65663a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/UsesDef:1.0
   8,
-  ACE_NTOHL (0x55736573), 
+  ACE_NTOHL (0x55736573),
   ACE_NTOHL (0x44656600),  // name = UsesDef
 };
 
@@ -5186,41 +5208,41 @@ static const CORBA::Long _oc_IR_UsesDescription[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f55), 
-  ACE_NTOHL (0x73657344), 
-  ACE_NTOHL (0x65736372), 
-  ACE_NTOHL (0x69707469), 
-  ACE_NTOHL (0x6f6e3a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49522f55),
+  ACE_NTOHL (0x73657344),
+  ACE_NTOHL (0x65736372),
+  ACE_NTOHL (0x69707469),
+  ACE_NTOHL (0x6f6e3a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/UsesDescription:1.0
   16,
-  ACE_NTOHL (0x55736573), 
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
+  ACE_NTOHL (0x55736573),
+  ACE_NTOHL (0x44657363),
+  ACE_NTOHL (0x72697074),
   ACE_NTOHL (0x696f6e00),  // name = UsesDescription
   6, // member count
   5,
-  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x6e616d65),
   ACE_NTOHL (0x0),  // name = name
   CORBA::tk_alias, // typecode kind for typedefs
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     30,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f49), 
-    ACE_NTOHL (0x64656e74), 
-    ACE_NTOHL (0x69666965), 
-    ACE_NTOHL (0x723a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f49),
+    ACE_NTOHL (0x64656e74),
+    ACE_NTOHL (0x69666965),
+    ACE_NTOHL (0x723a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/Identifier:1.0
     11,
-    ACE_NTOHL (0x4964656e), 
-    ACE_NTOHL (0x74696669), 
+    ACE_NTOHL (0x4964656e),
+    ACE_NTOHL (0x74696669),
     ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
   3,
@@ -5229,95 +5251,95 @@ static const CORBA::Long _oc_IR_UsesDescription[] =
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     32,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f52), 
-    ACE_NTOHL (0x65706f73), 
-    ACE_NTOHL (0x69746f72), 
-    ACE_NTOHL (0x7949643a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f52),
+    ACE_NTOHL (0x65706f73),
+    ACE_NTOHL (0x69746f72),
+    ACE_NTOHL (0x7949643a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
     13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669), 
-  ACE_NTOHL (0x6e65645f), 
+  ACE_NTOHL (0x64656669),
+  ACE_NTOHL (0x6e65645f),
   ACE_NTOHL (0x696e0000),  // name = defined_in
   CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     32,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f52), 
-    ACE_NTOHL (0x65706f73), 
-    ACE_NTOHL (0x69746f72), 
-    ACE_NTOHL (0x7949643a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f52),
+    ACE_NTOHL (0x65706f73),
+    ACE_NTOHL (0x69746f72),
+    ACE_NTOHL (0x7949643a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
     13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
   8,
-  ACE_NTOHL (0x76657273), 
+  ACE_NTOHL (0x76657273),
   ACE_NTOHL (0x696f6e00),  // name = version
   CORBA::tk_alias, // typecode kind for typedefs
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f56), 
-    ACE_NTOHL (0x65727369), 
-    ACE_NTOHL (0x6f6e5370), 
-    ACE_NTOHL (0x65633a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f56),
+    ACE_NTOHL (0x65727369),
+    ACE_NTOHL (0x6f6e5370),
+    ACE_NTOHL (0x65633a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/VersionSpec:1.0
     12,
-    ACE_NTOHL (0x56657273), 
-    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x56657273),
+    ACE_NTOHL (0x696f6e53),
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
   15,
-  ACE_NTOHL (0x696e7465), 
-  ACE_NTOHL (0x72666163), 
-  ACE_NTOHL (0x655f7479), 
+  ACE_NTOHL (0x696e7465),
+  ACE_NTOHL (0x72666163),
+  ACE_NTOHL (0x655f7479),
   ACE_NTOHL (0x70650000),  // name = interface_type
   CORBA::tk_objref, // typecode kind
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f496e), 
-    ACE_NTOHL (0x74657266), 
-    ACE_NTOHL (0x61636544), 
-    ACE_NTOHL (0x65663a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f496e),
+    ACE_NTOHL (0x74657266),
+    ACE_NTOHL (0x61636544),
+    ACE_NTOHL (0x65663a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef:1.0
     13,
-    ACE_NTOHL (0x496e7465), 
-    ACE_NTOHL (0x72666163), 
-    ACE_NTOHL (0x65446566), 
+    ACE_NTOHL (0x496e7465),
+    ACE_NTOHL (0x72666163),
+    ACE_NTOHL (0x65446566),
     ACE_NTOHL (0x0),  // name = InterfaceDef
 
   12,
-  ACE_NTOHL (0x69735f6d), 
-  ACE_NTOHL (0x756c7469), 
+  ACE_NTOHL (0x69735f6d),
+  ACE_NTOHL (0x756c7469),
   ACE_NTOHL (0x706c6500),  // name = is_multiple
   CORBA::tk_boolean,
 
@@ -5336,60 +5358,60 @@ TAO_NAMESPACE_BEGIN (IR)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UsesDescription, &_tc_TAO_tc_IR_UsesDescription)
 TAO_NAMESPACE_END
 
-void IR::UsesDescription::_tao_any_destructor (void *x)
+void IR::UsesDescription::_tao_any_destructor (void *_tao_void_pointer)
 {
-  UsesDescription *tmp = ACE_static_cast (UsesDescription*,x);
+  UsesDescription *tmp = ACE_static_cast (UsesDescription*, _tao_void_pointer);
   delete tmp;
 }
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CS_
 
-  void
-  IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    IR::ProvidesDescription* tmp = 0;
-    tmp = _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      IR::ProvidesDescription *old = ACE_reinterpret_cast (IR::ProvidesDescription *,this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-      
-      if (this->release_)
-        _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::freebuf (old);
-      
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    
-    IR::ProvidesDescription *tmp = ACE_reinterpret_cast (IR::ProvidesDescription *,this->buffer_);
-    
-    _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  } 
-  
-  IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::~_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (void) // Dtor.
+void
+IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_allocate_buffer (CORBA::ULong length)
+{
+  IR::ProvidesDescription* tmp = 0;
+  tmp = _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (length);
+
+  if (this->buffer_ != 0)
   {
-    this->_deallocate_buffer ();
+    IR::ProvidesDescription *old = ACE_reinterpret_cast (IR::ProvidesDescription *,this->buffer_);
+
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
+      tmp[i] = old[i];
+
+    if (this->release_)
+      _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::freebuf (old);
+
   }
-  
-  
+  this->buffer_ = tmp;
+}
+
+void
+IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    return;
+
+  IR::ProvidesDescription *tmp = ACE_reinterpret_cast (IR::ProvidesDescription *,this->buffer_);
+
+  _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::freebuf (tmp);
+  this->buffer_ = 0;
+}
+
+IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::~_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (void) // Dtor.
+{
+  this->_deallocate_buffer ();
+}
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_PROVIDESDESCSEQ_CS_)
 #define _IR_PROVIDESDESCSEQ_CS_
@@ -5401,37 +5423,37 @@ void IR::UsesDescription::_tao_any_destructor (void *x)
 IR::ProvidesDescSeq::ProvidesDescSeq (void)
 {}
 IR::ProvidesDescSeq::ProvidesDescSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_IR_ProvidesDescSeq
+_TAO_Unbounded_Sequence_IR_ProvidesDescSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<IR::ProvidesDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Sequence<IR::ProvidesDescription>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 IR::ProvidesDescSeq::ProvidesDescSeq (CORBA::ULong max, CORBA::ULong length, IR::ProvidesDescription *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_IR_ProvidesDescSeq
+_TAO_Unbounded_Sequence_IR_ProvidesDescSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<IR::ProvidesDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Sequence<IR::ProvidesDescription>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 IR::ProvidesDescSeq::ProvidesDescSeq (const ProvidesDescSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_IR_ProvidesDescSeq
+_TAO_Unbounded_Sequence_IR_ProvidesDescSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<IR::ProvidesDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Sequence<IR::ProvidesDescription>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 IR::ProvidesDescSeq::~ProvidesDescSeq (void) // dtor
 {}
-void IR::ProvidesDescSeq::_tao_any_destructor (void *x)
+void IR::ProvidesDescSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ProvidesDescSeq *tmp = ACE_static_cast (ProvidesDescSeq*,x);
+  ProvidesDescSeq *tmp = ACE_static_cast (ProvidesDescSeq*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -5442,19 +5464,19 @@ static const CORBA::Long _oc_IR_ProvidesDescSeq[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f50), 
-  ACE_NTOHL (0x726f7669), 
-  ACE_NTOHL (0x64657344), 
-  ACE_NTOHL (0x65736353), 
-  ACE_NTOHL (0x65713a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49522f50),
+  ACE_NTOHL (0x726f7669),
+  ACE_NTOHL (0x64657344),
+  ACE_NTOHL (0x65736353),
+  ACE_NTOHL (0x65713a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/ProvidesDescSeq:1.0
   16,
-  ACE_NTOHL (0x50726f76), 
-  ACE_NTOHL (0x69646573), 
-  ACE_NTOHL (0x44657363), 
+  ACE_NTOHL (0x50726f76),
+  ACE_NTOHL (0x69646573),
+  ACE_NTOHL (0x44657363),
   ACE_NTOHL (0x53657100),  // name = ProvidesDescSeq
   CORBA::tk_sequence, // typecode kind
   528, // encapsulation length
@@ -5463,43 +5485,43 @@ static const CORBA::Long _oc_IR_ProvidesDescSeq[] =
     512, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       39,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x49522f50), 
-      ACE_NTOHL (0x726f7669), 
-      ACE_NTOHL (0x64657344), 
-      ACE_NTOHL (0x65736372), 
-      ACE_NTOHL (0x69707469), 
-      ACE_NTOHL (0x6f6e3a31), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x49522f50),
+      ACE_NTOHL (0x726f7669),
+      ACE_NTOHL (0x64657344),
+      ACE_NTOHL (0x65736372),
+      ACE_NTOHL (0x69707469),
+      ACE_NTOHL (0x6f6e3a31),
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/ProvidesDescription:1.0
       20,
-      ACE_NTOHL (0x50726f76), 
-      ACE_NTOHL (0x69646573), 
-      ACE_NTOHL (0x44657363), 
-      ACE_NTOHL (0x72697074), 
+      ACE_NTOHL (0x50726f76),
+      ACE_NTOHL (0x69646573),
+      ACE_NTOHL (0x44657363),
+      ACE_NTOHL (0x72697074),
       ACE_NTOHL (0x696f6e00),  // name = ProvidesDescription
       5, // member count
       5,
-      ACE_NTOHL (0x6e616d65), 
+      ACE_NTOHL (0x6e616d65),
       ACE_NTOHL (0x0),  // name = name
       CORBA::tk_alias, // typecode kind for typedefs
       64, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         30,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x49522f49), 
-        ACE_NTOHL (0x64656e74), 
-        ACE_NTOHL (0x69666965), 
-        ACE_NTOHL (0x723a312e), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x49522f49),
+        ACE_NTOHL (0x64656e74),
+        ACE_NTOHL (0x69666965),
+        ACE_NTOHL (0x723a312e),
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/Identifier:1.0
         11,
-        ACE_NTOHL (0x4964656e), 
-        ACE_NTOHL (0x74696669), 
+        ACE_NTOHL (0x4964656e),
+        ACE_NTOHL (0x74696669),
         ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
+        CORBA::tk_string,
         0U, // string length
 
       3,
@@ -5508,90 +5530,90 @@ static const CORBA::Long _oc_IR_ProvidesDescSeq[] =
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         32,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x49522f52), 
-        ACE_NTOHL (0x65706f73), 
-        ACE_NTOHL (0x69746f72), 
-        ACE_NTOHL (0x7949643a), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x49522f52),
+        ACE_NTOHL (0x65706f73),
+        ACE_NTOHL (0x69746f72),
+        ACE_NTOHL (0x7949643a),
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
         13,
-        ACE_NTOHL (0x5265706f), 
-        ACE_NTOHL (0x7369746f), 
-        ACE_NTOHL (0x72794964), 
+        ACE_NTOHL (0x5265706f),
+        ACE_NTOHL (0x7369746f),
+        ACE_NTOHL (0x72794964),
         ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
+        CORBA::tk_string,
         0U, // string length
 
       11,
-      ACE_NTOHL (0x64656669), 
-      ACE_NTOHL (0x6e65645f), 
+      ACE_NTOHL (0x64656669),
+      ACE_NTOHL (0x6e65645f),
       ACE_NTOHL (0x696e0000),  // name = defined_in
       CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         32,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x49522f52), 
-        ACE_NTOHL (0x65706f73), 
-        ACE_NTOHL (0x69746f72), 
-        ACE_NTOHL (0x7949643a), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x49522f52),
+        ACE_NTOHL (0x65706f73),
+        ACE_NTOHL (0x69746f72),
+        ACE_NTOHL (0x7949643a),
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
         13,
-        ACE_NTOHL (0x5265706f), 
-        ACE_NTOHL (0x7369746f), 
-        ACE_NTOHL (0x72794964), 
+        ACE_NTOHL (0x5265706f),
+        ACE_NTOHL (0x7369746f),
+        ACE_NTOHL (0x72794964),
         ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
+        CORBA::tk_string,
         0U, // string length
 
       8,
-      ACE_NTOHL (0x76657273), 
+      ACE_NTOHL (0x76657273),
       ACE_NTOHL (0x696f6e00),  // name = version
       CORBA::tk_alias, // typecode kind for typedefs
       64, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         31,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x49522f56), 
-        ACE_NTOHL (0x65727369), 
-        ACE_NTOHL (0x6f6e5370), 
-        ACE_NTOHL (0x65633a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x49522f56),
+        ACE_NTOHL (0x65727369),
+        ACE_NTOHL (0x6f6e5370),
+        ACE_NTOHL (0x65633a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/VersionSpec:1.0
         12,
-        ACE_NTOHL (0x56657273), 
-        ACE_NTOHL (0x696f6e53), 
+        ACE_NTOHL (0x56657273),
+        ACE_NTOHL (0x696f6e53),
         ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string, 
+        CORBA::tk_string,
         0U, // string length
 
       15,
-      ACE_NTOHL (0x696e7465), 
-      ACE_NTOHL (0x72666163), 
-      ACE_NTOHL (0x655f7479), 
+      ACE_NTOHL (0x696e7465),
+      ACE_NTOHL (0x72666163),
+      ACE_NTOHL (0x655f7479),
       ACE_NTOHL (0x70650000),  // name = interface_type
       CORBA::tk_objref, // typecode kind
       64, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f496e), 
-        ACE_NTOHL (0x74657266), 
-        ACE_NTOHL (0x61636544), 
-        ACE_NTOHL (0x65663a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f496e),
+        ACE_NTOHL (0x74657266),
+        ACE_NTOHL (0x61636544),
+        ACE_NTOHL (0x65663a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef:1.0
         13,
-        ACE_NTOHL (0x496e7465), 
-        ACE_NTOHL (0x72666163), 
-        ACE_NTOHL (0x65446566), 
+        ACE_NTOHL (0x496e7465),
+        ACE_NTOHL (0x72666163),
+        ACE_NTOHL (0x65446566),
         ACE_NTOHL (0x0),  // name = InterfaceDef
 
 
@@ -5614,52 +5636,52 @@ TAO_NAMESPACE_END
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CS_
 
-  void
-  IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    IR::UsesDescription* tmp = 0;
-    tmp = _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      IR::UsesDescription *old = ACE_reinterpret_cast (IR::UsesDescription *,this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-      
-      if (this->release_)
-        _TAO_Unbounded_Sequence_IR_UsesDescSeq::freebuf (old);
-      
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    
-    IR::UsesDescription *tmp = ACE_reinterpret_cast (IR::UsesDescription *,this->buffer_);
-    
-    _TAO_Unbounded_Sequence_IR_UsesDescSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  } 
-  
-  IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::~_TAO_Unbounded_Sequence_IR_UsesDescSeq (void) // Dtor.
+void
+IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::_allocate_buffer (CORBA::ULong length)
+{
+  IR::UsesDescription* tmp = 0;
+  tmp = _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (length);
+
+  if (this->buffer_ != 0)
   {
-    this->_deallocate_buffer ();
+    IR::UsesDescription *old = ACE_reinterpret_cast (IR::UsesDescription *,this->buffer_);
+
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
+      tmp[i] = old[i];
+
+    if (this->release_)
+      _TAO_Unbounded_Sequence_IR_UsesDescSeq::freebuf (old);
+
   }
-  
-  
+  this->buffer_ = tmp;
+}
+
+void
+IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    return;
+
+  IR::UsesDescription *tmp = ACE_reinterpret_cast (IR::UsesDescription *,this->buffer_);
+
+  _TAO_Unbounded_Sequence_IR_UsesDescSeq::freebuf (tmp);
+  this->buffer_ = 0;
+}
+
+IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::~_TAO_Unbounded_Sequence_IR_UsesDescSeq (void) // Dtor.
+{
+  this->_deallocate_buffer ();
+}
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_USESDESCSEQ_CS_)
 #define _IR_USESDESCSEQ_CS_
@@ -5671,37 +5693,37 @@ TAO_NAMESPACE_END
 IR::UsesDescSeq::UsesDescSeq (void)
 {}
 IR::UsesDescSeq::UsesDescSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_IR_UsesDescSeq
+_TAO_Unbounded_Sequence_IR_UsesDescSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<IR::UsesDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Sequence<IR::UsesDescription>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 IR::UsesDescSeq::UsesDescSeq (CORBA::ULong max, CORBA::ULong length, IR::UsesDescription *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_IR_UsesDescSeq
+_TAO_Unbounded_Sequence_IR_UsesDescSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<IR::UsesDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Sequence<IR::UsesDescription>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 IR::UsesDescSeq::UsesDescSeq (const UsesDescSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_IR_UsesDescSeq
+_TAO_Unbounded_Sequence_IR_UsesDescSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<IR::UsesDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Sequence<IR::UsesDescription>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 IR::UsesDescSeq::~UsesDescSeq (void) // dtor
 {}
-void IR::UsesDescSeq::_tao_any_destructor (void *x)
+void IR::UsesDescSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  UsesDescSeq *tmp = ACE_static_cast (UsesDescSeq*,x);
+  UsesDescSeq *tmp = ACE_static_cast (UsesDescSeq*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -5712,17 +5734,17 @@ static const CORBA::Long _oc_IR_UsesDescSeq[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   31,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f55), 
-  ACE_NTOHL (0x73657344), 
-  ACE_NTOHL (0x65736353), 
-  ACE_NTOHL (0x65713a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49522f55),
+  ACE_NTOHL (0x73657344),
+  ACE_NTOHL (0x65736353),
+  ACE_NTOHL (0x65713a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/UsesDescSeq:1.0
   12,
-  ACE_NTOHL (0x55736573), 
-  ACE_NTOHL (0x44657363), 
+  ACE_NTOHL (0x55736573),
+  ACE_NTOHL (0x44657363),
   ACE_NTOHL (0x53657100),  // name = UsesDescSeq
   CORBA::tk_sequence, // typecode kind
   540, // encapsulation length
@@ -5731,41 +5753,41 @@ static const CORBA::Long _oc_IR_UsesDescSeq[] =
     524, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       35,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x49522f55), 
-      ACE_NTOHL (0x73657344), 
-      ACE_NTOHL (0x65736372), 
-      ACE_NTOHL (0x69707469), 
-      ACE_NTOHL (0x6f6e3a31), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x49522f55),
+      ACE_NTOHL (0x73657344),
+      ACE_NTOHL (0x65736372),
+      ACE_NTOHL (0x69707469),
+      ACE_NTOHL (0x6f6e3a31),
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/UsesDescription:1.0
       16,
-      ACE_NTOHL (0x55736573), 
-      ACE_NTOHL (0x44657363), 
-      ACE_NTOHL (0x72697074), 
+      ACE_NTOHL (0x55736573),
+      ACE_NTOHL (0x44657363),
+      ACE_NTOHL (0x72697074),
       ACE_NTOHL (0x696f6e00),  // name = UsesDescription
       6, // member count
       5,
-      ACE_NTOHL (0x6e616d65), 
+      ACE_NTOHL (0x6e616d65),
       ACE_NTOHL (0x0),  // name = name
       CORBA::tk_alias, // typecode kind for typedefs
       64, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         30,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x49522f49), 
-        ACE_NTOHL (0x64656e74), 
-        ACE_NTOHL (0x69666965), 
-        ACE_NTOHL (0x723a312e), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x49522f49),
+        ACE_NTOHL (0x64656e74),
+        ACE_NTOHL (0x69666965),
+        ACE_NTOHL (0x723a312e),
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/Identifier:1.0
         11,
-        ACE_NTOHL (0x4964656e), 
-        ACE_NTOHL (0x74696669), 
+        ACE_NTOHL (0x4964656e),
+        ACE_NTOHL (0x74696669),
         ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
+        CORBA::tk_string,
         0U, // string length
 
       3,
@@ -5774,95 +5796,95 @@ static const CORBA::Long _oc_IR_UsesDescSeq[] =
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         32,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x49522f52), 
-        ACE_NTOHL (0x65706f73), 
-        ACE_NTOHL (0x69746f72), 
-        ACE_NTOHL (0x7949643a), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x49522f52),
+        ACE_NTOHL (0x65706f73),
+        ACE_NTOHL (0x69746f72),
+        ACE_NTOHL (0x7949643a),
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
         13,
-        ACE_NTOHL (0x5265706f), 
-        ACE_NTOHL (0x7369746f), 
-        ACE_NTOHL (0x72794964), 
+        ACE_NTOHL (0x5265706f),
+        ACE_NTOHL (0x7369746f),
+        ACE_NTOHL (0x72794964),
         ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
+        CORBA::tk_string,
         0U, // string length
 
       11,
-      ACE_NTOHL (0x64656669), 
-      ACE_NTOHL (0x6e65645f), 
+      ACE_NTOHL (0x64656669),
+      ACE_NTOHL (0x6e65645f),
       ACE_NTOHL (0x696e0000),  // name = defined_in
       CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         32,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x49522f52), 
-        ACE_NTOHL (0x65706f73), 
-        ACE_NTOHL (0x69746f72), 
-        ACE_NTOHL (0x7949643a), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x49522f52),
+        ACE_NTOHL (0x65706f73),
+        ACE_NTOHL (0x69746f72),
+        ACE_NTOHL (0x7949643a),
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
         13,
-        ACE_NTOHL (0x5265706f), 
-        ACE_NTOHL (0x7369746f), 
-        ACE_NTOHL (0x72794964), 
+        ACE_NTOHL (0x5265706f),
+        ACE_NTOHL (0x7369746f),
+        ACE_NTOHL (0x72794964),
         ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
+        CORBA::tk_string,
         0U, // string length
 
       8,
-      ACE_NTOHL (0x76657273), 
+      ACE_NTOHL (0x76657273),
       ACE_NTOHL (0x696f6e00),  // name = version
       CORBA::tk_alias, // typecode kind for typedefs
       64, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         31,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x49522f56), 
-        ACE_NTOHL (0x65727369), 
-        ACE_NTOHL (0x6f6e5370), 
-        ACE_NTOHL (0x65633a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x49522f56),
+        ACE_NTOHL (0x65727369),
+        ACE_NTOHL (0x6f6e5370),
+        ACE_NTOHL (0x65633a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/VersionSpec:1.0
         12,
-        ACE_NTOHL (0x56657273), 
-        ACE_NTOHL (0x696f6e53), 
+        ACE_NTOHL (0x56657273),
+        ACE_NTOHL (0x696f6e53),
         ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string, 
+        CORBA::tk_string,
         0U, // string length
 
       15,
-      ACE_NTOHL (0x696e7465), 
-      ACE_NTOHL (0x72666163), 
-      ACE_NTOHL (0x655f7479), 
+      ACE_NTOHL (0x696e7465),
+      ACE_NTOHL (0x72666163),
+      ACE_NTOHL (0x655f7479),
       ACE_NTOHL (0x70650000),  // name = interface_type
       CORBA::tk_objref, // typecode kind
       64, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f496e), 
-        ACE_NTOHL (0x74657266), 
-        ACE_NTOHL (0x61636544), 
-        ACE_NTOHL (0x65663a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f496e),
+        ACE_NTOHL (0x74657266),
+        ACE_NTOHL (0x61636544),
+        ACE_NTOHL (0x65663a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef:1.0
         13,
-        ACE_NTOHL (0x496e7465), 
-        ACE_NTOHL (0x72666163), 
-        ACE_NTOHL (0x65446566), 
+        ACE_NTOHL (0x496e7465),
+        ACE_NTOHL (0x72666163),
+        ACE_NTOHL (0x65446566),
         ACE_NTOHL (0x0),  // name = InterfaceDef
 
       12,
-      ACE_NTOHL (0x69735f6d), 
-      ACE_NTOHL (0x756c7469), 
+      ACE_NTOHL (0x69735f6d),
+      ACE_NTOHL (0x756c7469),
       ACE_NTOHL (0x706c6500),  // name = is_multiple
       CORBA::tk_boolean,
 
@@ -5975,7 +5997,7 @@ IR::EventDef_var::operator const ::IR::EventDef_ptr &() const // cast
   return this->ptr_;
 }
 
-IR::EventDef_var::operator ::IR::EventDef_ptr &() // cast 
+IR::EventDef_var::operator ::IR::EventDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -6051,7 +6073,7 @@ IR::EventDef_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class IR::EventDef_out
+// Operations for class IR::EventDef_out
 // *************************************************************
 
 IR::EventDef_out::EventDef_out (EventDef_ptr &p)
@@ -6118,24 +6140,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * event_id,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -6154,7 +6176,7 @@ TAO_ClientRequestInfo_IR_EventDef_is_a::TAO_ClientRequestInfo_IR_EventDef_is_a (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const char * event_id,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     event_id_ (event_id)
@@ -6168,14 +6190,16 @@ TAO_ClientRequestInfo_IR_EventDef_is_a::arguments (CORBA::Environment &ACE_TRY_E
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_event_id = parameter_list->length ();
-  parameter_list->length (length_event_id + 1);
-  (*parameter_list)[length_event_id].argument <<= event_id_;
-  (*parameter_list)[length_event_id].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= event_id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -6187,12 +6211,12 @@ TAO_ClientRequestInfo_IR_EventDef_is_a::exceptions (CORBA::Environment &ACE_TRY_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_IR_EventDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -6201,17 +6225,17 @@ TAO_ClientRequestInfo_IR_EventDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= CORBA::Any::from_boolean (this->_result);
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_IR_EventDef_is_a::result (CORBA::Boolean result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -6221,24 +6245,24 @@ public:
   TAO_ClientRequestInfo_IR_EventDef_event_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -6255,7 +6279,7 @@ private:
 TAO_ClientRequestInfo_IR_EventDef_event_get::TAO_ClientRequestInfo_IR_EventDef_event_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -6268,7 +6292,7 @@ TAO_ClientRequestInfo_IR_EventDef_event_get::arguments (CORBA::Environment &ACE_
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -6280,12 +6304,12 @@ TAO_ClientRequestInfo_IR_EventDef_event_get::exceptions (CORBA::Environment &ACE
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_IR_EventDef_event_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -6294,24 +6318,24 @@ TAO_ClientRequestInfo_IR_EventDef_event_get::result (CORBA::Environment &ACE_TRY
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_IR_EventDef_event_get::result (CORBA_ValueDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 IR::_TAO_EventDef_Proxy_Impl::_TAO_EventDef_Proxy_Impl (void)
@@ -6331,15 +6355,15 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA::Boolean _tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "is_a",
@@ -6348,17 +6372,21 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_EventDef_is_a ri (
         &_tao_call,
@@ -6367,31 +6395,40 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN  (_tao_retval);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << event_id)
@@ -6400,20 +6437,33 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a (
               CORBA::MARSHAL (),
               _tao_retval
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
@@ -6423,73 +6473,54 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA::Boolean  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA::Boolean _tao_retval_info = _tao_retval;
+          ri.result (_tao_retval_info);
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN  (_tao_retval);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_retval;
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN  (_tao_retval);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_retval;
 }
 
 CORBA_ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event (
@@ -6500,16 +6531,16 @@ CORBA_ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_ValueDef_ptr _tao_retval = CORBA_ValueDef::_nil ();
   CORBA_ValueDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_event",
@@ -6518,17 +6549,21 @@ CORBA_ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_EventDef_event_get ri (
         &_tao_call,
@@ -6536,43 +6571,66 @@ CORBA_ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -6582,79 +6640,60 @@ CORBA_ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -6724,13 +6763,13 @@ IR::EventDef::IR_EventDef_setup_collocation (int collocated)
   else
     this->the_TAO_EventDef_Proxy_Broker_ =
       ::IR::_TAO_EventDef_Remote_Proxy_Broker::the_TAO_EventDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_Contained_setup_collocation (collocated);
 }
 
-void IR::EventDef::_tao_any_destructor (void *x)
+void IR::EventDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  EventDef *tmp = ACE_static_cast (EventDef*,x);
+  EventDef *tmp = ACE_static_cast (EventDef*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -6777,14 +6816,14 @@ IR::EventDef_ptr IR::EventDef::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           EventDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::IR::EventDef (stub, 0, obj->_servant ()), EventDef::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -6854,7 +6893,7 @@ void *IR::EventDef::_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;
@@ -6873,10 +6912,10 @@ CORBA::Boolean IR::EventDef::is_a (
     CORBA::SystemException
   ))
 {
-  _TAO_EventDef_Proxy_Impl &proxy = 
+  _TAO_EventDef_Proxy_Impl &proxy =
     this->the_TAO_EventDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.is_a (
       this,
       event_id,
@@ -6891,10 +6930,10 @@ CORBA_ValueDef_ptr IR::EventDef::event (
     CORBA::SystemException
   ))
 {
-  _TAO_EventDef_Proxy_Impl &proxy = 
+  _TAO_EventDef_Proxy_Impl &proxy =
     this->the_TAO_EventDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.event (
       this,
       ACE_TRY_ENV
@@ -6905,16 +6944,16 @@ static const CORBA::Long _oc_IR_EventDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   28,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f45), 
-  ACE_NTOHL (0x76656e74), 
-  ACE_NTOHL (0x4465663a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49522f45),
+  ACE_NTOHL (0x76656e74),
+  ACE_NTOHL (0x4465663a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/EventDef:1.0
   9,
-  ACE_NTOHL (0x4576656e), 
-  ACE_NTOHL (0x74446566), 
+  ACE_NTOHL (0x4576656e),
+  ACE_NTOHL (0x74446566),
   ACE_NTOHL (0x0),  // name = EventDef
 };
 
@@ -6935,42 +6974,42 @@ static const CORBA::Long _oc_IR_EventDescription[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   36,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f45), 
-  ACE_NTOHL (0x76656e74), 
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
-  ACE_NTOHL (0x696f6e3a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49522f45),
+  ACE_NTOHL (0x76656e74),
+  ACE_NTOHL (0x44657363),
+  ACE_NTOHL (0x72697074),
+  ACE_NTOHL (0x696f6e3a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/EventDescription:1.0
   17,
-  ACE_NTOHL (0x4576656e), 
-  ACE_NTOHL (0x74446573), 
-  ACE_NTOHL (0x63726970), 
-  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x4576656e),
+  ACE_NTOHL (0x74446573),
+  ACE_NTOHL (0x63726970),
+  ACE_NTOHL (0x74696f6e),
   ACE_NTOHL (0x0),  // name = EventDescription
   5, // member count
   5,
-  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x6e616d65),
   ACE_NTOHL (0x0),  // name = name
   CORBA::tk_alias, // typecode kind for typedefs
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     30,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f49), 
-    ACE_NTOHL (0x64656e74), 
-    ACE_NTOHL (0x69666965), 
-    ACE_NTOHL (0x723a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f49),
+    ACE_NTOHL (0x64656e74),
+    ACE_NTOHL (0x69666965),
+    ACE_NTOHL (0x723a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/Identifier:1.0
     11,
-    ACE_NTOHL (0x4964656e), 
-    ACE_NTOHL (0x74696669), 
+    ACE_NTOHL (0x4964656e),
+    ACE_NTOHL (0x74696669),
     ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
   3,
@@ -6979,86 +7018,86 @@ static const CORBA::Long _oc_IR_EventDescription[] =
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     32,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f52), 
-    ACE_NTOHL (0x65706f73), 
-    ACE_NTOHL (0x69746f72), 
-    ACE_NTOHL (0x7949643a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f52),
+    ACE_NTOHL (0x65706f73),
+    ACE_NTOHL (0x69746f72),
+    ACE_NTOHL (0x7949643a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
     13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669), 
-  ACE_NTOHL (0x6e65645f), 
+  ACE_NTOHL (0x64656669),
+  ACE_NTOHL (0x6e65645f),
   ACE_NTOHL (0x696e0000),  // name = defined_in
   CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     32,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f52), 
-    ACE_NTOHL (0x65706f73), 
-    ACE_NTOHL (0x69746f72), 
-    ACE_NTOHL (0x7949643a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f52),
+    ACE_NTOHL (0x65706f73),
+    ACE_NTOHL (0x69746f72),
+    ACE_NTOHL (0x7949643a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
     13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
   8,
-  ACE_NTOHL (0x76657273), 
+  ACE_NTOHL (0x76657273),
   ACE_NTOHL (0x696f6e00),  // name = version
   CORBA::tk_alias, // typecode kind for typedefs
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f56), 
-    ACE_NTOHL (0x65727369), 
-    ACE_NTOHL (0x6f6e5370), 
-    ACE_NTOHL (0x65633a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f56),
+    ACE_NTOHL (0x65727369),
+    ACE_NTOHL (0x6f6e5370),
+    ACE_NTOHL (0x65633a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/VersionSpec:1.0
     12,
-    ACE_NTOHL (0x56657273), 
-    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x56657273),
+    ACE_NTOHL (0x696f6e53),
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
   6,
-  ACE_NTOHL (0x76616c75), 
+  ACE_NTOHL (0x76616c75),
   ACE_NTOHL (0x65000000),  // name = value
   CORBA::tk_objref, // typecode kind
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5661), 
-    ACE_NTOHL (0x6c756544), 
-    ACE_NTOHL (0x65663a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5661),
+    ACE_NTOHL (0x6c756544),
+    ACE_NTOHL (0x65663a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ValueDef:1.0
     9,
-    ACE_NTOHL (0x56616c75), 
-    ACE_NTOHL (0x65446566), 
+    ACE_NTOHL (0x56616c75),
+    ACE_NTOHL (0x65446566),
     ACE_NTOHL (0x0),  // name = ValueDef
 
 };
@@ -7076,9 +7115,9 @@ TAO_NAMESPACE_BEGIN (IR)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EventDescription, &_tc_TAO_tc_IR_EventDescription)
 TAO_NAMESPACE_END
 
-void IR::EventDescription::_tao_any_destructor (void *x)
+void IR::EventDescription::_tao_any_destructor (void *_tao_void_pointer)
 {
-  EventDescription *tmp = ACE_static_cast (EventDescription*,x);
+  EventDescription *tmp = ACE_static_cast (EventDescription*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -7173,7 +7212,7 @@ IR::EmitsDef_var::operator const ::IR::EmitsDef_ptr &() const // cast
   return this->ptr_;
 }
 
-IR::EmitsDef_var::operator ::IR::EmitsDef_ptr &() // cast 
+IR::EmitsDef_var::operator ::IR::EmitsDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -7249,7 +7288,7 @@ IR::EmitsDef_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class IR::EmitsDef_out
+// Operations for class IR::EmitsDef_out
 // *************************************************************
 
 IR::EmitsDef_out::EmitsDef_out (EmitsDef_ptr &p)
@@ -7312,7 +7351,7 @@ IR::EmitsDef_out::operator-> (void)
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 IR::_TAO_EmitsDef_Proxy_Impl::_TAO_EmitsDef_Proxy_Impl (void)
@@ -7325,7 +7364,7 @@ IR::_TAO_EmitsDef_Remote_Proxy_Impl::_TAO_EmitsDef_Remote_Proxy_Impl (void)
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -7395,13 +7434,13 @@ IR::EmitsDef::IR_EmitsDef_setup_collocation (int collocated)
   else
     this->the_TAO_EmitsDef_Proxy_Broker_ =
       ::IR::_TAO_EmitsDef_Remote_Proxy_Broker::the_TAO_EmitsDef_Remote_Proxy_Broker ();
-  
+
   this->IR_EventDef_setup_collocation (collocated);
 }
 
-void IR::EmitsDef::_tao_any_destructor (void *x)
+void IR::EmitsDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  EmitsDef *tmp = ACE_static_cast (EmitsDef*,x);
+  EmitsDef *tmp = ACE_static_cast (EmitsDef*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -7448,14 +7487,14 @@ IR::EmitsDef_ptr IR::EmitsDef::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           EmitsDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::IR::EmitsDef (stub, 0, obj->_servant ()), EmitsDef::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -7538,7 +7577,7 @@ void *IR::EmitsDef::_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;
@@ -7553,16 +7592,16 @@ static const CORBA::Long _oc_IR_EmitsDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   28,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f45), 
-  ACE_NTOHL (0x6d697473), 
-  ACE_NTOHL (0x4465663a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49522f45),
+  ACE_NTOHL (0x6d697473),
+  ACE_NTOHL (0x4465663a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/EmitsDef:1.0
   9,
-  ACE_NTOHL (0x456d6974), 
-  ACE_NTOHL (0x73446566), 
+  ACE_NTOHL (0x456d6974),
+  ACE_NTOHL (0x73446566),
   ACE_NTOHL (0x0),  // name = EmitsDef
 };
 
@@ -7670,7 +7709,7 @@ IR::PublishesDef_var::operator const ::IR::PublishesDef_ptr &() const // cast
   return this->ptr_;
 }
 
-IR::PublishesDef_var::operator ::IR::PublishesDef_ptr &() // cast 
+IR::PublishesDef_var::operator ::IR::PublishesDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -7746,7 +7785,7 @@ IR::PublishesDef_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class IR::PublishesDef_out
+// Operations for class IR::PublishesDef_out
 // *************************************************************
 
 IR::PublishesDef_out::PublishesDef_out (PublishesDef_ptr &p)
@@ -7809,7 +7848,7 @@ IR::PublishesDef_out::operator-> (void)
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 IR::_TAO_PublishesDef_Proxy_Impl::_TAO_PublishesDef_Proxy_Impl (void)
@@ -7822,7 +7861,7 @@ IR::_TAO_PublishesDef_Remote_Proxy_Impl::_TAO_PublishesDef_Remote_Proxy_Impl (vo
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -7892,13 +7931,13 @@ IR::PublishesDef::IR_PublishesDef_setup_collocation (int collocated)
   else
     this->the_TAO_PublishesDef_Proxy_Broker_ =
       ::IR::_TAO_PublishesDef_Remote_Proxy_Broker::the_TAO_PublishesDef_Remote_Proxy_Broker ();
-  
+
   this->IR_EventDef_setup_collocation (collocated);
 }
 
-void IR::PublishesDef::_tao_any_destructor (void *x)
+void IR::PublishesDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  PublishesDef *tmp = ACE_static_cast (PublishesDef*,x);
+  PublishesDef *tmp = ACE_static_cast (PublishesDef*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -7945,14 +7984,14 @@ IR::PublishesDef_ptr IR::PublishesDef::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           PublishesDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::IR::PublishesDef (stub, 0, obj->_servant ()), PublishesDef::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -8035,7 +8074,7 @@ void *IR::PublishesDef::_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;
@@ -8050,18 +8089,18 @@ static const CORBA::Long _oc_IR_PublishesDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   32,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f50), 
-  ACE_NTOHL (0x75626c69), 
-  ACE_NTOHL (0x73686573), 
-  ACE_NTOHL (0x4465663a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49522f50),
+  ACE_NTOHL (0x75626c69),
+  ACE_NTOHL (0x73686573),
+  ACE_NTOHL (0x4465663a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/PublishesDef:1.0
   13,
-  ACE_NTOHL (0x5075626c), 
-  ACE_NTOHL (0x69736865), 
-  ACE_NTOHL (0x73446566), 
+  ACE_NTOHL (0x5075626c),
+  ACE_NTOHL (0x69736865),
+  ACE_NTOHL (0x73446566),
   ACE_NTOHL (0x0),  // name = PublishesDef
 };
 
@@ -8169,7 +8208,7 @@ IR::ConsumesDef_var::operator const ::IR::ConsumesDef_ptr &() const // cast
   return this->ptr_;
 }
 
-IR::ConsumesDef_var::operator ::IR::ConsumesDef_ptr &() // cast 
+IR::ConsumesDef_var::operator ::IR::ConsumesDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -8245,7 +8284,7 @@ IR::ConsumesDef_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class IR::ConsumesDef_out
+// Operations for class IR::ConsumesDef_out
 // *************************************************************
 
 IR::ConsumesDef_out::ConsumesDef_out (ConsumesDef_ptr &p)
@@ -8308,7 +8347,7 @@ IR::ConsumesDef_out::operator-> (void)
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 IR::_TAO_ConsumesDef_Proxy_Impl::_TAO_ConsumesDef_Proxy_Impl (void)
@@ -8321,7 +8360,7 @@ IR::_TAO_ConsumesDef_Remote_Proxy_Impl::_TAO_ConsumesDef_Remote_Proxy_Impl (void
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -8391,13 +8430,13 @@ IR::ConsumesDef::IR_ConsumesDef_setup_collocation (int collocated)
   else
     this->the_TAO_ConsumesDef_Proxy_Broker_ =
       ::IR::_TAO_ConsumesDef_Remote_Proxy_Broker::the_TAO_ConsumesDef_Remote_Proxy_Broker ();
-  
+
   this->IR_EventDef_setup_collocation (collocated);
 }
 
-void IR::ConsumesDef::_tao_any_destructor (void *x)
+void IR::ConsumesDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ConsumesDef *tmp = ACE_static_cast (ConsumesDef*,x);
+  ConsumesDef *tmp = ACE_static_cast (ConsumesDef*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -8444,14 +8483,14 @@ IR::ConsumesDef_ptr IR::ConsumesDef::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           ConsumesDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::IR::ConsumesDef (stub, 0, obj->_servant ()), ConsumesDef::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -8534,7 +8573,7 @@ void *IR::ConsumesDef::_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;
@@ -8549,17 +8588,17 @@ static const CORBA::Long _oc_IR_ConsumesDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   31,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f43), 
-  ACE_NTOHL (0x6f6e7375), 
-  ACE_NTOHL (0x6d657344), 
-  ACE_NTOHL (0x65663a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49522f43),
+  ACE_NTOHL (0x6f6e7375),
+  ACE_NTOHL (0x6d657344),
+  ACE_NTOHL (0x65663a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/ConsumesDef:1.0
   12,
-  ACE_NTOHL (0x436f6e73), 
-  ACE_NTOHL (0x756d6573), 
+  ACE_NTOHL (0x436f6e73),
+  ACE_NTOHL (0x756d6573),
   ACE_NTOHL (0x44656600),  // name = ConsumesDef
 };
 
@@ -8667,7 +8706,7 @@ IR::ComponentDef_var::operator const ::IR::ComponentDef_ptr &() const // cast
   return this->ptr_;
 }
 
-IR::ComponentDef_var::operator ::IR::ComponentDef_ptr &() // cast 
+IR::ComponentDef_var::operator ::IR::ComponentDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -8743,7 +8782,7 @@ IR::ComponentDef_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class IR::ComponentDef_out
+// Operations for class IR::ComponentDef_out
 // *************************************************************
 
 IR::ComponentDef_out::ComponentDef_out (ComponentDef_ptr &p)
@@ -8809,24 +8848,24 @@ public:
   TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -8843,7 +8882,7 @@ private:
 TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -8856,7 +8895,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::arguments (CORBA
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -8868,12 +8907,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::exceptions (CORB
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -8882,17 +8921,17 @@ TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::result (CORBA::E
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::result (CORBA_InterfaceDefSeq * result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -8903,24 +8942,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA_InterfaceDefSeq & supported_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -8930,14 +8969,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set &);
 
   const CORBA_InterfaceDefSeq & supported_interfaces_;
-  
+
 };
 
 TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA_InterfaceDefSeq & supported_interfaces,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     supported_interfaces_ (supported_interfaces)
@@ -8951,15 +8990,16 @@ TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (CORBA
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_supported_interfaces = parameter_list->length ();
-  parameter_list->length (length_supported_interfaces + 1);
-  (*parameter_list)[length_supported_interfaces].argument <<=  this->supported_interfaces_;
-  
-  (*parameter_list)[length_supported_interfaces].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<=  this->supported_interfaces_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -8971,12 +9011,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::exceptions (CORB
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -8985,7 +9025,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::result (CORBA::E
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -8995,24 +9035,24 @@ public:
   TAO_ClientRequestInfo_IR_ComponentDef_base_component_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -9029,7 +9069,7 @@ private:
 TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -9042,7 +9082,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::arguments (CORBA::Envi
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -9054,12 +9094,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::exceptions (CORBA::Env
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -9068,17 +9108,17 @@ TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::result (CORBA::Environ
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::result (IR::ComponentDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -9088,24 +9128,24 @@ public:
   TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -9122,7 +9162,7 @@ private:
 TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -9135,7 +9175,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::arguments (CORBA:
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -9147,12 +9187,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::exceptions (CORBA
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -9161,17 +9201,17 @@ TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::result (CORBA::En
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::result (IR::ProvidesDefSeq * result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -9181,24 +9221,24 @@ public:
   TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -9215,7 +9255,7 @@ private:
 TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -9228,7 +9268,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::arguments (CORBA::Env
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -9240,12 +9280,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::exceptions (CORBA::En
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -9254,17 +9294,17 @@ TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::result (CORBA::Enviro
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::result (IR::UsesDefSeq * result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -9274,24 +9314,24 @@ public:
   TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -9308,7 +9348,7 @@ private:
 TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -9321,7 +9361,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::arguments (CORBA::Enviro
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -9333,12 +9373,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::exceptions (CORBA::Envir
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -9347,17 +9387,17 @@ TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::result (CORBA::Environme
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::result (IR::EmitsDefSeq * result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -9367,24 +9407,24 @@ public:
   TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -9401,7 +9441,7 @@ private:
 TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -9414,7 +9454,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::arguments (CORBA::En
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -9426,12 +9466,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::exceptions (CORBA::E
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -9440,17 +9480,17 @@ TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::result (CORBA::Envir
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::result (IR::PublishesDefSeq * result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -9460,24 +9500,24 @@ public:
   TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -9494,7 +9534,7 @@ private:
 TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -9507,7 +9547,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::arguments (CORBA::Env
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -9519,12 +9559,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::exceptions (CORBA::En
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -9533,17 +9573,17 @@ TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::result (CORBA::Enviro
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::result (IR::ConsumesDefSeq * result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -9553,24 +9593,24 @@ public:
   TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -9587,7 +9627,7 @@ private:
 TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -9600,7 +9640,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::arguments (CORBA::Environmen
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -9612,12 +9652,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::exceptions (CORBA::Environme
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -9626,17 +9666,17 @@ TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::result (CORBA::Environment &
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= CORBA::Any::from_boolean (this->_result);
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::result (CORBA::Boolean result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -9650,24 +9690,24 @@ public:
       const char * name,
       const char * version,
       CORBA_InterfaceDef_ptr interface_type,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -9692,7 +9732,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_provides::TAO_ClientRequestInfo_IR_
     const char * name,
     const char * version,
     CORBA_InterfaceDef_ptr interface_type,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -9709,30 +9749,25 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_provides::arguments (CORBA::Environ
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_interface_type = parameter_list->length ();
-  parameter_list->length (length_interface_type + 1);
-  (*parameter_list)[length_interface_type].argument <<=  this->interface_type_;
-  
-  (*parameter_list)[length_interface_type].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (4);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= version_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->interface_type_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -9744,12 +9779,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_provides::exceptions (CORBA::Enviro
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_IR_ComponentDef_create_provides::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -9758,17 +9793,17 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_provides::result (CORBA::Environmen
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_IR_ComponentDef_create_provides::result (IR::ProvidesDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -9783,24 +9818,24 @@ public:
       const char * version,
       CORBA_InterfaceDef_ptr interface_type,
       const CORBA::Boolean & is_multiple,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -9827,7 +9862,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_uses::TAO_ClientRequestInfo_IR_Comp
     const char * version,
     CORBA_InterfaceDef_ptr interface_type,
     const CORBA::Boolean & is_multiple,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -9845,35 +9880,28 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_uses::arguments (CORBA::Environment
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_interface_type = parameter_list->length ();
-  parameter_list->length (length_interface_type + 1);
-  (*parameter_list)[length_interface_type].argument <<=  this->interface_type_;
-  
-  (*parameter_list)[length_interface_type].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_is_multiple = parameter_list->length ();
-  parameter_list->length (length_is_multiple + 1);
-  (*parameter_list)[length_is_multiple].argument <<= CORBA::Any::from_boolean (this->is_multiple_);
-  (*parameter_list)[length_is_multiple].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (5);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= version_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->interface_type_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_multiple_);
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -9885,12 +9913,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_uses::exceptions (CORBA::Environmen
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_IR_ComponentDef_create_uses::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -9899,17 +9927,17 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_uses::result (CORBA::Environment &A
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_IR_ComponentDef_create_uses::result (IR::UsesDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -9923,24 +9951,24 @@ public:
       const char * name,
       const char * version,
       CORBA_ValueDef_ptr value,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -9965,7 +9993,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_emits::TAO_ClientRequestInfo_IR_Com
     const char * name,
     const char * version,
     CORBA_ValueDef_ptr value,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -9982,30 +10010,25 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_emits::arguments (CORBA::Environmen
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_value = parameter_list->length ();
-  parameter_list->length (length_value + 1);
-  (*parameter_list)[length_value].argument <<=  this->value_;
-  
-  (*parameter_list)[length_value].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (4);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= version_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->value_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -10017,12 +10040,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_emits::exceptions (CORBA::Environme
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_IR_ComponentDef_create_emits::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -10031,17 +10054,17 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_emits::result (CORBA::Environment &
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_IR_ComponentDef_create_emits::result (IR::EmitsDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -10055,24 +10078,24 @@ public:
       const char * name,
       const char * version,
       CORBA_ValueDef_ptr value,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -10097,7 +10120,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::TAO_ClientRequestInfo_IR
     const char * name,
     const char * version,
     CORBA_ValueDef_ptr value,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -10114,30 +10137,25 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::arguments (CORBA::Enviro
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_value = parameter_list->length ();
-  parameter_list->length (length_value + 1);
-  (*parameter_list)[length_value].argument <<=  this->value_;
-  
-  (*parameter_list)[length_value].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (4);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= version_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->value_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -10149,12 +10167,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::exceptions (CORBA::Envir
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -10163,17 +10181,17 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::result (CORBA::Environme
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::result (IR::PublishesDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -10187,24 +10205,24 @@ public:
       const char * name,
       const char * version,
       CORBA_ValueDef_ptr value,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -10229,7 +10247,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::TAO_ClientRequestInfo_IR_
     const char * name,
     const char * version,
     CORBA_ValueDef_ptr value,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -10246,30 +10264,25 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::arguments (CORBA::Environ
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_value = parameter_list->length ();
-  parameter_list->length (length_value + 1);
-  (*parameter_list)[length_value].argument <<=  this->value_;
-  
-  (*parameter_list)[length_value].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (4);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= version_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->value_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -10281,12 +10294,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::exceptions (CORBA::Enviro
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -10295,24 +10308,24 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::result (CORBA::Environmen
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::result (IR::ConsumesDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 IR::_TAO_ComponentDef_Proxy_Impl::_TAO_ComponentDef_Proxy_Impl (void)
@@ -10331,15 +10344,15 @@ CORBA_InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_inter
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_InterfaceDefSeq *_tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   ACE_NEW_RETURN (_tao_retval, CORBA_InterfaceDefSeq, _tao_retval);
   CORBA_InterfaceDefSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -10350,17 +10363,21 @@ CORBA_InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_inter
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get ri (
         &_tao_call,
@@ -10368,43 +10385,66 @@ CORBA_InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_inter
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -10414,74 +10454,55 @@ CORBA_InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_inter
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_InterfaceDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_InterfaceDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
@@ -10493,15 +10514,15 @@ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_supported_interfaces",
@@ -10510,17 +10531,21 @@ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set ri (
         &_tao_call,
@@ -10529,31 +10554,40 @@ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << supported_interfaces)
@@ -10561,79 +10595,76 @@ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
@@ -10644,16 +10675,16 @@ IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
     CORBA::SystemException
   ))
 {
-  
+
   IR::ComponentDef_ptr _tao_retval = IR::ComponentDef::_nil ();
   IR::ComponentDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_base_component",
@@ -10662,17 +10693,21 @@ IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_ComponentDef_base_component_get ri (
         &_tao_call,
@@ -10680,43 +10715,66 @@ IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -10726,74 +10784,55 @@ IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              IR::ComponentDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          IR::ComponentDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::provides_interfaces (
@@ -10804,15 +10843,15 @@ IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::provides_interface
     CORBA::SystemException
   ))
 {
-  
+
   IR::ProvidesDefSeq *_tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   ACE_NEW_RETURN (_tao_retval, IR::ProvidesDefSeq, _tao_retval);
   IR::ProvidesDefSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -10823,17 +10862,21 @@ IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::provides_interface
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get ri (
         &_tao_call,
@@ -10841,43 +10884,66 @@ IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::provides_interface
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -10887,74 +10953,55 @@ IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::provides_interface
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              IR::ProvidesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          IR::ProvidesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces (
@@ -10965,15 +11012,15 @@ IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces (
     CORBA::SystemException
   ))
 {
-  
+
   IR::UsesDefSeq *_tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   ACE_NEW_RETURN (_tao_retval, IR::UsesDefSeq, _tao_retval);
   IR::UsesDefSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -10984,17 +11031,21 @@ IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get ri (
         &_tao_call,
@@ -11002,43 +11053,66 @@ IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -11048,74 +11122,55 @@ IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              IR::UsesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          IR::UsesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::emits_events (
@@ -11126,15 +11181,15 @@ IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::emits_events (
     CORBA::SystemException
   ))
 {
-  
+
   IR::EmitsDefSeq *_tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   ACE_NEW_RETURN (_tao_retval, IR::EmitsDefSeq, _tao_retval);
   IR::EmitsDefSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -11145,17 +11200,21 @@ IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::emits_events (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get ri (
         &_tao_call,
@@ -11163,43 +11222,66 @@ IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::emits_events (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -11209,74 +11291,55 @@ IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::emits_events (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              IR::EmitsDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          IR::EmitsDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::publishes_events (
@@ -11287,15 +11350,15 @@ IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::publishes_events
     CORBA::SystemException
   ))
 {
-  
+
   IR::PublishesDefSeq *_tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   ACE_NEW_RETURN (_tao_retval, IR::PublishesDefSeq, _tao_retval);
   IR::PublishesDefSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -11306,17 +11369,21 @@ IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::publishes_events
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get ri (
         &_tao_call,
@@ -11324,43 +11391,66 @@ IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::publishes_events
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -11370,74 +11460,55 @@ IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::publishes_events
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              IR::PublishesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          IR::PublishesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::consumes_events (
@@ -11448,15 +11519,15 @@ IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::consumes_events (
     CORBA::SystemException
   ))
 {
-  
+
   IR::ConsumesDefSeq *_tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   ACE_NEW_RETURN (_tao_retval, IR::ConsumesDefSeq, _tao_retval);
   IR::ConsumesDefSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -11467,17 +11538,21 @@ IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::consumes_events (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get ri (
         &_tao_call,
@@ -11485,43 +11560,66 @@ IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::consumes_events (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -11531,74 +11629,55 @@ IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::consumes_events (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              IR::ConsumesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          IR::ConsumesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic (
@@ -11609,15 +11688,15 @@ CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA::Boolean _tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_is_basic",
@@ -11626,17 +11705,21 @@ CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get ri (
         &_tao_call,
@@ -11644,43 +11727,66 @@ CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN  (_tao_retval);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
@@ -11690,73 +11796,54 @@ CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA::Boolean  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA::Boolean _tao_retval_info = _tao_retval;
+          ri.result (_tao_retval_info);
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN  (_tao_retval);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_retval;
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN  (_tao_retval);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_retval;
 }
 
 IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
@@ -11771,16 +11858,16 @@ IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
     CORBA::SystemException
   ))
 {
-  
+
   IR::ProvidesDef_ptr _tao_retval = IR::ProvidesDef::_nil ();
   IR::ProvidesDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_provides",
@@ -11789,17 +11876,21 @@ IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_ComponentDef_create_provides ri (
         &_tao_call,
@@ -11811,31 +11902,40 @@ IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << id) &&
@@ -11847,20 +11947,33 @@ IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -11870,74 +11983,55 @@ IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              IR::ProvidesDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          IR::ProvidesDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
@@ -11953,16 +12047,16 @@ IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
     CORBA::SystemException
   ))
 {
-  
+
   IR::UsesDef_ptr _tao_retval = IR::UsesDef::_nil ();
   IR::UsesDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_uses",
@@ -11971,17 +12065,21 @@ IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_ComponentDef_create_uses ri (
         &_tao_call,
@@ -11994,31 +12092,40 @@ IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << id) &&
@@ -12031,20 +12138,33 @@ IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -12054,74 +12174,55 @@ IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              IR::UsesDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          IR::UsesDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
@@ -12136,16 +12237,16 @@ IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
     CORBA::SystemException
   ))
 {
-  
+
   IR::EmitsDef_ptr _tao_retval = IR::EmitsDef::_nil ();
   IR::EmitsDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_emits",
@@ -12154,17 +12255,21 @@ IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_ComponentDef_create_emits ri (
         &_tao_call,
@@ -12176,31 +12281,40 @@ IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << id) &&
@@ -12212,20 +12326,33 @@ IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -12235,74 +12362,55 @@ IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              IR::EmitsDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          IR::EmitsDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
@@ -12317,16 +12425,16 @@ IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
     CORBA::SystemException
   ))
 {
-  
+
   IR::PublishesDef_ptr _tao_retval = IR::PublishesDef::_nil ();
   IR::PublishesDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_publishes",
@@ -12335,17 +12443,21 @@ IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_ComponentDef_create_publishes ri (
         &_tao_call,
@@ -12357,31 +12469,40 @@ IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << id) &&
@@ -12393,20 +12514,33 @@ IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -12416,74 +12550,55 @@ IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              IR::PublishesDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          IR::PublishesDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
@@ -12498,16 +12613,16 @@ IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
     CORBA::SystemException
   ))
 {
-  
+
   IR::ConsumesDef_ptr _tao_retval = IR::ConsumesDef::_nil ();
   IR::ConsumesDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_consumes",
@@ -12516,17 +12631,21 @@ IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_ComponentDef_create_consumes ri (
         &_tao_call,
@@ -12538,31 +12657,40 @@ IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << id) &&
@@ -12574,20 +12702,33 @@ IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -12597,79 +12738,60 @@ IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              IR::ConsumesDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          IR::ConsumesDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -12739,13 +12861,13 @@ IR::ComponentDef::IR_ComponentDef_setup_collocation (int collocated)
   else
     this->the_TAO_ComponentDef_Proxy_Broker_ =
       ::IR::_TAO_ComponentDef_Remote_Proxy_Broker::the_TAO_ComponentDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_InterfaceDef_setup_collocation (collocated);
 }
 
-void IR::ComponentDef::_tao_any_destructor (void *x)
+void IR::ComponentDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ComponentDef *tmp = ACE_static_cast (ComponentDef*,x);
+  ComponentDef *tmp = ACE_static_cast (ComponentDef*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -12792,14 +12914,14 @@ IR::ComponentDef_ptr IR::ComponentDef::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           ComponentDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::IR::ComponentDef (stub, 0, obj->_servant ()), ComponentDef::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -12908,7 +13030,7 @@ void *IR::ComponentDef::_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;
@@ -12926,10 +13048,10 @@ CORBA_InterfaceDefSeq * IR::ComponentDef::supported_interfaces (
     CORBA::SystemException
   ))
 {
-  _TAO_ComponentDef_Proxy_Impl &proxy = 
+  _TAO_ComponentDef_Proxy_Impl &proxy =
     this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.supported_interfaces (
       this,
       ACE_TRY_ENV
@@ -12944,10 +13066,10 @@ void IR::ComponentDef::supported_interfaces (
     CORBA::SystemException
   ))
 {
-  _TAO_ComponentDef_Proxy_Impl &proxy = 
+  _TAO_ComponentDef_Proxy_Impl &proxy =
     this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.supported_interfaces (
       this,
       supported_interfaces,
@@ -12962,10 +13084,10 @@ IR::ComponentDef_ptr IR::ComponentDef::base_component (
     CORBA::SystemException
   ))
 {
-  _TAO_ComponentDef_Proxy_Impl &proxy = 
+  _TAO_ComponentDef_Proxy_Impl &proxy =
     this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.base_component (
       this,
       ACE_TRY_ENV
@@ -12979,10 +13101,10 @@ IR::ProvidesDefSeq * IR::ComponentDef::provides_interfaces (
     CORBA::SystemException
   ))
 {
-  _TAO_ComponentDef_Proxy_Impl &proxy = 
+  _TAO_ComponentDef_Proxy_Impl &proxy =
     this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.provides_interfaces (
       this,
       ACE_TRY_ENV
@@ -12996,10 +13118,10 @@ IR::UsesDefSeq * IR::ComponentDef::uses_interfaces (
     CORBA::SystemException
   ))
 {
-  _TAO_ComponentDef_Proxy_Impl &proxy = 
+  _TAO_ComponentDef_Proxy_Impl &proxy =
     this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.uses_interfaces (
       this,
       ACE_TRY_ENV
@@ -13013,10 +13135,10 @@ IR::EmitsDefSeq * IR::ComponentDef::emits_events (
     CORBA::SystemException
   ))
 {
-  _TAO_ComponentDef_Proxy_Impl &proxy = 
+  _TAO_ComponentDef_Proxy_Impl &proxy =
     this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.emits_events (
       this,
       ACE_TRY_ENV
@@ -13030,10 +13152,10 @@ IR::PublishesDefSeq * IR::ComponentDef::publishes_events (
     CORBA::SystemException
   ))
 {
-  _TAO_ComponentDef_Proxy_Impl &proxy = 
+  _TAO_ComponentDef_Proxy_Impl &proxy =
     this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.publishes_events (
       this,
       ACE_TRY_ENV
@@ -13047,10 +13169,10 @@ IR::ConsumesDefSeq * IR::ComponentDef::consumes_events (
     CORBA::SystemException
   ))
 {
-  _TAO_ComponentDef_Proxy_Impl &proxy = 
+  _TAO_ComponentDef_Proxy_Impl &proxy =
     this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.consumes_events (
       this,
       ACE_TRY_ENV
@@ -13064,10 +13186,10 @@ CORBA::Boolean IR::ComponentDef::is_basic (
     CORBA::SystemException
   ))
 {
-  _TAO_ComponentDef_Proxy_Impl &proxy = 
+  _TAO_ComponentDef_Proxy_Impl &proxy =
     this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.is_basic (
       this,
       ACE_TRY_ENV
@@ -13085,10 +13207,10 @@ IR::ProvidesDef_ptr IR::ComponentDef::create_provides (
     CORBA::SystemException
   ))
 {
-  _TAO_ComponentDef_Proxy_Impl &proxy = 
+  _TAO_ComponentDef_Proxy_Impl &proxy =
     this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_provides (
       this,
       id,
@@ -13111,10 +13233,10 @@ IR::UsesDef_ptr IR::ComponentDef::create_uses (
     CORBA::SystemException
   ))
 {
-  _TAO_ComponentDef_Proxy_Impl &proxy = 
+  _TAO_ComponentDef_Proxy_Impl &proxy =
     this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_uses (
       this,
       id,
@@ -13137,10 +13259,10 @@ IR::EmitsDef_ptr IR::ComponentDef::create_emits (
     CORBA::SystemException
   ))
 {
-  _TAO_ComponentDef_Proxy_Impl &proxy = 
+  _TAO_ComponentDef_Proxy_Impl &proxy =
     this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_emits (
       this,
       id,
@@ -13162,10 +13284,10 @@ IR::PublishesDef_ptr IR::ComponentDef::create_publishes (
     CORBA::SystemException
   ))
 {
-  _TAO_ComponentDef_Proxy_Impl &proxy = 
+  _TAO_ComponentDef_Proxy_Impl &proxy =
     this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_publishes (
       this,
       id,
@@ -13187,10 +13309,10 @@ IR::ConsumesDef_ptr IR::ComponentDef::create_consumes (
     CORBA::SystemException
   ))
 {
-  _TAO_ComponentDef_Proxy_Impl &proxy = 
+  _TAO_ComponentDef_Proxy_Impl &proxy =
     this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_consumes (
       this,
       id,
@@ -13205,18 +13327,18 @@ static const CORBA::Long _oc_IR_ComponentDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   32,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f43), 
-  ACE_NTOHL (0x6f6d706f), 
-  ACE_NTOHL (0x6e656e74), 
-  ACE_NTOHL (0x4465663a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49522f43),
+  ACE_NTOHL (0x6f6d706f),
+  ACE_NTOHL (0x6e656e74),
+  ACE_NTOHL (0x4465663a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/ComponentDef:1.0
   13,
-  ACE_NTOHL (0x436f6d70), 
-  ACE_NTOHL (0x6f6e656e), 
-  ACE_NTOHL (0x74446566), 
+  ACE_NTOHL (0x436f6d70),
+  ACE_NTOHL (0x6f6e656e),
+  ACE_NTOHL (0x74446566),
   ACE_NTOHL (0x0),  // name = ComponentDef
 };
 
@@ -13237,44 +13359,44 @@ static const CORBA::Long _oc_IR_ComponentDescription[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f43), 
-  ACE_NTOHL (0x6f6d706f), 
-  ACE_NTOHL (0x6e656e74), 
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
-  ACE_NTOHL (0x696f6e3a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49522f43),
+  ACE_NTOHL (0x6f6d706f),
+  ACE_NTOHL (0x6e656e74),
+  ACE_NTOHL (0x44657363),
+  ACE_NTOHL (0x72697074),
+  ACE_NTOHL (0x696f6e3a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/ComponentDescription:1.0
   21,
-  ACE_NTOHL (0x436f6d70), 
-  ACE_NTOHL (0x6f6e656e), 
-  ACE_NTOHL (0x74446573), 
-  ACE_NTOHL (0x63726970), 
-  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x436f6d70),
+  ACE_NTOHL (0x6f6e656e),
+  ACE_NTOHL (0x74446573),
+  ACE_NTOHL (0x63726970),
+  ACE_NTOHL (0x74696f6e),
   ACE_NTOHL (0x0),  // name = ComponentDescription
   13, // member count
   5,
-  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x6e616d65),
   ACE_NTOHL (0x0),  // name = name
   CORBA::tk_alias, // typecode kind for typedefs
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     30,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f49), 
-    ACE_NTOHL (0x64656e74), 
-    ACE_NTOHL (0x69666965), 
-    ACE_NTOHL (0x723a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f49),
+    ACE_NTOHL (0x64656e74),
+    ACE_NTOHL (0x69666965),
+    ACE_NTOHL (0x723a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/Identifier:1.0
     11,
-    ACE_NTOHL (0x4964656e), 
-    ACE_NTOHL (0x74696669), 
+    ACE_NTOHL (0x4964656e),
+    ACE_NTOHL (0x74696669),
     ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
   3,
@@ -13283,116 +13405,116 @@ static const CORBA::Long _oc_IR_ComponentDescription[] =
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     32,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f52), 
-    ACE_NTOHL (0x65706f73), 
-    ACE_NTOHL (0x69746f72), 
-    ACE_NTOHL (0x7949643a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f52),
+    ACE_NTOHL (0x65706f73),
+    ACE_NTOHL (0x69746f72),
+    ACE_NTOHL (0x7949643a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
     13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669), 
-  ACE_NTOHL (0x6e65645f), 
+  ACE_NTOHL (0x64656669),
+  ACE_NTOHL (0x6e65645f),
   ACE_NTOHL (0x696e0000),  // name = defined_in
   CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     32,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f52), 
-    ACE_NTOHL (0x65706f73), 
-    ACE_NTOHL (0x69746f72), 
-    ACE_NTOHL (0x7949643a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f52),
+    ACE_NTOHL (0x65706f73),
+    ACE_NTOHL (0x69746f72),
+    ACE_NTOHL (0x7949643a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
     13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
   8,
-  ACE_NTOHL (0x76657273), 
+  ACE_NTOHL (0x76657273),
   ACE_NTOHL (0x696f6e00),  // name = version
   CORBA::tk_alias, // typecode kind for typedefs
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f56), 
-    ACE_NTOHL (0x65727369), 
-    ACE_NTOHL (0x6f6e5370), 
-    ACE_NTOHL (0x65633a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f56),
+    ACE_NTOHL (0x65727369),
+    ACE_NTOHL (0x6f6e5370),
+    ACE_NTOHL (0x65633a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/VersionSpec:1.0
     12,
-    ACE_NTOHL (0x56657273), 
-    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x56657273),
+    ACE_NTOHL (0x696f6e53),
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
   15,
-  ACE_NTOHL (0x62617365), 
-  ACE_NTOHL (0x5f636f6d), 
-  ACE_NTOHL (0x706f6e65), 
+  ACE_NTOHL (0x62617365),
+  ACE_NTOHL (0x5f636f6d),
+  ACE_NTOHL (0x706f6e65),
   ACE_NTOHL (0x6e740000),  // name = base_component
   CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     32,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f52), 
-    ACE_NTOHL (0x65706f73), 
-    ACE_NTOHL (0x69746f72), 
-    ACE_NTOHL (0x7949643a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f52),
+    ACE_NTOHL (0x65706f73),
+    ACE_NTOHL (0x69746f72),
+    ACE_NTOHL (0x7949643a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
     13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
   20,
-  ACE_NTOHL (0x73757070), 
-  ACE_NTOHL (0x6f727473), 
-  ACE_NTOHL (0x5f696e74), 
-  ACE_NTOHL (0x65726661), 
+  ACE_NTOHL (0x73757070),
+  ACE_NTOHL (0x6f727473),
+  ACE_NTOHL (0x5f696e74),
+  ACE_NTOHL (0x65726661),
   ACE_NTOHL (0x63657300),  // name = supports_interfaces
   CORBA::tk_alias, // typecode kind for typedefs
   156, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f52), 
-    ACE_NTOHL (0x65706f73), 
-    ACE_NTOHL (0x69746f72), 
-    ACE_NTOHL (0x79496453), 
-    ACE_NTOHL (0x65713a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f52),
+    ACE_NTOHL (0x65706f73),
+    ACE_NTOHL (0x69746f72),
+    ACE_NTOHL (0x79496453),
+    ACE_NTOHL (0x65713a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/RepositoryIdSeq:1.0
     16,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
     CORBA::tk_sequence, // typecode kind
     84, // encapsulation length
@@ -13401,48 +13523,48 @@ static const CORBA::Long _oc_IR_ComponentDescription[] =
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         32,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x49522f52), 
-        ACE_NTOHL (0x65706f73), 
-        ACE_NTOHL (0x69746f72), 
-        ACE_NTOHL (0x7949643a), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x49522f52),
+        ACE_NTOHL (0x65706f73),
+        ACE_NTOHL (0x69746f72),
+        ACE_NTOHL (0x7949643a),
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
         13,
-        ACE_NTOHL (0x5265706f), 
-        ACE_NTOHL (0x7369746f), 
-        ACE_NTOHL (0x72794964), 
+        ACE_NTOHL (0x5265706f),
+        ACE_NTOHL (0x7369746f),
+        ACE_NTOHL (0x72794964),
         ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
+        CORBA::tk_string,
         0U, // string length
 
       0U,
 
 
   20,
-  ACE_NTOHL (0x70726f76), 
-  ACE_NTOHL (0x69646573), 
-  ACE_NTOHL (0x5f696e74), 
-  ACE_NTOHL (0x65726661), 
+  ACE_NTOHL (0x70726f76),
+  ACE_NTOHL (0x69646573),
+  ACE_NTOHL (0x5f696e74),
+  ACE_NTOHL (0x65726661),
   ACE_NTOHL (0x63657300),  // name = provides_interfaces
   CORBA::tk_alias, // typecode kind for typedefs
   144, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f50), 
-    ACE_NTOHL (0x726f7669), 
-    ACE_NTOHL (0x64657344), 
-    ACE_NTOHL (0x65665365), 
-    ACE_NTOHL (0x713a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f50),
+    ACE_NTOHL (0x726f7669),
+    ACE_NTOHL (0x64657344),
+    ACE_NTOHL (0x65665365),
+    ACE_NTOHL (0x713a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/ProvidesDefSeq:1.0
     15,
-    ACE_NTOHL (0x50726f76), 
-    ACE_NTOHL (0x69646573), 
-    ACE_NTOHL (0x44656653), 
+    ACE_NTOHL (0x50726f76),
+    ACE_NTOHL (0x69646573),
+    ACE_NTOHL (0x44656653),
     ACE_NTOHL (0x65710000),  // name = ProvidesDefSeq
     CORBA::tk_sequence, // typecode kind
     72, // encapsulation length
@@ -13451,42 +13573,42 @@ static const CORBA::Long _oc_IR_ComponentDescription[] =
       56, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         31,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x49522f50), 
-        ACE_NTOHL (0x726f7669), 
-        ACE_NTOHL (0x64657344), 
-        ACE_NTOHL (0x65663a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x49522f50),
+        ACE_NTOHL (0x726f7669),
+        ACE_NTOHL (0x64657344),
+        ACE_NTOHL (0x65663a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/ProvidesDef:1.0
         12,
-        ACE_NTOHL (0x50726f76), 
-        ACE_NTOHL (0x69646573), 
+        ACE_NTOHL (0x50726f76),
+        ACE_NTOHL (0x69646573),
         ACE_NTOHL (0x44656600),  // name = ProvidesDef
 
       0U,
 
 
   16,
-  ACE_NTOHL (0x75736573), 
-  ACE_NTOHL (0x5f696e74), 
-  ACE_NTOHL (0x65726661), 
+  ACE_NTOHL (0x75736573),
+  ACE_NTOHL (0x5f696e74),
+  ACE_NTOHL (0x65726661),
   ACE_NTOHL (0x63657300),  // name = uses_interfaces
   CORBA::tk_alias, // typecode kind for typedefs
   128, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     30,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f55), 
-    ACE_NTOHL (0x73657344), 
-    ACE_NTOHL (0x65665365), 
-    ACE_NTOHL (0x713a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f55),
+    ACE_NTOHL (0x73657344),
+    ACE_NTOHL (0x65665365),
+    ACE_NTOHL (0x713a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/UsesDefSeq:1.0
     11,
-    ACE_NTOHL (0x55736573), 
-    ACE_NTOHL (0x44656653), 
+    ACE_NTOHL (0x55736573),
+    ACE_NTOHL (0x44656653),
     ACE_NTOHL (0x65710000),  // name = UsesDefSeq
     CORBA::tk_sequence, // typecode kind
     64, // encapsulation length
@@ -13495,44 +13617,44 @@ static const CORBA::Long _oc_IR_ComponentDescription[] =
       48, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         27,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x49522f55), 
-        ACE_NTOHL (0x73657344), 
-        ACE_NTOHL (0x65663a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x49522f55),
+        ACE_NTOHL (0x73657344),
+        ACE_NTOHL (0x65663a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/UsesDef:1.0
         8,
-        ACE_NTOHL (0x55736573), 
+        ACE_NTOHL (0x55736573),
         ACE_NTOHL (0x44656600),  // name = UsesDef
 
       0U,
 
 
   11,
-  ACE_NTOHL (0x61747472), 
-  ACE_NTOHL (0x69627574), 
+  ACE_NTOHL (0x61747472),
+  ACE_NTOHL (0x69627574),
   ACE_NTOHL (0x65730000),  // name = attributes
   CORBA::tk_alias, // typecode kind for typedefs
   1852, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     41,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4174), 
-    ACE_NTOHL (0x74724465), 
-    ACE_NTOHL (0x73637269), 
-    ACE_NTOHL (0x7074696f), 
-    ACE_NTOHL (0x6e536571), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4174),
+    ACE_NTOHL (0x74724465),
+    ACE_NTOHL (0x73637269),
+    ACE_NTOHL (0x7074696f),
+    ACE_NTOHL (0x6e536571),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/AttrDescriptionSeq:1.0
     19,
-    ACE_NTOHL (0x41747472), 
-    ACE_NTOHL (0x44657363), 
-    ACE_NTOHL (0x72697074), 
-    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x41747472),
+    ACE_NTOHL (0x44657363),
+    ACE_NTOHL (0x72697074),
+    ACE_NTOHL (0x696f6e53),
     ACE_NTOHL (0x65710000),  // name = AttrDescriptionSeq
     CORBA::tk_sequence, // typecode kind
     1768, // encapsulation length
@@ -13541,47 +13663,47 @@ static const CORBA::Long _oc_IR_ComponentDescription[] =
       1752, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4174), 
-        ACE_NTOHL (0x74726962), 
-        ACE_NTOHL (0x75746544), 
-        ACE_NTOHL (0x65736372), 
-        ACE_NTOHL (0x69707469), 
-        ACE_NTOHL (0x6f6e3a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4174),
+        ACE_NTOHL (0x74726962),
+        ACE_NTOHL (0x75746544),
+        ACE_NTOHL (0x65736372),
+        ACE_NTOHL (0x69707469),
+        ACE_NTOHL (0x6f6e3a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDescription:1.0
         21,
-        ACE_NTOHL (0x41747472), 
-        ACE_NTOHL (0x69627574), 
-        ACE_NTOHL (0x65446573), 
-        ACE_NTOHL (0x63726970), 
-        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x41747472),
+        ACE_NTOHL (0x69627574),
+        ACE_NTOHL (0x65446573),
+        ACE_NTOHL (0x63726970),
+        ACE_NTOHL (0x74696f6e),
         ACE_NTOHL (0x0),  // name = AttributeDescription
         8, // member count
         5,
-        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x6e616d65),
         ACE_NTOHL (0x0),  // name = name
         CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4964), 
-          ACE_NTOHL (0x656e7469), 
-          ACE_NTOHL (0x66696572), 
-          ACE_NTOHL (0x3a312e30), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4964),
+          ACE_NTOHL (0x656e7469),
+          ACE_NTOHL (0x66696572),
+          ACE_NTOHL (0x3a312e30),
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
           11,
-          ACE_NTOHL (0x4964656e), 
-          ACE_NTOHL (0x74696669), 
+          ACE_NTOHL (0x4964656e),
+          ACE_NTOHL (0x74696669),
           ACE_NTOHL (0x65720000),  // name = Identifier
-          CORBA::tk_string, 
-          0U, // string length
+        CORBA::tk_string,
+        0U, // string length
 
         3,
         ACE_NTOHL (0x69640000),  // name = id
@@ -13589,255 +13711,255 @@ static const CORBA::Long _oc_IR_ComponentDescription[] =
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5265), 
-          ACE_NTOHL (0x706f7369), 
-          ACE_NTOHL (0x746f7279), 
-          ACE_NTOHL (0x49643a31), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5265),
+          ACE_NTOHL (0x706f7369),
+          ACE_NTOHL (0x746f7279),
+          ACE_NTOHL (0x49643a31),
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
           13,
-          ACE_NTOHL (0x5265706f), 
-          ACE_NTOHL (0x7369746f), 
-          ACE_NTOHL (0x72794964), 
+          ACE_NTOHL (0x5265706f),
+          ACE_NTOHL (0x7369746f),
+          ACE_NTOHL (0x72794964),
           ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
-          0U, // string length
+        CORBA::tk_string,
+        0U, // string length
 
         11,
-        ACE_NTOHL (0x64656669), 
-        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x64656669),
+        ACE_NTOHL (0x6e65645f),
         ACE_NTOHL (0x696e0000),  // name = defined_in
         CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5265), 
-          ACE_NTOHL (0x706f7369), 
-          ACE_NTOHL (0x746f7279), 
-          ACE_NTOHL (0x49643a31), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5265),
+          ACE_NTOHL (0x706f7369),
+          ACE_NTOHL (0x746f7279),
+          ACE_NTOHL (0x49643a31),
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
           13,
-          ACE_NTOHL (0x5265706f), 
-          ACE_NTOHL (0x7369746f), 
-          ACE_NTOHL (0x72794964), 
+          ACE_NTOHL (0x5265706f),
+          ACE_NTOHL (0x7369746f),
+          ACE_NTOHL (0x72794964),
           ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
-          0U, // string length
+        CORBA::tk_string,
+        0U, // string length
 
         8,
-        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x76657273),
         ACE_NTOHL (0x696f6e00),  // name = version
         CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           34,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5665), 
-          ACE_NTOHL (0x7273696f), 
-          ACE_NTOHL (0x6e537065), 
-          ACE_NTOHL (0x633a312e), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5665),
+          ACE_NTOHL (0x7273696f),
+          ACE_NTOHL (0x6e537065),
+          ACE_NTOHL (0x633a312e),
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
           12,
-          ACE_NTOHL (0x56657273), 
-          ACE_NTOHL (0x696f6e53), 
+          ACE_NTOHL (0x56657273),
+          ACE_NTOHL (0x696f6e53),
           ACE_NTOHL (0x70656300),  // name = VersionSpec
-          CORBA::tk_string, 
-          0U, // string length
+        CORBA::tk_string,
+        0U, // string length
 
         5,
-        ACE_NTOHL (0x74797065), 
+        ACE_NTOHL (0x74797065),
         ACE_NTOHL (0x0),  // name = type
         CORBA::tk_TypeCode,
 
         5,
-        ACE_NTOHL (0x6d6f6465), 
+        ACE_NTOHL (0x6d6f6465),
         ACE_NTOHL (0x0),  // name = mode
         CORBA::tk_enum, // typecode kind
         104, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           36,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4174), 
-          ACE_NTOHL (0x74726962), 
-          ACE_NTOHL (0x7574654d), 
-          ACE_NTOHL (0x6f64653a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4174),
+          ACE_NTOHL (0x74726962),
+          ACE_NTOHL (0x7574654d),
+          ACE_NTOHL (0x6f64653a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
           14,
-          ACE_NTOHL (0x41747472), 
-          ACE_NTOHL (0x69627574), 
-          ACE_NTOHL (0x654d6f64), 
+          ACE_NTOHL (0x41747472),
+          ACE_NTOHL (0x69627574),
+          ACE_NTOHL (0x654d6f64),
           ACE_NTOHL (0x65000000),  // name = AttributeMode
           2, // member count
           12,
-          ACE_NTOHL (0x41545452), 
-          ACE_NTOHL (0x5f4e4f52), 
+          ACE_NTOHL (0x41545452),
+          ACE_NTOHL (0x5f4e4f52),
           ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
           14,
-          ACE_NTOHL (0x41545452), 
-          ACE_NTOHL (0x5f524541), 
-          ACE_NTOHL (0x444f4e4c), 
+          ACE_NTOHL (0x41545452),
+          ACE_NTOHL (0x5f524541),
+          ACE_NTOHL (0x444f4e4c),
           ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
 
         15,
-        ACE_NTOHL (0x6765745f), 
-        ACE_NTOHL (0x65786365), 
-        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6765745f),
+        ACE_NTOHL (0x65786365),
+        ACE_NTOHL (0x7074696f),
         ACE_NTOHL (0x6e730000),  // name = get_exceptions
-        CORBA::tk_alias, // typecode kind for typedefs
+  CORBA::tk_alias, // typecode kind for typedefs
         556, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4578), 
-          ACE_NTOHL (0x63446573), 
-          ACE_NTOHL (0x63726970), 
-          ACE_NTOHL (0x74696f6e), 
-          ACE_NTOHL (0x5365713a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4578),
+          ACE_NTOHL (0x63446573),
+          ACE_NTOHL (0x63726970),
+          ACE_NTOHL (0x74696f6e),
+          ACE_NTOHL (0x5365713a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
           18,
-          ACE_NTOHL (0x45786344), 
-          ACE_NTOHL (0x65736372), 
-          ACE_NTOHL (0x69707469), 
-          ACE_NTOHL (0x6f6e5365), 
+          ACE_NTOHL (0x45786344),
+          ACE_NTOHL (0x65736372),
+          ACE_NTOHL (0x69707469),
+          ACE_NTOHL (0x6f6e5365),
           ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
-          CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
           476, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
+      TAO_ENCAP_BYTE_ORDER, // byte order
             CORBA::tk_struct, // typecode kind
             460, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
+        TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f4578), 
-              ACE_NTOHL (0x63657074), 
-              ACE_NTOHL (0x696f6e44), 
-              ACE_NTOHL (0x65736372), 
-              ACE_NTOHL (0x69707469), 
-              ACE_NTOHL (0x6f6e3a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+              ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f4578),
+              ACE_NTOHL (0x63657074),
+              ACE_NTOHL (0x696f6e44),
+              ACE_NTOHL (0x65736372),
+              ACE_NTOHL (0x69707469),
+              ACE_NTOHL (0x6f6e3a31),
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
               21,
-              ACE_NTOHL (0x45786365), 
-              ACE_NTOHL (0x7074696f), 
-              ACE_NTOHL (0x6e446573), 
-              ACE_NTOHL (0x63726970), 
-              ACE_NTOHL (0x74696f6e), 
+              ACE_NTOHL (0x45786365),
+              ACE_NTOHL (0x7074696f),
+              ACE_NTOHL (0x6e446573),
+              ACE_NTOHL (0x63726970),
+              ACE_NTOHL (0x74696f6e),
               ACE_NTOHL (0x0),  // name = ExceptionDescription
               5, // member count
               5,
-              ACE_NTOHL (0x6e616d65), 
+              ACE_NTOHL (0x6e616d65),
               ACE_NTOHL (0x0),  // name = name
-              CORBA::tk_alias, // typecode kind for typedefs
+  CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f4964), 
-                ACE_NTOHL (0x656e7469), 
-                ACE_NTOHL (0x66696572), 
-                ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f4964),
+                ACE_NTOHL (0x656e7469),
+                ACE_NTOHL (0x66696572),
+                ACE_NTOHL (0x3a312e30),
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-                ACE_NTOHL (0x4964656e), 
-                ACE_NTOHL (0x74696669), 
+                ACE_NTOHL (0x4964656e),
+                ACE_NTOHL (0x74696669),
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
+                CORBA::tk_string,
                 0U, // string length
 
               3,
               ACE_NTOHL (0x69640000),  // name = id
               CORBA::tk_alias, // typecode kind for typedefs
               72, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
+        TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f5265), 
-                ACE_NTOHL (0x706f7369), 
-                ACE_NTOHL (0x746f7279), 
-                ACE_NTOHL (0x49643a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f5265),
+                ACE_NTOHL (0x706f7369),
+                ACE_NTOHL (0x746f7279),
+                ACE_NTOHL (0x49643a31),
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-                13,
-                ACE_NTOHL (0x5265706f), 
-                ACE_NTOHL (0x7369746f), 
-                ACE_NTOHL (0x72794964), 
+        13,
+                ACE_NTOHL (0x5265706f),
+                ACE_NTOHL (0x7369746f),
+                ACE_NTOHL (0x72794964),
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string, 
+                CORBA::tk_string,
                 0U, // string length
 
               11,
-              ACE_NTOHL (0x64656669), 
-              ACE_NTOHL (0x6e65645f), 
+              ACE_NTOHL (0x64656669),
+              ACE_NTOHL (0x6e65645f),
               ACE_NTOHL (0x696e0000),  // name = defined_in
-              CORBA::tk_alias, // typecode kind for typedefs
+  CORBA::tk_alias, // typecode kind for typedefs
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f5265), 
-                ACE_NTOHL (0x706f7369), 
-                ACE_NTOHL (0x746f7279), 
-                ACE_NTOHL (0x49643a31), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f5265),
+                ACE_NTOHL (0x706f7369),
+                ACE_NTOHL (0x746f7279),
+                ACE_NTOHL (0x49643a31),
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-                ACE_NTOHL (0x5265706f), 
-                ACE_NTOHL (0x7369746f), 
-                ACE_NTOHL (0x72794964), 
+                ACE_NTOHL (0x5265706f),
+                ACE_NTOHL (0x7369746f),
+                ACE_NTOHL (0x72794964),
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string, 
+                CORBA::tk_string,
                 0U, // string length
 
               8,
-              ACE_NTOHL (0x76657273), 
+              ACE_NTOHL (0x76657273),
               ACE_NTOHL (0x696f6e00),  // name = version
               CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 34,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f5665), 
-                ACE_NTOHL (0x7273696f), 
-                ACE_NTOHL (0x6e537065), 
-                ACE_NTOHL (0x633a312e), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f5665),
+                ACE_NTOHL (0x7273696f),
+                ACE_NTOHL (0x6e537065),
+                ACE_NTOHL (0x633a312e),
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                 12,
-                ACE_NTOHL (0x56657273), 
-                ACE_NTOHL (0x696f6e53), 
+                ACE_NTOHL (0x56657273),
+                ACE_NTOHL (0x696f6e53),
                 ACE_NTOHL (0x70656300),  // name = VersionSpec
-                CORBA::tk_string, 
+                CORBA::tk_string,
                 0U, // string length
 
               5,
-              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x74797065),
               ACE_NTOHL (0x0),  // name = type
               CORBA::tk_TypeCode,
 
@@ -13846,29 +13968,29 @@ static const CORBA::Long _oc_IR_ComponentDescription[] =
 
 
         15,
-        ACE_NTOHL (0x7075745f), 
-        ACE_NTOHL (0x65786365), 
-        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x7075745f),
+        ACE_NTOHL (0x65786365),
+        ACE_NTOHL (0x7074696f),
         ACE_NTOHL (0x6e730000),  // name = put_exceptions
         CORBA::tk_alias, // typecode kind for typedefs
         556, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4578), 
-          ACE_NTOHL (0x63446573), 
-          ACE_NTOHL (0x63726970), 
-          ACE_NTOHL (0x74696f6e), 
-          ACE_NTOHL (0x5365713a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4578),
+          ACE_NTOHL (0x63446573),
+          ACE_NTOHL (0x63726970),
+          ACE_NTOHL (0x74696f6e),
+          ACE_NTOHL (0x5365713a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
           18,
-          ACE_NTOHL (0x45786344), 
-          ACE_NTOHL (0x65736372), 
-          ACE_NTOHL (0x69707469), 
-          ACE_NTOHL (0x6f6e5365), 
+          ACE_NTOHL (0x45786344),
+          ACE_NTOHL (0x65736372),
+          ACE_NTOHL (0x69707469),
+          ACE_NTOHL (0x6f6e5365),
           ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
           CORBA::tk_sequence, // typecode kind
           476, // encapsulation length
@@ -13877,46 +13999,46 @@ static const CORBA::Long _oc_IR_ComponentDescription[] =
             460, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f4578), 
-              ACE_NTOHL (0x63657074), 
-              ACE_NTOHL (0x696f6e44), 
-              ACE_NTOHL (0x65736372), 
-              ACE_NTOHL (0x69707469), 
-              ACE_NTOHL (0x6f6e3a31), 
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x6f6d672e),
+              ACE_NTOHL (0x6f72672f),
+              ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f4578),
+              ACE_NTOHL (0x63657074),
+              ACE_NTOHL (0x696f6e44),
+              ACE_NTOHL (0x65736372),
+              ACE_NTOHL (0x69707469),
+              ACE_NTOHL (0x6f6e3a31),
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
               21,
-              ACE_NTOHL (0x45786365), 
-              ACE_NTOHL (0x7074696f), 
-              ACE_NTOHL (0x6e446573), 
-              ACE_NTOHL (0x63726970), 
-              ACE_NTOHL (0x74696f6e), 
+              ACE_NTOHL (0x45786365),
+              ACE_NTOHL (0x7074696f),
+              ACE_NTOHL (0x6e446573),
+              ACE_NTOHL (0x63726970),
+              ACE_NTOHL (0x74696f6e),
               ACE_NTOHL (0x0),  // name = ExceptionDescription
               5, // member count
               5,
-              ACE_NTOHL (0x6e616d65), 
+              ACE_NTOHL (0x6e616d65),
               ACE_NTOHL (0x0),  // name = name
               CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f4964), 
-                ACE_NTOHL (0x656e7469), 
-                ACE_NTOHL (0x66696572), 
-                ACE_NTOHL (0x3a312e30), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f4964),
+                ACE_NTOHL (0x656e7469),
+                ACE_NTOHL (0x66696572),
+                ACE_NTOHL (0x3a312e30),
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-                ACE_NTOHL (0x4964656e), 
-                ACE_NTOHL (0x74696669), 
+                ACE_NTOHL (0x4964656e),
+                ACE_NTOHL (0x74696669),
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
+                CORBA::tk_string,
                 0U, // string length
 
               3,
@@ -13925,73 +14047,73 @@ static const CORBA::Long _oc_IR_ComponentDescription[] =
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f5265), 
-                ACE_NTOHL (0x706f7369), 
-                ACE_NTOHL (0x746f7279), 
-                ACE_NTOHL (0x49643a31), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f5265),
+                ACE_NTOHL (0x706f7369),
+                ACE_NTOHL (0x746f7279),
+                ACE_NTOHL (0x49643a31),
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-                ACE_NTOHL (0x5265706f), 
-                ACE_NTOHL (0x7369746f), 
-                ACE_NTOHL (0x72794964), 
+                ACE_NTOHL (0x5265706f),
+                ACE_NTOHL (0x7369746f),
+                ACE_NTOHL (0x72794964),
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string, 
+                CORBA::tk_string,
                 0U, // string length
 
               11,
-              ACE_NTOHL (0x64656669), 
-              ACE_NTOHL (0x6e65645f), 
+              ACE_NTOHL (0x64656669),
+              ACE_NTOHL (0x6e65645f),
               ACE_NTOHL (0x696e0000),  // name = defined_in
               CORBA::tk_alias, // typecode kind for typedefs
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f5265), 
-                ACE_NTOHL (0x706f7369), 
-                ACE_NTOHL (0x746f7279), 
-                ACE_NTOHL (0x49643a31), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f5265),
+                ACE_NTOHL (0x706f7369),
+                ACE_NTOHL (0x746f7279),
+                ACE_NTOHL (0x49643a31),
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-                ACE_NTOHL (0x5265706f), 
-                ACE_NTOHL (0x7369746f), 
-                ACE_NTOHL (0x72794964), 
+                ACE_NTOHL (0x5265706f),
+                ACE_NTOHL (0x7369746f),
+                ACE_NTOHL (0x72794964),
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string, 
+                CORBA::tk_string,
                 0U, // string length
 
               8,
-              ACE_NTOHL (0x76657273), 
+              ACE_NTOHL (0x76657273),
               ACE_NTOHL (0x696f6e00),  // name = version
               CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 34,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f5665), 
-                ACE_NTOHL (0x7273696f), 
-                ACE_NTOHL (0x6e537065), 
-                ACE_NTOHL (0x633a312e), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f5665),
+                ACE_NTOHL (0x7273696f),
+                ACE_NTOHL (0x6e537065),
+                ACE_NTOHL (0x633a312e),
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                 12,
-                ACE_NTOHL (0x56657273), 
-                ACE_NTOHL (0x696f6e53), 
+                ACE_NTOHL (0x56657273),
+                ACE_NTOHL (0x696f6e53),
                 ACE_NTOHL (0x70656300),  // name = VersionSpec
-                CORBA::tk_string, 
+                CORBA::tk_string,
                 0U, // string length
 
               5,
-              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x74797065),
               ACE_NTOHL (0x0),  // name = type
               CORBA::tk_TypeCode,
 
@@ -14004,25 +14126,25 @@ static const CORBA::Long _oc_IR_ComponentDescription[] =
 
 
   13,
-  ACE_NTOHL (0x656d6974), 
-  ACE_NTOHL (0x735f6576), 
-  ACE_NTOHL (0x656e7473), 
+  ACE_NTOHL (0x656d6974),
+  ACE_NTOHL (0x735f6576),
+  ACE_NTOHL (0x656e7473),
   ACE_NTOHL (0x0),  // name = emits_events
   CORBA::tk_alias, // typecode kind for typedefs
   132, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f45), 
-    ACE_NTOHL (0x6d697473), 
-    ACE_NTOHL (0x44656653), 
-    ACE_NTOHL (0x65713a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f45),
+    ACE_NTOHL (0x6d697473),
+    ACE_NTOHL (0x44656653),
+    ACE_NTOHL (0x65713a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/EmitsDefSeq:1.0
     12,
-    ACE_NTOHL (0x456d6974), 
-    ACE_NTOHL (0x73446566), 
+    ACE_NTOHL (0x456d6974),
+    ACE_NTOHL (0x73446566),
     ACE_NTOHL (0x53657100),  // name = EmitsDefSeq
     CORBA::tk_sequence, // typecode kind
     68, // encapsulation length
@@ -14031,44 +14153,44 @@ static const CORBA::Long _oc_IR_ComponentDescription[] =
       52, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         28,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x49522f45), 
-        ACE_NTOHL (0x6d697473), 
-        ACE_NTOHL (0x4465663a), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x49522f45),
+        ACE_NTOHL (0x6d697473),
+        ACE_NTOHL (0x4465663a),
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/EmitsDef:1.0
         9,
-        ACE_NTOHL (0x456d6974), 
-        ACE_NTOHL (0x73446566), 
+        ACE_NTOHL (0x456d6974),
+        ACE_NTOHL (0x73446566),
         ACE_NTOHL (0x0),  // name = EmitsDef
 
       0U,
 
 
   17,
-  ACE_NTOHL (0x7075626c), 
-  ACE_NTOHL (0x69736865), 
-  ACE_NTOHL (0x735f6576), 
-  ACE_NTOHL (0x656e7473), 
+  ACE_NTOHL (0x7075626c),
+  ACE_NTOHL (0x69736865),
+  ACE_NTOHL (0x735f6576),
+  ACE_NTOHL (0x656e7473),
   ACE_NTOHL (0x0),  // name = publishes_events
   CORBA::tk_alias, // typecode kind for typedefs
   148, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f50), 
-    ACE_NTOHL (0x75626c69), 
-    ACE_NTOHL (0x73686573), 
-    ACE_NTOHL (0x44656653), 
-    ACE_NTOHL (0x65713a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f50),
+    ACE_NTOHL (0x75626c69),
+    ACE_NTOHL (0x73686573),
+    ACE_NTOHL (0x44656653),
+    ACE_NTOHL (0x65713a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/PublishesDefSeq:1.0
     16,
-    ACE_NTOHL (0x5075626c), 
-    ACE_NTOHL (0x69736865), 
-    ACE_NTOHL (0x73446566), 
+    ACE_NTOHL (0x5075626c),
+    ACE_NTOHL (0x69736865),
+    ACE_NTOHL (0x73446566),
     ACE_NTOHL (0x53657100),  // name = PublishesDefSeq
     CORBA::tk_sequence, // typecode kind
     76, // encapsulation length
@@ -14077,45 +14199,45 @@ static const CORBA::Long _oc_IR_ComponentDescription[] =
       60, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         32,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x49522f50), 
-        ACE_NTOHL (0x75626c69), 
-        ACE_NTOHL (0x73686573), 
-        ACE_NTOHL (0x4465663a), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x49522f50),
+        ACE_NTOHL (0x75626c69),
+        ACE_NTOHL (0x73686573),
+        ACE_NTOHL (0x4465663a),
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/PublishesDef:1.0
         13,
-        ACE_NTOHL (0x5075626c), 
-        ACE_NTOHL (0x69736865), 
-        ACE_NTOHL (0x73446566), 
+        ACE_NTOHL (0x5075626c),
+        ACE_NTOHL (0x69736865),
+        ACE_NTOHL (0x73446566),
         ACE_NTOHL (0x0),  // name = PublishesDef
 
       0U,
 
 
   16,
-  ACE_NTOHL (0x636f6e73), 
-  ACE_NTOHL (0x756d6573), 
-  ACE_NTOHL (0x5f657665), 
+  ACE_NTOHL (0x636f6e73),
+  ACE_NTOHL (0x756d6573),
+  ACE_NTOHL (0x5f657665),
   ACE_NTOHL (0x6e747300),  // name = consumes_events
   CORBA::tk_alias, // typecode kind for typedefs
   144, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f43), 
-    ACE_NTOHL (0x6f6e7375), 
-    ACE_NTOHL (0x6d657344), 
-    ACE_NTOHL (0x65665365), 
-    ACE_NTOHL (0x713a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f43),
+    ACE_NTOHL (0x6f6e7375),
+    ACE_NTOHL (0x6d657344),
+    ACE_NTOHL (0x65665365),
+    ACE_NTOHL (0x713a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/ConsumesDefSeq:1.0
     15,
-    ACE_NTOHL (0x436f6e73), 
-    ACE_NTOHL (0x756d6573), 
-    ACE_NTOHL (0x44656653), 
+    ACE_NTOHL (0x436f6e73),
+    ACE_NTOHL (0x756d6573),
+    ACE_NTOHL (0x44656653),
     ACE_NTOHL (0x65710000),  // name = ConsumesDefSeq
     CORBA::tk_sequence, // typecode kind
     72, // encapsulation length
@@ -14124,25 +14246,25 @@ static const CORBA::Long _oc_IR_ComponentDescription[] =
       56, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         31,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x49522f43), 
-        ACE_NTOHL (0x6f6e7375), 
-        ACE_NTOHL (0x6d657344), 
-        ACE_NTOHL (0x65663a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x49522f43),
+        ACE_NTOHL (0x6f6e7375),
+        ACE_NTOHL (0x6d657344),
+        ACE_NTOHL (0x65663a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/ConsumesDef:1.0
         12,
-        ACE_NTOHL (0x436f6e73), 
-        ACE_NTOHL (0x756d6573), 
+        ACE_NTOHL (0x436f6e73),
+        ACE_NTOHL (0x756d6573),
         ACE_NTOHL (0x44656600),  // name = ConsumesDef
 
       0U,
 
 
   9,
-  ACE_NTOHL (0x69735f62), 
-  ACE_NTOHL (0x61736963), 
+  ACE_NTOHL (0x69735f62),
+  ACE_NTOHL (0x61736963),
   ACE_NTOHL (0x0),  // name = is_basic
   CORBA::tk_boolean,
 
@@ -14161,9 +14283,9 @@ TAO_NAMESPACE_BEGIN (IR)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ComponentDescription, &_tc_TAO_tc_IR_ComponentDescription)
 TAO_NAMESPACE_END
 
-void IR::ComponentDescription::_tao_any_destructor (void *x)
+void IR::ComponentDescription::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ComponentDescription *tmp = ACE_static_cast (ComponentDescription*,x);
+  ComponentDescription *tmp = ACE_static_cast (ComponentDescription*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -14258,7 +14380,7 @@ IR::PrimaryKeyDef_var::operator const ::IR::PrimaryKeyDef_ptr &() const // cast
   return this->ptr_;
 }
 
-IR::PrimaryKeyDef_var::operator ::IR::PrimaryKeyDef_ptr &() // cast 
+IR::PrimaryKeyDef_var::operator ::IR::PrimaryKeyDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -14334,7 +14456,7 @@ IR::PrimaryKeyDef_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class IR::PrimaryKeyDef_out
+// Operations for class IR::PrimaryKeyDef_out
 // *************************************************************
 
 IR::PrimaryKeyDef_out::PrimaryKeyDef_out (PrimaryKeyDef_ptr &p)
@@ -14401,24 +14523,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * primary_key_id,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -14437,7 +14559,7 @@ TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::TAO_ClientRequestInfo_IR_PrimaryKey
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const char * primary_key_id,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     primary_key_id_ (primary_key_id)
@@ -14451,14 +14573,16 @@ TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::arguments (CORBA::Environment &ACE_
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_primary_key_id = parameter_list->length ();
-  parameter_list->length (length_primary_key_id + 1);
-  (*parameter_list)[length_primary_key_id].argument <<= primary_key_id_;
-  (*parameter_list)[length_primary_key_id].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= primary_key_id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -14470,12 +14594,12 @@ TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::exceptions (CORBA::Environment &ACE
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -14484,17 +14608,17 @@ TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::result (CORBA::Environment &ACE_TRY
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= CORBA::Any::from_boolean (this->_result);
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::result (CORBA::Boolean result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -14504,24 +14628,24 @@ public:
   TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -14538,7 +14662,7 @@ private:
 TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -14551,7 +14675,7 @@ TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::arguments (CORBA::Enviro
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -14563,12 +14687,12 @@ TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::exceptions (CORBA::Envir
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -14577,24 +14701,24 @@ TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (CORBA::Environme
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (CORBA_ValueDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 IR::_TAO_PrimaryKeyDef_Proxy_Impl::_TAO_PrimaryKeyDef_Proxy_Impl (void)
@@ -14614,15 +14738,15 @@ CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA::Boolean _tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "is_a",
@@ -14631,17 +14755,21 @@ CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a ri (
         &_tao_call,
@@ -14650,31 +14778,40 @@ CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN  (_tao_retval);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << primary_key_id)
@@ -14683,20 +14820,33 @@ CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a (
               CORBA::MARSHAL (),
               _tao_retval
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
@@ -14706,73 +14856,54 @@ CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA::Boolean  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA::Boolean _tao_retval_info = _tao_retval;
+          ri.result (_tao_retval_info);
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN  (_tao_retval);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_retval;
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN  (_tao_retval);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_retval;
 }
 
 CORBA_ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key (
@@ -14783,16 +14914,16 @@ CORBA_ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_ValueDef_ptr _tao_retval = CORBA_ValueDef::_nil ();
   CORBA_ValueDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_primary_key",
@@ -14801,17 +14932,21 @@ CORBA_ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get ri (
         &_tao_call,
@@ -14819,43 +14954,66 @@ CORBA_ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -14865,79 +15023,60 @@ CORBA_ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -15007,13 +15146,13 @@ IR::PrimaryKeyDef::IR_PrimaryKeyDef_setup_collocation (int collocated)
   else
     this->the_TAO_PrimaryKeyDef_Proxy_Broker_ =
       ::IR::_TAO_PrimaryKeyDef_Remote_Proxy_Broker::the_TAO_PrimaryKeyDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_Contained_setup_collocation (collocated);
 }
 
-void IR::PrimaryKeyDef::_tao_any_destructor (void *x)
+void IR::PrimaryKeyDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  PrimaryKeyDef *tmp = ACE_static_cast (PrimaryKeyDef*,x);
+  PrimaryKeyDef *tmp = ACE_static_cast (PrimaryKeyDef*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -15060,14 +15199,14 @@ IR::PrimaryKeyDef_ptr IR::PrimaryKeyDef::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           PrimaryKeyDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::IR::PrimaryKeyDef (stub, 0, obj->_servant ()), PrimaryKeyDef::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -15137,7 +15276,7 @@ void *IR::PrimaryKeyDef::_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;
@@ -15156,10 +15295,10 @@ CORBA::Boolean IR::PrimaryKeyDef::is_a (
     CORBA::SystemException
   ))
 {
-  _TAO_PrimaryKeyDef_Proxy_Impl &proxy = 
+  _TAO_PrimaryKeyDef_Proxy_Impl &proxy =
     this->the_TAO_PrimaryKeyDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.is_a (
       this,
       primary_key_id,
@@ -15174,10 +15313,10 @@ CORBA_ValueDef_ptr IR::PrimaryKeyDef::primary_key (
     CORBA::SystemException
   ))
 {
-  _TAO_PrimaryKeyDef_Proxy_Impl &proxy = 
+  _TAO_PrimaryKeyDef_Proxy_Impl &proxy =
     this->the_TAO_PrimaryKeyDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.primary_key (
       this,
       ACE_TRY_ENV
@@ -15188,19 +15327,19 @@ static const CORBA::Long _oc_IR_PrimaryKeyDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f50), 
-  ACE_NTOHL (0x72696d61), 
-  ACE_NTOHL (0x72794b65), 
-  ACE_NTOHL (0x79446566), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49522f50),
+  ACE_NTOHL (0x72696d61),
+  ACE_NTOHL (0x72794b65),
+  ACE_NTOHL (0x79446566),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/PrimaryKeyDef:1.0
   14,
-  ACE_NTOHL (0x5072696d), 
-  ACE_NTOHL (0x6172794b), 
-  ACE_NTOHL (0x65794465), 
+  ACE_NTOHL (0x5072696d),
+  ACE_NTOHL (0x6172794b),
+  ACE_NTOHL (0x65794465),
   ACE_NTOHL (0x66000000),  // name = PrimaryKeyDef
 };
 
@@ -15221,45 +15360,45 @@ static const CORBA::Long _oc_IR_PrimaryKeyDescription[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   41,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f50), 
-  ACE_NTOHL (0x72696d61), 
-  ACE_NTOHL (0x72794b65), 
-  ACE_NTOHL (0x79446573), 
-  ACE_NTOHL (0x63726970), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49522f50),
+  ACE_NTOHL (0x72696d61),
+  ACE_NTOHL (0x72794b65),
+  ACE_NTOHL (0x79446573),
+  ACE_NTOHL (0x63726970),
+  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/PrimaryKeyDescription:1.0
   22,
-  ACE_NTOHL (0x5072696d), 
-  ACE_NTOHL (0x6172794b), 
-  ACE_NTOHL (0x65794465), 
-  ACE_NTOHL (0x73637269), 
-  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x5072696d),
+  ACE_NTOHL (0x6172794b),
+  ACE_NTOHL (0x65794465),
+  ACE_NTOHL (0x73637269),
+  ACE_NTOHL (0x7074696f),
   ACE_NTOHL (0x6e000000),  // name = PrimaryKeyDescription
   5, // member count
   5,
-  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x6e616d65),
   ACE_NTOHL (0x0),  // name = name
   CORBA::tk_alias, // typecode kind for typedefs
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     30,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f49), 
-    ACE_NTOHL (0x64656e74), 
-    ACE_NTOHL (0x69666965), 
-    ACE_NTOHL (0x723a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f49),
+    ACE_NTOHL (0x64656e74),
+    ACE_NTOHL (0x69666965),
+    ACE_NTOHL (0x723a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/Identifier:1.0
     11,
-    ACE_NTOHL (0x4964656e), 
-    ACE_NTOHL (0x74696669), 
+    ACE_NTOHL (0x4964656e),
+    ACE_NTOHL (0x74696669),
     ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
   3,
@@ -15268,87 +15407,87 @@ static const CORBA::Long _oc_IR_PrimaryKeyDescription[] =
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     32,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f52), 
-    ACE_NTOHL (0x65706f73), 
-    ACE_NTOHL (0x69746f72), 
-    ACE_NTOHL (0x7949643a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f52),
+    ACE_NTOHL (0x65706f73),
+    ACE_NTOHL (0x69746f72),
+    ACE_NTOHL (0x7949643a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
     13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669), 
-  ACE_NTOHL (0x6e65645f), 
+  ACE_NTOHL (0x64656669),
+  ACE_NTOHL (0x6e65645f),
   ACE_NTOHL (0x696e0000),  // name = defined_in
   CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     32,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f52), 
-    ACE_NTOHL (0x65706f73), 
-    ACE_NTOHL (0x69746f72), 
-    ACE_NTOHL (0x7949643a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f52),
+    ACE_NTOHL (0x65706f73),
+    ACE_NTOHL (0x69746f72),
+    ACE_NTOHL (0x7949643a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
     13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
   8,
-  ACE_NTOHL (0x76657273), 
+  ACE_NTOHL (0x76657273),
   ACE_NTOHL (0x696f6e00),  // name = version
   CORBA::tk_alias, // typecode kind for typedefs
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f56), 
-    ACE_NTOHL (0x65727369), 
-    ACE_NTOHL (0x6f6e5370), 
-    ACE_NTOHL (0x65633a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f56),
+    ACE_NTOHL (0x65727369),
+    ACE_NTOHL (0x6f6e5370),
+    ACE_NTOHL (0x65633a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/VersionSpec:1.0
     12,
-    ACE_NTOHL (0x56657273), 
-    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x56657273),
+    ACE_NTOHL (0x696f6e53),
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
   12,
-  ACE_NTOHL (0x7072696d), 
-  ACE_NTOHL (0x6172795f), 
+  ACE_NTOHL (0x7072696d),
+  ACE_NTOHL (0x6172795f),
   ACE_NTOHL (0x6b657900),  // name = primary_key
   CORBA::tk_objref, // typecode kind
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5661), 
-    ACE_NTOHL (0x6c756544), 
-    ACE_NTOHL (0x65663a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5661),
+    ACE_NTOHL (0x6c756544),
+    ACE_NTOHL (0x65663a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ValueDef:1.0
     9,
-    ACE_NTOHL (0x56616c75), 
-    ACE_NTOHL (0x65446566), 
+    ACE_NTOHL (0x56616c75),
+    ACE_NTOHL (0x65446566),
     ACE_NTOHL (0x0),  // name = ValueDef
 
 };
@@ -15366,9 +15505,9 @@ TAO_NAMESPACE_BEGIN (IR)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PrimaryKeyDescription, &_tc_TAO_tc_IR_PrimaryKeyDescription)
 TAO_NAMESPACE_END
 
-void IR::PrimaryKeyDescription::_tao_any_destructor (void *x)
+void IR::PrimaryKeyDescription::_tao_any_destructor (void *_tao_void_pointer)
 {
-  PrimaryKeyDescription *tmp = ACE_static_cast (PrimaryKeyDescription*,x);
+  PrimaryKeyDescription *tmp = ACE_static_cast (PrimaryKeyDescription*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -15463,7 +15602,7 @@ IR::FactoryDef_var::operator const ::IR::FactoryDef_ptr &() const // cast
   return this->ptr_;
 }
 
-IR::FactoryDef_var::operator ::IR::FactoryDef_ptr &() // cast 
+IR::FactoryDef_var::operator ::IR::FactoryDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -15539,7 +15678,7 @@ IR::FactoryDef_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class IR::FactoryDef_out
+// Operations for class IR::FactoryDef_out
 // *************************************************************
 
 IR::FactoryDef_out::FactoryDef_out (FactoryDef_ptr &p)
@@ -15602,7 +15741,7 @@ IR::FactoryDef_out::operator-> (void)
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 IR::_TAO_FactoryDef_Proxy_Impl::_TAO_FactoryDef_Proxy_Impl (void)
@@ -15615,7 +15754,7 @@ IR::_TAO_FactoryDef_Remote_Proxy_Impl::_TAO_FactoryDef_Remote_Proxy_Impl (void)
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -15685,13 +15824,13 @@ IR::FactoryDef::IR_FactoryDef_setup_collocation (int collocated)
   else
     this->the_TAO_FactoryDef_Proxy_Broker_ =
       ::IR::_TAO_FactoryDef_Remote_Proxy_Broker::the_TAO_FactoryDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_OperationDef_setup_collocation (collocated);
 }
 
-void IR::FactoryDef::_tao_any_destructor (void *x)
+void IR::FactoryDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  FactoryDef *tmp = ACE_static_cast (FactoryDef*,x);
+  FactoryDef *tmp = ACE_static_cast (FactoryDef*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -15738,14 +15877,14 @@ IR::FactoryDef_ptr IR::FactoryDef::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           FactoryDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::IR::FactoryDef (stub, 0, obj->_servant ()), FactoryDef::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -15828,7 +15967,7 @@ void *IR::FactoryDef::_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;
@@ -15843,17 +15982,17 @@ static const CORBA::Long _oc_IR_FactoryDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f46), 
-  ACE_NTOHL (0x6163746f), 
-  ACE_NTOHL (0x72794465), 
-  ACE_NTOHL (0x663a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49522f46),
+  ACE_NTOHL (0x6163746f),
+  ACE_NTOHL (0x72794465),
+  ACE_NTOHL (0x663a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/FactoryDef:1.0
   11,
-  ACE_NTOHL (0x46616374), 
-  ACE_NTOHL (0x6f727944), 
+  ACE_NTOHL (0x46616374),
+  ACE_NTOHL (0x6f727944),
   ACE_NTOHL (0x65660000),  // name = FactoryDef
 };
 
@@ -15961,7 +16100,7 @@ IR::FinderDef_var::operator const ::IR::FinderDef_ptr &() const // cast
   return this->ptr_;
 }
 
-IR::FinderDef_var::operator ::IR::FinderDef_ptr &() // cast 
+IR::FinderDef_var::operator ::IR::FinderDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -16037,7 +16176,7 @@ IR::FinderDef_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class IR::FinderDef_out
+// Operations for class IR::FinderDef_out
 // *************************************************************
 
 IR::FinderDef_out::FinderDef_out (FinderDef_ptr &p)
@@ -16100,7 +16239,7 @@ IR::FinderDef_out::operator-> (void)
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 IR::_TAO_FinderDef_Proxy_Impl::_TAO_FinderDef_Proxy_Impl (void)
@@ -16113,7 +16252,7 @@ IR::_TAO_FinderDef_Remote_Proxy_Impl::_TAO_FinderDef_Remote_Proxy_Impl (void)
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -16183,13 +16322,13 @@ IR::FinderDef::IR_FinderDef_setup_collocation (int collocated)
   else
     this->the_TAO_FinderDef_Proxy_Broker_ =
       ::IR::_TAO_FinderDef_Remote_Proxy_Broker::the_TAO_FinderDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_OperationDef_setup_collocation (collocated);
 }
 
-void IR::FinderDef::_tao_any_destructor (void *x)
+void IR::FinderDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  FinderDef *tmp = ACE_static_cast (FinderDef*,x);
+  FinderDef *tmp = ACE_static_cast (FinderDef*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -16236,14 +16375,14 @@ IR::FinderDef_ptr IR::FinderDef::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           FinderDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::IR::FinderDef (stub, 0, obj->_servant ()), FinderDef::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -16326,7 +16465,7 @@ void *IR::FinderDef::_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;
@@ -16341,17 +16480,17 @@ static const CORBA::Long _oc_IR_FinderDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   29,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f46), 
-  ACE_NTOHL (0x696e6465), 
-  ACE_NTOHL (0x72446566), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49522f46),
+  ACE_NTOHL (0x696e6465),
+  ACE_NTOHL (0x72446566),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/FinderDef:1.0
   10,
-  ACE_NTOHL (0x46696e64), 
-  ACE_NTOHL (0x65724465), 
+  ACE_NTOHL (0x46696e64),
+  ACE_NTOHL (0x65724465),
   ACE_NTOHL (0x66000000),  // name = FinderDef
 };
 
@@ -16459,7 +16598,7 @@ IR::HomeDef_var::operator const ::IR::HomeDef_ptr &() const // cast
   return this->ptr_;
 }
 
-IR::HomeDef_var::operator ::IR::HomeDef_ptr &() // cast 
+IR::HomeDef_var::operator ::IR::HomeDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -16535,7 +16674,7 @@ IR::HomeDef_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class IR::HomeDef_out
+// Operations for class IR::HomeDef_out
 // *************************************************************
 
 IR::HomeDef_out::HomeDef_out (HomeDef_ptr &p)
@@ -16601,24 +16740,24 @@ public:
   TAO_ClientRequestInfo_IR_HomeDef_base_home_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -16635,7 +16774,7 @@ private:
 TAO_ClientRequestInfo_IR_HomeDef_base_home_get::TAO_ClientRequestInfo_IR_HomeDef_base_home_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -16648,7 +16787,7 @@ TAO_ClientRequestInfo_IR_HomeDef_base_home_get::arguments (CORBA::Environment &A
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -16660,12 +16799,12 @@ TAO_ClientRequestInfo_IR_HomeDef_base_home_get::exceptions (CORBA::Environment &
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_IR_HomeDef_base_home_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -16674,17 +16813,17 @@ TAO_ClientRequestInfo_IR_HomeDef_base_home_get::result (CORBA::Environment &ACE_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_IR_HomeDef_base_home_get::result (IR::HomeDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -16694,24 +16833,24 @@ public:
   TAO_ClientRequestInfo_IR_HomeDef_managed_component_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -16728,7 +16867,7 @@ private:
 TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -16741,7 +16880,7 @@ TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::arguments (CORBA::Enviro
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -16753,12 +16892,12 @@ TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::exceptions (CORBA::Envir
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -16767,17 +16906,17 @@ TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::result (CORBA::Environme
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::result (IR::ComponentDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -16787,24 +16926,24 @@ public:
   TAO_ClientRequestInfo_IR_HomeDef_primary_key_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -16821,7 +16960,7 @@ private:
 TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -16834,7 +16973,7 @@ TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::arguments (CORBA::Environment
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -16846,12 +16985,12 @@ TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::exceptions (CORBA::Environment
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -16860,17 +16999,17 @@ TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::result (CORBA::Environment &AC
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::result (IR::PrimaryKeyDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -16880,24 +17019,24 @@ public:
   TAO_ClientRequestInfo_IR_HomeDef_factories_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -16914,7 +17053,7 @@ private:
 TAO_ClientRequestInfo_IR_HomeDef_factories_get::TAO_ClientRequestInfo_IR_HomeDef_factories_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -16927,7 +17066,7 @@ TAO_ClientRequestInfo_IR_HomeDef_factories_get::arguments (CORBA::Environment &A
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -16939,12 +17078,12 @@ TAO_ClientRequestInfo_IR_HomeDef_factories_get::exceptions (CORBA::Environment &
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_IR_HomeDef_factories_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -16953,17 +17092,17 @@ TAO_ClientRequestInfo_IR_HomeDef_factories_get::result (CORBA::Environment &ACE_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_IR_HomeDef_factories_get::result (IR::FactoryDefSeq * result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -16973,24 +17112,24 @@ public:
   TAO_ClientRequestInfo_IR_HomeDef_finders_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -17007,7 +17146,7 @@ private:
 TAO_ClientRequestInfo_IR_HomeDef_finders_get::TAO_ClientRequestInfo_IR_HomeDef_finders_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -17020,7 +17159,7 @@ TAO_ClientRequestInfo_IR_HomeDef_finders_get::arguments (CORBA::Environment &ACE
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -17032,12 +17171,12 @@ TAO_ClientRequestInfo_IR_HomeDef_finders_get::exceptions (CORBA::Environment &AC
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_IR_HomeDef_finders_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -17046,17 +17185,17 @@ TAO_ClientRequestInfo_IR_HomeDef_finders_get::result (CORBA::Environment &ACE_TR
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_IR_HomeDef_finders_get::result (IR::FinderDefSeq * result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -17066,24 +17205,24 @@ public:
   TAO_ClientRequestInfo_IR_HomeDef_is_basic_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -17100,7 +17239,7 @@ private:
 TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -17113,7 +17252,7 @@ TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::arguments (CORBA::Environment &AC
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -17125,12 +17264,12 @@ TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::exceptions (CORBA::Environment &A
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -17139,17 +17278,17 @@ TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::result (CORBA::Environment &ACE_T
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= CORBA::Any::from_boolean (this->_result);
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::result (CORBA::Boolean result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -17163,24 +17302,24 @@ public:
       const char * name,
       const char * version,
       CORBA_ValueDef_ptr primary_key,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -17205,7 +17344,7 @@ TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::TAO_ClientRequestInfo_IR_Ho
     const char * name,
     const char * version,
     CORBA_ValueDef_ptr primary_key,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -17222,30 +17361,25 @@ TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::arguments (CORBA::Environme
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_primary_key = parameter_list->length ();
-  parameter_list->length (length_primary_key + 1);
-  (*parameter_list)[length_primary_key].argument <<=  this->primary_key_;
-  
-  (*parameter_list)[length_primary_key].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (4);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= version_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->primary_key_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -17257,12 +17391,12 @@ TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::exceptions (CORBA::Environm
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -17271,17 +17405,17 @@ TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::result (CORBA::Environment
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::result (IR::PrimaryKeyDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -17296,24 +17430,24 @@ public:
       const char * version,
       const CORBA_ParDescriptionSeq & params,
       const CORBA_ExceptionDefSeq & exceptions,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -17340,7 +17474,7 @@ TAO_ClientRequestInfo_IR_HomeDef_create_factory::TAO_ClientRequestInfo_IR_HomeDe
     const char * version,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -17358,36 +17492,28 @@ TAO_ClientRequestInfo_IR_HomeDef_create_factory::arguments (CORBA::Environment &
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_params = parameter_list->length ();
-  parameter_list->length (length_params + 1);
-  (*parameter_list)[length_params].argument <<=  this->params_;
-  
-  (*parameter_list)[length_params].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_exceptions = parameter_list->length ();
-  parameter_list->length (length_exceptions + 1);
-  (*parameter_list)[length_exceptions].argument <<=  this->exceptions_;
-  
-  (*parameter_list)[length_exceptions].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (5);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= version_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->params_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->exceptions_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -17399,12 +17525,12 @@ TAO_ClientRequestInfo_IR_HomeDef_create_factory::exceptions (CORBA::Environment
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_IR_HomeDef_create_factory::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -17413,17 +17539,17 @@ TAO_ClientRequestInfo_IR_HomeDef_create_factory::result (CORBA::Environment &ACE
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_IR_HomeDef_create_factory::result (IR::FactoryDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -17438,24 +17564,24 @@ public:
       const char * version,
       const CORBA_ParDescriptionSeq & params,
       const CORBA_ExceptionDefSeq & exceptions,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -17482,7 +17608,7 @@ TAO_ClientRequestInfo_IR_HomeDef_create_finder::TAO_ClientRequestInfo_IR_HomeDef
     const char * version,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -17500,36 +17626,28 @@ TAO_ClientRequestInfo_IR_HomeDef_create_finder::arguments (CORBA::Environment &A
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_params = parameter_list->length ();
-  parameter_list->length (length_params + 1);
-  (*parameter_list)[length_params].argument <<=  this->params_;
-  
-  (*parameter_list)[length_params].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_exceptions = parameter_list->length ();
-  parameter_list->length (length_exceptions + 1);
-  (*parameter_list)[length_exceptions].argument <<=  this->exceptions_;
-  
-  (*parameter_list)[length_exceptions].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (5);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= version_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->params_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->exceptions_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -17541,12 +17659,12 @@ TAO_ClientRequestInfo_IR_HomeDef_create_finder::exceptions (CORBA::Environment &
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_IR_HomeDef_create_finder::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -17555,24 +17673,24 @@ TAO_ClientRequestInfo_IR_HomeDef_create_finder::result (CORBA::Environment &ACE_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_IR_HomeDef_create_finder::result (IR::FinderDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 IR::_TAO_HomeDef_Proxy_Impl::_TAO_HomeDef_Proxy_Impl (void)
@@ -17591,16 +17709,16 @@ IR::HomeDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
     CORBA::SystemException
   ))
 {
-  
+
   IR::HomeDef_ptr _tao_retval = IR::HomeDef::_nil ();
   IR::HomeDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_base_home",
@@ -17609,17 +17727,21 @@ IR::HomeDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_HomeDef_base_home_get ri (
         &_tao_call,
@@ -17627,43 +17749,66 @@ IR::HomeDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -17673,74 +17818,55 @@ IR::HomeDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              IR::HomeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          IR::HomeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 IR::ComponentDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
@@ -17751,16 +17877,16 @@ IR::ComponentDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
     CORBA::SystemException
   ))
 {
-  
+
   IR::ComponentDef_ptr _tao_retval = IR::ComponentDef::_nil ();
   IR::ComponentDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_managed_component",
@@ -17769,17 +17895,21 @@ IR::ComponentDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_HomeDef_managed_component_get ri (
         &_tao_call,
@@ -17787,43 +17917,66 @@ IR::ComponentDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -17833,74 +17986,55 @@ IR::ComponentDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              IR::ComponentDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          IR::ComponentDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
@@ -17911,16 +18045,16 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
     CORBA::SystemException
   ))
 {
-  
+
   IR::PrimaryKeyDef_ptr _tao_retval = IR::PrimaryKeyDef::_nil ();
   IR::PrimaryKeyDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_primary_key",
@@ -17929,17 +18063,21 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_HomeDef_primary_key_get ri (
         &_tao_call,
@@ -17947,43 +18085,66 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -17993,74 +18154,55 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              IR::PrimaryKeyDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          IR::PrimaryKeyDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 IR::FactoryDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::factories (
@@ -18071,15 +18213,15 @@ IR::FactoryDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::factories (
     CORBA::SystemException
   ))
 {
-  
+
   IR::FactoryDefSeq *_tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   ACE_NEW_RETURN (_tao_retval, IR::FactoryDefSeq, _tao_retval);
   IR::FactoryDefSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -18090,17 +18232,21 @@ IR::FactoryDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::factories (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_HomeDef_factories_get ri (
         &_tao_call,
@@ -18108,43 +18254,66 @@ IR::FactoryDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::factories (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -18154,74 +18323,55 @@ IR::FactoryDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::factories (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              IR::FactoryDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          IR::FactoryDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 IR::FinderDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::finders (
@@ -18232,15 +18382,15 @@ IR::FinderDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::finders (
     CORBA::SystemException
   ))
 {
-  
+
   IR::FinderDefSeq *_tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   ACE_NEW_RETURN (_tao_retval, IR::FinderDefSeq, _tao_retval);
   IR::FinderDefSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -18251,17 +18401,21 @@ IR::FinderDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::finders (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_HomeDef_finders_get ri (
         &_tao_call,
@@ -18269,43 +18423,66 @@ IR::FinderDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::finders (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -18315,74 +18492,55 @@ IR::FinderDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::finders (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              IR::FinderDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          IR::FinderDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic (
@@ -18393,15 +18551,15 @@ CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA::Boolean _tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_is_basic",
@@ -18410,17 +18568,21 @@ CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_HomeDef_is_basic_get ri (
         &_tao_call,
@@ -18428,43 +18590,66 @@ CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN  (_tao_retval);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
@@ -18474,73 +18659,54 @@ CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA::Boolean  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA::Boolean _tao_retval_info = _tao_retval;
+          ri.result (_tao_retval_info);
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN  (_tao_retval);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_retval;
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN  (_tao_retval);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_retval;
 }
 
 IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key (
@@ -18555,16 +18721,16 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key (
     CORBA::SystemException
   ))
 {
-  
+
   IR::PrimaryKeyDef_ptr _tao_retval = IR::PrimaryKeyDef::_nil ();
   IR::PrimaryKeyDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_primary_key",
@@ -18573,17 +18739,21 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_HomeDef_create_primary_key ri (
         &_tao_call,
@@ -18595,31 +18765,40 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << id) &&
@@ -18631,20 +18810,33 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key (
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -18654,74 +18846,55 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              IR::PrimaryKeyDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          IR::PrimaryKeyDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory (
@@ -18737,16 +18910,16 @@ IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory (
     CORBA::SystemException
   ))
 {
-  
+
   IR::FactoryDef_ptr _tao_retval = IR::FactoryDef::_nil ();
   IR::FactoryDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_factory",
@@ -18755,17 +18928,21 @@ IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_HomeDef_create_factory ri (
         &_tao_call,
@@ -18778,31 +18955,40 @@ IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << id) &&
@@ -18815,20 +19001,33 @@ IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory (
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -18838,74 +19037,55 @@ IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              IR::FactoryDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          IR::FactoryDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder (
@@ -18921,16 +19101,16 @@ IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder (
     CORBA::SystemException
   ))
 {
-  
+
   IR::FinderDef_ptr _tao_retval = IR::FinderDef::_nil ();
   IR::FinderDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_finder",
@@ -18939,17 +19119,21 @@ IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_HomeDef_create_finder ri (
         &_tao_call,
@@ -18962,31 +19146,40 @@ IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << id) &&
@@ -18999,20 +19192,33 @@ IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder (
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -19022,79 +19228,60 @@ IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              IR::FinderDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          IR::FinderDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -19164,13 +19351,13 @@ IR::HomeDef::IR_HomeDef_setup_collocation (int collocated)
   else
     this->the_TAO_HomeDef_Proxy_Broker_ =
       ::IR::_TAO_HomeDef_Remote_Proxy_Broker::the_TAO_HomeDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_InterfaceDef_setup_collocation (collocated);
 }
 
-void IR::HomeDef::_tao_any_destructor (void *x)
+void IR::HomeDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  HomeDef *tmp = ACE_static_cast (HomeDef*,x);
+  HomeDef *tmp = ACE_static_cast (HomeDef*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -19217,14 +19404,14 @@ IR::HomeDef_ptr IR::HomeDef::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           HomeDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::IR::HomeDef (stub, 0, obj->_servant ()), HomeDef::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -19333,7 +19520,7 @@ void *IR::HomeDef::_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;
@@ -19351,10 +19538,10 @@ IR::HomeDef_ptr IR::HomeDef::base_home (
     CORBA::SystemException
   ))
 {
-  _TAO_HomeDef_Proxy_Impl &proxy = 
+  _TAO_HomeDef_Proxy_Impl &proxy =
     this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.base_home (
       this,
       ACE_TRY_ENV
@@ -19368,10 +19555,10 @@ IR::ComponentDef_ptr IR::HomeDef::managed_component (
     CORBA::SystemException
   ))
 {
-  _TAO_HomeDef_Proxy_Impl &proxy = 
+  _TAO_HomeDef_Proxy_Impl &proxy =
     this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.managed_component (
       this,
       ACE_TRY_ENV
@@ -19385,10 +19572,10 @@ IR::PrimaryKeyDef_ptr IR::HomeDef::primary_key (
     CORBA::SystemException
   ))
 {
-  _TAO_HomeDef_Proxy_Impl &proxy = 
+  _TAO_HomeDef_Proxy_Impl &proxy =
     this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.primary_key (
       this,
       ACE_TRY_ENV
@@ -19402,10 +19589,10 @@ IR::FactoryDefSeq * IR::HomeDef::factories (
     CORBA::SystemException
   ))
 {
-  _TAO_HomeDef_Proxy_Impl &proxy = 
+  _TAO_HomeDef_Proxy_Impl &proxy =
     this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.factories (
       this,
       ACE_TRY_ENV
@@ -19419,10 +19606,10 @@ IR::FinderDefSeq * IR::HomeDef::finders (
     CORBA::SystemException
   ))
 {
-  _TAO_HomeDef_Proxy_Impl &proxy = 
+  _TAO_HomeDef_Proxy_Impl &proxy =
     this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.finders (
       this,
       ACE_TRY_ENV
@@ -19436,10 +19623,10 @@ CORBA::Boolean IR::HomeDef::is_basic (
     CORBA::SystemException
   ))
 {
-  _TAO_HomeDef_Proxy_Impl &proxy = 
+  _TAO_HomeDef_Proxy_Impl &proxy =
     this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.is_basic (
       this,
       ACE_TRY_ENV
@@ -19457,10 +19644,10 @@ IR::PrimaryKeyDef_ptr IR::HomeDef::create_primary_key (
     CORBA::SystemException
   ))
 {
-  _TAO_HomeDef_Proxy_Impl &proxy = 
+  _TAO_HomeDef_Proxy_Impl &proxy =
     this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_primary_key (
       this,
       id,
@@ -19483,10 +19670,10 @@ IR::FactoryDef_ptr IR::HomeDef::create_factory (
     CORBA::SystemException
   ))
 {
-  _TAO_HomeDef_Proxy_Impl &proxy = 
+  _TAO_HomeDef_Proxy_Impl &proxy =
     this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_factory (
       this,
       id,
@@ -19510,10 +19697,10 @@ IR::FinderDef_ptr IR::HomeDef::create_finder (
     CORBA::SystemException
   ))
 {
-  _TAO_HomeDef_Proxy_Impl &proxy = 
+  _TAO_HomeDef_Proxy_Impl &proxy =
     this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_finder (
       this,
       id,
@@ -19529,15 +19716,15 @@ static const CORBA::Long _oc_IR_HomeDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   27,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f48), 
-  ACE_NTOHL (0x6f6d6544), 
-  ACE_NTOHL (0x65663a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49522f48),
+  ACE_NTOHL (0x6f6d6544),
+  ACE_NTOHL (0x65663a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/HomeDef:1.0
   8,
-  ACE_NTOHL (0x486f6d65), 
+  ACE_NTOHL (0x486f6d65),
   ACE_NTOHL (0x44656600),  // name = HomeDef
 };
 
@@ -19558,41 +19745,41 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f48), 
-  ACE_NTOHL (0x6f6d6544), 
-  ACE_NTOHL (0x65736372), 
-  ACE_NTOHL (0x69707469), 
-  ACE_NTOHL (0x6f6e3a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49522f48),
+  ACE_NTOHL (0x6f6d6544),
+  ACE_NTOHL (0x65736372),
+  ACE_NTOHL (0x69707469),
+  ACE_NTOHL (0x6f6e3a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/HomeDescription:1.0
   16,
-  ACE_NTOHL (0x486f6d65), 
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
+  ACE_NTOHL (0x486f6d65),
+  ACE_NTOHL (0x44657363),
+  ACE_NTOHL (0x72697074),
   ACE_NTOHL (0x696f6e00),  // name = HomeDescription
   12, // member count
   5,
-  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x6e616d65),
   ACE_NTOHL (0x0),  // name = name
   CORBA::tk_alias, // typecode kind for typedefs
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     30,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f49), 
-    ACE_NTOHL (0x64656e74), 
-    ACE_NTOHL (0x69666965), 
-    ACE_NTOHL (0x723a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f49),
+    ACE_NTOHL (0x64656e74),
+    ACE_NTOHL (0x69666965),
+    ACE_NTOHL (0x723a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/Identifier:1.0
     11,
-    ACE_NTOHL (0x4964656e), 
-    ACE_NTOHL (0x74696669), 
+    ACE_NTOHL (0x4964656e),
+    ACE_NTOHL (0x74696669),
     ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
   3,
@@ -19601,163 +19788,163 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     32,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f52), 
-    ACE_NTOHL (0x65706f73), 
-    ACE_NTOHL (0x69746f72), 
-    ACE_NTOHL (0x7949643a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f52),
+    ACE_NTOHL (0x65706f73),
+    ACE_NTOHL (0x69746f72),
+    ACE_NTOHL (0x7949643a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
     13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669), 
-  ACE_NTOHL (0x6e65645f), 
+  ACE_NTOHL (0x64656669),
+  ACE_NTOHL (0x6e65645f),
   ACE_NTOHL (0x696e0000),  // name = defined_in
   CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     32,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f52), 
-    ACE_NTOHL (0x65706f73), 
-    ACE_NTOHL (0x69746f72), 
-    ACE_NTOHL (0x7949643a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f52),
+    ACE_NTOHL (0x65706f73),
+    ACE_NTOHL (0x69746f72),
+    ACE_NTOHL (0x7949643a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
     13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
   8,
-  ACE_NTOHL (0x76657273), 
+  ACE_NTOHL (0x76657273),
   ACE_NTOHL (0x696f6e00),  // name = version
   CORBA::tk_alias, // typecode kind for typedefs
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f56), 
-    ACE_NTOHL (0x65727369), 
-    ACE_NTOHL (0x6f6e5370), 
-    ACE_NTOHL (0x65633a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f56),
+    ACE_NTOHL (0x65727369),
+    ACE_NTOHL (0x6f6e5370),
+    ACE_NTOHL (0x65633a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/VersionSpec:1.0
     12,
-    ACE_NTOHL (0x56657273), 
-    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x56657273),
+    ACE_NTOHL (0x696f6e53),
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
   10,
-  ACE_NTOHL (0x62617365), 
-  ACE_NTOHL (0x5f686f6d), 
+  ACE_NTOHL (0x62617365),
+  ACE_NTOHL (0x5f686f6d),
   ACE_NTOHL (0x65000000),  // name = base_home
   CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     32,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f52), 
-    ACE_NTOHL (0x65706f73), 
-    ACE_NTOHL (0x69746f72), 
-    ACE_NTOHL (0x7949643a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f52),
+    ACE_NTOHL (0x65706f73),
+    ACE_NTOHL (0x69746f72),
+    ACE_NTOHL (0x7949643a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
     13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
   18,
-  ACE_NTOHL (0x6d616e61), 
-  ACE_NTOHL (0x6765645f), 
-  ACE_NTOHL (0x636f6d70), 
-  ACE_NTOHL (0x6f6e656e), 
+  ACE_NTOHL (0x6d616e61),
+  ACE_NTOHL (0x6765645f),
+  ACE_NTOHL (0x636f6d70),
+  ACE_NTOHL (0x6f6e656e),
   ACE_NTOHL (0x74000000),  // name = managed_component
   CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     32,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f52), 
-    ACE_NTOHL (0x65706f73), 
-    ACE_NTOHL (0x69746f72), 
-    ACE_NTOHL (0x7949643a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f52),
+    ACE_NTOHL (0x65706f73),
+    ACE_NTOHL (0x69746f72),
+    ACE_NTOHL (0x7949643a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
     13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
   16,
-  ACE_NTOHL (0x7072696d), 
-  ACE_NTOHL (0x6172795f), 
-  ACE_NTOHL (0x6b65795f), 
+  ACE_NTOHL (0x7072696d),
+  ACE_NTOHL (0x6172795f),
+  ACE_NTOHL (0x6b65795f),
   ACE_NTOHL (0x64656600),  // name = primary_key_def
   CORBA::tk_objref, // typecode kind
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f50), 
-    ACE_NTOHL (0x72696d61), 
-    ACE_NTOHL (0x72794b65), 
-    ACE_NTOHL (0x79446566), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f50),
+    ACE_NTOHL (0x72696d61),
+    ACE_NTOHL (0x72794b65),
+    ACE_NTOHL (0x79446566),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/PrimaryKeyDef:1.0
     14,
-    ACE_NTOHL (0x5072696d), 
-    ACE_NTOHL (0x6172794b), 
-    ACE_NTOHL (0x65794465), 
+    ACE_NTOHL (0x5072696d),
+    ACE_NTOHL (0x6172794b),
+    ACE_NTOHL (0x65794465),
     ACE_NTOHL (0x66000000),  // name = PrimaryKeyDef
 
   10,
-  ACE_NTOHL (0x66616374), 
-  ACE_NTOHL (0x6f726965), 
+  ACE_NTOHL (0x66616374),
+  ACE_NTOHL (0x6f726965),
   ACE_NTOHL (0x73000000),  // name = factories
   CORBA::tk_alias, // typecode kind for typedefs
   144, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f46), 
-    ACE_NTOHL (0x6163746f), 
-    ACE_NTOHL (0x72794465), 
-    ACE_NTOHL (0x66536571), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f46),
+    ACE_NTOHL (0x6163746f),
+    ACE_NTOHL (0x72794465),
+    ACE_NTOHL (0x66536571),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/FactoryDefSeq:1.0
     14,
-    ACE_NTOHL (0x46616374), 
-    ACE_NTOHL (0x6f727944), 
-    ACE_NTOHL (0x65665365), 
+    ACE_NTOHL (0x46616374),
+    ACE_NTOHL (0x6f727944),
+    ACE_NTOHL (0x65665365),
     ACE_NTOHL (0x71000000),  // name = FactoryDefSeq
     CORBA::tk_sequence, // typecode kind
     72, // encapsulation length
@@ -19766,41 +19953,41 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
       56, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         30,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x49522f46), 
-        ACE_NTOHL (0x6163746f), 
-        ACE_NTOHL (0x72794465), 
-        ACE_NTOHL (0x663a312e), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x49522f46),
+        ACE_NTOHL (0x6163746f),
+        ACE_NTOHL (0x72794465),
+        ACE_NTOHL (0x663a312e),
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/FactoryDef:1.0
         11,
-        ACE_NTOHL (0x46616374), 
-        ACE_NTOHL (0x6f727944), 
+        ACE_NTOHL (0x46616374),
+        ACE_NTOHL (0x6f727944),
         ACE_NTOHL (0x65660000),  // name = FactoryDef
 
       0U,
 
 
   8,
-  ACE_NTOHL (0x66696e64), 
+  ACE_NTOHL (0x66696e64),
   ACE_NTOHL (0x65727300),  // name = finders
   CORBA::tk_alias, // typecode kind for typedefs
   140, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
+  TAO_ENCAP_BYTE_ORDER, // byte order
     32,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f46), 
-    ACE_NTOHL (0x696e6465), 
-    ACE_NTOHL (0x72446566), 
-    ACE_NTOHL (0x5365713a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49522f46),
+    ACE_NTOHL (0x696e6465),
+    ACE_NTOHL (0x72446566),
+    ACE_NTOHL (0x5365713a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/FinderDefSeq:1.0
     13,
-    ACE_NTOHL (0x46696e64), 
-    ACE_NTOHL (0x65724465), 
-    ACE_NTOHL (0x66536571), 
+    ACE_NTOHL (0x46696e64),
+    ACE_NTOHL (0x65724465),
+    ACE_NTOHL (0x66536571),
     ACE_NTOHL (0x0),  // name = FinderDefSeq
     CORBA::tk_sequence, // typecode kind
     72, // encapsulation length
@@ -19809,45 +19996,45 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
       56, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         29,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x49522f46), 
-        ACE_NTOHL (0x696e6465), 
-        ACE_NTOHL (0x72446566), 
-        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x49522f46),
+        ACE_NTOHL (0x696e6465),
+        ACE_NTOHL (0x72446566),
+        ACE_NTOHL (0x3a312e30),
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/FinderDef:1.0
         10,
-        ACE_NTOHL (0x46696e64), 
-        ACE_NTOHL (0x65724465), 
+        ACE_NTOHL (0x46696e64),
+        ACE_NTOHL (0x65724465),
         ACE_NTOHL (0x66000000),  // name = FinderDef
 
       0U,
 
 
   11,
-  ACE_NTOHL (0x6f706572), 
-  ACE_NTOHL (0x6174696f), 
+  ACE_NTOHL (0x6f706572),
+  ACE_NTOHL (0x6174696f),
   ACE_NTOHL (0x6e730000),  // name = operations
   CORBA::tk_alias, // typecode kind for typedefs
   2036, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
+  TAO_ENCAP_BYTE_ORDER, // byte order
     39,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4f70), 
-    ACE_NTOHL (0x44657363), 
-    ACE_NTOHL (0x72697074), 
-    ACE_NTOHL (0x696f6e53), 
-    ACE_NTOHL (0x65713a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4f70),
+    ACE_NTOHL (0x44657363),
+    ACE_NTOHL (0x72697074),
+    ACE_NTOHL (0x696f6e53),
+    ACE_NTOHL (0x65713a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OpDescriptionSeq:1.0
     17,
-    ACE_NTOHL (0x4f704465), 
-    ACE_NTOHL (0x73637269), 
-    ACE_NTOHL (0x7074696f), 
-    ACE_NTOHL (0x6e536571), 
+    ACE_NTOHL (0x4f704465),
+    ACE_NTOHL (0x73637269),
+    ACE_NTOHL (0x7074696f),
+    ACE_NTOHL (0x6e536571),
     ACE_NTOHL (0x0),  // name = OpDescriptionSeq
     CORBA::tk_sequence, // typecode kind
     1956, // encapsulation length
@@ -19856,176 +20043,176 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
       1940, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4f70), 
-        ACE_NTOHL (0x65726174), 
-        ACE_NTOHL (0x696f6e44), 
-        ACE_NTOHL (0x65736372), 
-        ACE_NTOHL (0x69707469), 
-        ACE_NTOHL (0x6f6e3a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4f70),
+        ACE_NTOHL (0x65726174),
+        ACE_NTOHL (0x696f6e44),
+  ACE_NTOHL (0x65736372),
+  ACE_NTOHL (0x69707469),
+  ACE_NTOHL (0x6f6e3a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
         21,
-        ACE_NTOHL (0x4f706572), 
-        ACE_NTOHL (0x6174696f), 
-        ACE_NTOHL (0x6e446573), 
-        ACE_NTOHL (0x63726970), 
-        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x4f706572),
+        ACE_NTOHL (0x6174696f),
+        ACE_NTOHL (0x6e446573),
+        ACE_NTOHL (0x63726970),
+        ACE_NTOHL (0x74696f6e),
         ACE_NTOHL (0x0),  // name = OperationDescription
         9, // member count
-        5,
-        ACE_NTOHL (0x6e616d65), 
-        ACE_NTOHL (0x0),  // name = name
-        CORBA::tk_alias, // typecode kind for typedefs
+  5,
+  ACE_NTOHL (0x6e616d65),
+  ACE_NTOHL (0x0),  // name = name
+  CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4964), 
-          ACE_NTOHL (0x656e7469), 
-          ACE_NTOHL (0x66696572), 
-          ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4964),
+          ACE_NTOHL (0x656e7469),
+          ACE_NTOHL (0x66696572),
+          ACE_NTOHL (0x3a312e30),
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-          11,
-          ACE_NTOHL (0x4964656e), 
-          ACE_NTOHL (0x74696669), 
-          ACE_NTOHL (0x65720000),  // name = Identifier
-          CORBA::tk_string, 
-          0U, // string length
+    11,
+    ACE_NTOHL (0x4964656e),
+    ACE_NTOHL (0x74696669),
+    ACE_NTOHL (0x65720000),  // name = Identifier
+    CORBA::tk_string,
+    0U, // string length
 
-        3,
-        ACE_NTOHL (0x69640000),  // name = id
-        CORBA::tk_alias, // typecode kind for typedefs
+  3,
+  ACE_NTOHL (0x69640000),  // name = id
+  CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5265), 
-          ACE_NTOHL (0x706f7369), 
-          ACE_NTOHL (0x746f7279), 
-          ACE_NTOHL (0x49643a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5265),
+          ACE_NTOHL (0x706f7369),
+          ACE_NTOHL (0x746f7279),
+          ACE_NTOHL (0x49643a31),
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-          13,
-          ACE_NTOHL (0x5265706f), 
-          ACE_NTOHL (0x7369746f), 
-          ACE_NTOHL (0x72794964), 
-          ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
-          0U, // string length
+    13,
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x0),  // name = RepositoryId
+    CORBA::tk_string,
+    0U, // string length
 
-        11,
-        ACE_NTOHL (0x64656669), 
-        ACE_NTOHL (0x6e65645f), 
-        ACE_NTOHL (0x696e0000),  // name = defined_in
-        CORBA::tk_alias, // typecode kind for typedefs
+  11,
+  ACE_NTOHL (0x64656669),
+  ACE_NTOHL (0x6e65645f),
+  ACE_NTOHL (0x696e0000),  // name = defined_in
+  CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5265), 
-          ACE_NTOHL (0x706f7369), 
-          ACE_NTOHL (0x746f7279), 
-          ACE_NTOHL (0x49643a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5265),
+          ACE_NTOHL (0x706f7369),
+          ACE_NTOHL (0x746f7279),
+          ACE_NTOHL (0x49643a31),
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-          13,
-          ACE_NTOHL (0x5265706f), 
-          ACE_NTOHL (0x7369746f), 
-          ACE_NTOHL (0x72794964), 
-          ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
-          0U, // string length
+    13,
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x0),  // name = RepositoryId
+    CORBA::tk_string,
+    0U, // string length
 
-        8,
-        ACE_NTOHL (0x76657273), 
-        ACE_NTOHL (0x696f6e00),  // name = version
-        CORBA::tk_alias, // typecode kind for typedefs
+  8,
+  ACE_NTOHL (0x76657273),
+  ACE_NTOHL (0x696f6e00),  // name = version
+  CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
           34,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5665), 
-          ACE_NTOHL (0x7273696f), 
-          ACE_NTOHL (0x6e537065), 
-          ACE_NTOHL (0x633a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5665),
+          ACE_NTOHL (0x7273696f),
+          ACE_NTOHL (0x6e537065),
+          ACE_NTOHL (0x633a312e),
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-          12,
-          ACE_NTOHL (0x56657273), 
-          ACE_NTOHL (0x696f6e53), 
-          ACE_NTOHL (0x70656300),  // name = VersionSpec
-          CORBA::tk_string, 
-          0U, // string length
+    12,
+    ACE_NTOHL (0x56657273),
+    ACE_NTOHL (0x696f6e53),
+    ACE_NTOHL (0x70656300),  // name = VersionSpec
+    CORBA::tk_string,
+    0U, // string length
 
         7,
-        ACE_NTOHL (0x72657375), 
+        ACE_NTOHL (0x72657375),
         ACE_NTOHL (0x6c740000),  // name = result
         CORBA::tk_TypeCode,
 
         5,
-        ACE_NTOHL (0x6d6f6465), 
+        ACE_NTOHL (0x6d6f6465),
         ACE_NTOHL (0x0),  // name = mode
         CORBA::tk_enum, // typecode kind
         100, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           36,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4f70), 
-          ACE_NTOHL (0x65726174), 
-          ACE_NTOHL (0x696f6e4d), 
-          ACE_NTOHL (0x6f64653a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4f70),
+          ACE_NTOHL (0x65726174),
+          ACE_NTOHL (0x696f6e4d),
+          ACE_NTOHL (0x6f64653a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
           14,
-          ACE_NTOHL (0x4f706572), 
-          ACE_NTOHL (0x6174696f), 
-          ACE_NTOHL (0x6e4d6f64), 
+          ACE_NTOHL (0x4f706572),
+          ACE_NTOHL (0x6174696f),
+          ACE_NTOHL (0x6e4d6f64),
           ACE_NTOHL (0x65000000),  // name = OperationMode
           2, // member count
-          10,
-          ACE_NTOHL (0x4f505f4e), 
-          ACE_NTOHL (0x4f524d41), 
+  10,
+          ACE_NTOHL (0x4f505f4e),
+          ACE_NTOHL (0x4f524d41),
           ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
           10,
-          ACE_NTOHL (0x4f505f4f), 
-          ACE_NTOHL (0x4e455741), 
+          ACE_NTOHL (0x4f505f4f),
+          ACE_NTOHL (0x4e455741),
           ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
 
         9,
-        ACE_NTOHL (0x636f6e74), 
-        ACE_NTOHL (0x65787473), 
+        ACE_NTOHL (0x636f6e74),
+        ACE_NTOHL (0x65787473),
         ACE_NTOHL (0x0),  // name = contexts
         CORBA::tk_alias, // typecode kind for typedefs
         236, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f436f), 
-          ACE_NTOHL (0x6e746578), 
-          ACE_NTOHL (0x74496453), 
-          ACE_NTOHL (0x65713a31), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f436f),
+          ACE_NTOHL (0x6e746578),
+          ACE_NTOHL (0x74496453),
+          ACE_NTOHL (0x65713a31),
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
           13,
-          ACE_NTOHL (0x436f6e74), 
-          ACE_NTOHL (0x65787449), 
-          ACE_NTOHL (0x64536571), 
+          ACE_NTOHL (0x436f6e74),
+          ACE_NTOHL (0x65787449),
+          ACE_NTOHL (0x64536571),
           ACE_NTOHL (0x0),  // name = ContextIdSeq
           CORBA::tk_sequence, // typecode kind
           164, // encapsulation length
@@ -20034,329 +20221,329 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
             148, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               40,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f436f), 
-              ACE_NTOHL (0x6e746578), 
-              ACE_NTOHL (0x74496465), 
-              ACE_NTOHL (0x6e746966), 
-              ACE_NTOHL (0x6965723a), 
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x6f6d672e),
+              ACE_NTOHL (0x6f72672f),
+              ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f436f),
+              ACE_NTOHL (0x6e746578),
+              ACE_NTOHL (0x74496465),
+              ACE_NTOHL (0x6e746966),
+              ACE_NTOHL (0x6965723a),
               ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
               18,
-              ACE_NTOHL (0x436f6e74), 
-              ACE_NTOHL (0x65787449), 
-              ACE_NTOHL (0x64656e74), 
-              ACE_NTOHL (0x69666965), 
+              ACE_NTOHL (0x436f6e74),
+              ACE_NTOHL (0x65787449),
+              ACE_NTOHL (0x64656e74),
+              ACE_NTOHL (0x69666965),
               ACE_NTOHL (0x72000000),  // name = ContextIdentifier
-              CORBA::tk_alias, // typecode kind for typedefs
-              68, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
+  CORBA::tk_alias, // typecode kind for typedefs
+  68, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f4964), 
-                ACE_NTOHL (0x656e7469), 
-                ACE_NTOHL (0x66696572), 
-                ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f4964),
+                ACE_NTOHL (0x656e7469),
+                ACE_NTOHL (0x66696572),
+                ACE_NTOHL (0x3a312e30),
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-                ACE_NTOHL (0x4964656e), 
-                ACE_NTOHL (0x74696669), 
+                ACE_NTOHL (0x4964656e),
+                ACE_NTOHL (0x74696669),
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
-                0U, // string length
+    CORBA::tk_string,
+    0U, // string length
 
 
             0U,
 
 
         11,
-        ACE_NTOHL (0x70617261), 
-        ACE_NTOHL (0x6d657465), 
+        ACE_NTOHL (0x70617261),
+        ACE_NTOHL (0x6d657465),
         ACE_NTOHL (0x72730000),  // name = parameters
-        CORBA::tk_alias, // typecode kind for typedefs
+  CORBA::tk_alias, // typecode kind for typedefs
         496, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5061), 
-          ACE_NTOHL (0x72446573), 
-          ACE_NTOHL (0x63726970), 
-          ACE_NTOHL (0x74696f6e), 
-          ACE_NTOHL (0x5365713a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5061),
+          ACE_NTOHL (0x72446573),
+          ACE_NTOHL (0x63726970),
+          ACE_NTOHL (0x74696f6e),
+          ACE_NTOHL (0x5365713a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
           18,
-          ACE_NTOHL (0x50617244), 
-          ACE_NTOHL (0x65736372), 
-          ACE_NTOHL (0x69707469), 
-          ACE_NTOHL (0x6f6e5365), 
+          ACE_NTOHL (0x50617244),
+          ACE_NTOHL (0x65736372),
+          ACE_NTOHL (0x69707469),
+          ACE_NTOHL (0x6f6e5365),
           ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
           CORBA::tk_sequence, // typecode kind
           416, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
             CORBA::tk_struct, // typecode kind
             400, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f5061), 
-              ACE_NTOHL (0x72616d65), 
-              ACE_NTOHL (0x74657244), 
-              ACE_NTOHL (0x65736372), 
-              ACE_NTOHL (0x69707469), 
-              ACE_NTOHL (0x6f6e3a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+              ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f5061),
+              ACE_NTOHL (0x72616d65),
+              ACE_NTOHL (0x74657244),
+              ACE_NTOHL (0x65736372),
+              ACE_NTOHL (0x69707469),
+              ACE_NTOHL (0x6f6e3a31),
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
               21,
-              ACE_NTOHL (0x50617261), 
-              ACE_NTOHL (0x6d657465), 
-              ACE_NTOHL (0x72446573), 
-              ACE_NTOHL (0x63726970), 
-              ACE_NTOHL (0x74696f6e), 
+              ACE_NTOHL (0x50617261),
+              ACE_NTOHL (0x6d657465),
+              ACE_NTOHL (0x72446573),
+              ACE_NTOHL (0x63726970),
+              ACE_NTOHL (0x74696f6e),
               ACE_NTOHL (0x0),  // name = ParameterDescription
               4, // member count
               5,
-              ACE_NTOHL (0x6e616d65), 
+              ACE_NTOHL (0x6e616d65),
               ACE_NTOHL (0x0),  // name = name
-              CORBA::tk_alias, // typecode kind for typedefs
+  CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                33,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f4964), 
-                ACE_NTOHL (0x656e7469), 
-                ACE_NTOHL (0x66696572), 
-                ACE_NTOHL (0x3a312e30), 
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    33,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f4964),
+                ACE_NTOHL (0x656e7469),
+                ACE_NTOHL (0x66696572),
+    ACE_NTOHL (0x3a312e30),
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-                11,
-                ACE_NTOHL (0x4964656e), 
-                ACE_NTOHL (0x74696669), 
+        11,
+                ACE_NTOHL (0x4964656e),
+                ACE_NTOHL (0x74696669),
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
+                CORBA::tk_string,
                 0U, // string length
 
               5,
-              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x74797065),
               ACE_NTOHL (0x0),  // name = type
               CORBA::tk_TypeCode,
 
               9,
-              ACE_NTOHL (0x74797065), 
-              ACE_NTOHL (0x5f646566), 
+              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x5f646566),
               ACE_NTOHL (0x0),  // name = type_def
               CORBA::tk_objref, // typecode kind
               52, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
                 30,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f4944), 
-                ACE_NTOHL (0x4c547970), 
-                ACE_NTOHL (0x653a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f4944),
+                ACE_NTOHL (0x4c547970),
+                ACE_NTOHL (0x653a312e),
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
                 8,
-                ACE_NTOHL (0x49444c54), 
+                ACE_NTOHL (0x49444c54),
                 ACE_NTOHL (0x79706500),  // name = IDLType
 
               5,
-              ACE_NTOHL (0x6d6f6465), 
+              ACE_NTOHL (0x6d6f6465),
               ACE_NTOHL (0x0),  // name = mode
               CORBA::tk_enum, // typecode kind
               116, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
+        TAO_ENCAP_BYTE_ORDER, // byte order
                 36,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f5061), 
-                ACE_NTOHL (0x72616d65), 
-                ACE_NTOHL (0x7465724d), 
-                ACE_NTOHL (0x6f64653a), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f5061),
+                ACE_NTOHL (0x72616d65),
+                ACE_NTOHL (0x7465724d),
+                ACE_NTOHL (0x6f64653a),
                 ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
                 14,
-                ACE_NTOHL (0x50617261), 
-                ACE_NTOHL (0x6d657465), 
-                ACE_NTOHL (0x724d6f64), 
+                ACE_NTOHL (0x50617261),
+                ACE_NTOHL (0x6d657465),
+                ACE_NTOHL (0x724d6f64),
                 ACE_NTOHL (0x65000000),  // name = ParameterMode
                 3, // member count
                 9,
-                ACE_NTOHL (0x50415241), 
-                ACE_NTOHL (0x4d5f494e), 
+                ACE_NTOHL (0x50415241),
+                ACE_NTOHL (0x4d5f494e),
                 ACE_NTOHL (0x0),  // name = PARAM_IN
-                10,
-                ACE_NTOHL (0x50415241), 
-                ACE_NTOHL (0x4d5f4f55), 
+        10,
+                ACE_NTOHL (0x50415241),
+                ACE_NTOHL (0x4d5f4f55),
                 ACE_NTOHL (0x54000000),  // name = PARAM_OUT
                 12,
-                ACE_NTOHL (0x50415241), 
-                ACE_NTOHL (0x4d5f494e), 
+                ACE_NTOHL (0x50415241),
+                ACE_NTOHL (0x4d5f494e),
                 ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
 
 
-            0U,
+      0U,
 
 
-        11,
-        ACE_NTOHL (0x65786365), 
-        ACE_NTOHL (0x7074696f), 
+  11,
+        ACE_NTOHL (0x65786365),
+        ACE_NTOHL (0x7074696f),
         ACE_NTOHL (0x6e730000),  // name = exceptions
-        CORBA::tk_alias, // typecode kind for typedefs
+  CORBA::tk_alias, // typecode kind for typedefs
         556, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4578), 
-          ACE_NTOHL (0x63446573), 
-          ACE_NTOHL (0x63726970), 
-          ACE_NTOHL (0x74696f6e), 
-          ACE_NTOHL (0x5365713a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4578),
+          ACE_NTOHL (0x63446573),
+          ACE_NTOHL (0x63726970),
+          ACE_NTOHL (0x74696f6e),
+          ACE_NTOHL (0x5365713a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
           18,
-          ACE_NTOHL (0x45786344), 
-          ACE_NTOHL (0x65736372), 
-          ACE_NTOHL (0x69707469), 
-          ACE_NTOHL (0x6f6e5365), 
+          ACE_NTOHL (0x45786344),
+          ACE_NTOHL (0x65736372),
+          ACE_NTOHL (0x69707469),
+          ACE_NTOHL (0x6f6e5365),
           ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
-          CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
           476, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            CORBA::tk_struct, // typecode kind
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      CORBA::tk_struct, // typecode kind
             460, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              43,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f4578), 
-              ACE_NTOHL (0x63657074), 
-              ACE_NTOHL (0x696f6e44), 
-              ACE_NTOHL (0x65736372), 
-              ACE_NTOHL (0x69707469), 
-              ACE_NTOHL (0x6f6e3a31), 
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        43,
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f4578),
+              ACE_NTOHL (0x63657074),
+        ACE_NTOHL (0x696f6e44),
+        ACE_NTOHL (0x65736372),
+        ACE_NTOHL (0x69707469),
+        ACE_NTOHL (0x6f6e3a31),
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
               21,
-              ACE_NTOHL (0x45786365), 
-              ACE_NTOHL (0x7074696f), 
-              ACE_NTOHL (0x6e446573), 
-              ACE_NTOHL (0x63726970), 
-              ACE_NTOHL (0x74696f6e), 
+              ACE_NTOHL (0x45786365),
+              ACE_NTOHL (0x7074696f),
+              ACE_NTOHL (0x6e446573),
+              ACE_NTOHL (0x63726970),
+              ACE_NTOHL (0x74696f6e),
               ACE_NTOHL (0x0),  // name = ExceptionDescription
               5, // member count
-              5,
-              ACE_NTOHL (0x6e616d65), 
-              ACE_NTOHL (0x0),  // name = name
+        5,
+        ACE_NTOHL (0x6e616d65),
+        ACE_NTOHL (0x0),  // name = name
               CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f4964), 
-                ACE_NTOHL (0x656e7469), 
-                ACE_NTOHL (0x66696572), 
-                ACE_NTOHL (0x3a312e30), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f4964),
+                ACE_NTOHL (0x656e7469),
+                ACE_NTOHL (0x66696572),
+                ACE_NTOHL (0x3a312e30),
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-                ACE_NTOHL (0x4964656e), 
-                ACE_NTOHL (0x74696669), 
+                ACE_NTOHL (0x4964656e),
+                ACE_NTOHL (0x74696669),
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
-                0U, // string length
+        CORBA::tk_string,
+        0U, // string length
 
-              3,
-              ACE_NTOHL (0x69640000),  // name = id
+        3,
+        ACE_NTOHL (0x69640000),  // name = id
               CORBA::tk_alias, // typecode kind for typedefs
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f5265), 
-                ACE_NTOHL (0x706f7369), 
-                ACE_NTOHL (0x746f7279), 
-                ACE_NTOHL (0x49643a31), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f5265),
+                ACE_NTOHL (0x706f7369),
+                ACE_NTOHL (0x746f7279),
+                ACE_NTOHL (0x49643a31),
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-                ACE_NTOHL (0x5265706f), 
-                ACE_NTOHL (0x7369746f), 
-                ACE_NTOHL (0x72794964), 
+                ACE_NTOHL (0x5265706f),
+                ACE_NTOHL (0x7369746f),
+                ACE_NTOHL (0x72794964),
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string, 
-                0U, // string length
+        CORBA::tk_string,
+        0U, // string length
 
-              11,
-              ACE_NTOHL (0x64656669), 
-              ACE_NTOHL (0x6e65645f), 
-              ACE_NTOHL (0x696e0000),  // name = defined_in
+        11,
+        ACE_NTOHL (0x64656669),
+        ACE_NTOHL (0x6e65645f),
+        ACE_NTOHL (0x696e0000),  // name = defined_in
               CORBA::tk_alias, // typecode kind for typedefs
               72, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
+          TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f5265), 
-                ACE_NTOHL (0x706f7369), 
-                ACE_NTOHL (0x746f7279), 
-                ACE_NTOHL (0x49643a31), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f5265),
+                ACE_NTOHL (0x706f7369),
+                ACE_NTOHL (0x746f7279),
+                ACE_NTOHL (0x49643a31),
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-                ACE_NTOHL (0x5265706f), 
-                ACE_NTOHL (0x7369746f), 
-                ACE_NTOHL (0x72794964), 
+                ACE_NTOHL (0x5265706f),
+                ACE_NTOHL (0x7369746f),
+                ACE_NTOHL (0x72794964),
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string, 
+                CORBA::tk_string,
                 0U, // string length
 
               8,
-              ACE_NTOHL (0x76657273), 
+              ACE_NTOHL (0x76657273),
               ACE_NTOHL (0x696f6e00),  // name = version
-              CORBA::tk_alias, // typecode kind for typedefs
+        CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
+          TAO_ENCAP_BYTE_ORDER, // byte order
                 34,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f5665), 
-                ACE_NTOHL (0x7273696f), 
-                ACE_NTOHL (0x6e537065), 
-                ACE_NTOHL (0x633a312e), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f5665),
+                ACE_NTOHL (0x7273696f),
+                ACE_NTOHL (0x6e537065),
+                ACE_NTOHL (0x633a312e),
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                 12,
-                ACE_NTOHL (0x56657273), 
-                ACE_NTOHL (0x696f6e53), 
+                ACE_NTOHL (0x56657273),
+                ACE_NTOHL (0x696f6e53),
                 ACE_NTOHL (0x70656300),  // name = VersionSpec
-                CORBA::tk_string, 
-                0U, // string length
+            CORBA::tk_string,
+            0U, // string length
 
               5,
-              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x74797065),
               ACE_NTOHL (0x0),  // name = type
               CORBA::tk_TypeCode,
 
@@ -20365,215 +20552,215 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
 
 
 
-      0U,
+            0U,
 
 
-  11,
-  ACE_NTOHL (0x61747472), 
-  ACE_NTOHL (0x69627574), 
+        11,
+  ACE_NTOHL (0x61747472),
+  ACE_NTOHL (0x69627574),
   ACE_NTOHL (0x65730000),  // name = attributes
-  CORBA::tk_alias, // typecode kind for typedefs
+        CORBA::tk_alias, // typecode kind for typedefs
   1852, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
+          TAO_ENCAP_BYTE_ORDER, // byte order
     41,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4174), 
-    ACE_NTOHL (0x74724465), 
-    ACE_NTOHL (0x73637269), 
-    ACE_NTOHL (0x7074696f), 
-    ACE_NTOHL (0x6e536571), 
-    ACE_NTOHL (0x3a312e30), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4174),
+    ACE_NTOHL (0x74724465),
+    ACE_NTOHL (0x73637269),
+    ACE_NTOHL (0x7074696f),
+    ACE_NTOHL (0x6e536571),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/AttrDescriptionSeq:1.0
     19,
-    ACE_NTOHL (0x41747472), 
-    ACE_NTOHL (0x44657363), 
-    ACE_NTOHL (0x72697074), 
-    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x41747472),
+    ACE_NTOHL (0x44657363),
+    ACE_NTOHL (0x72697074),
+    ACE_NTOHL (0x696f6e53),
     ACE_NTOHL (0x65710000),  // name = AttrDescriptionSeq
-    CORBA::tk_sequence, // typecode kind
+          CORBA::tk_sequence, // typecode kind
     1768, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_struct, // typecode kind
+            TAO_ENCAP_BYTE_ORDER, // byte order
+            CORBA::tk_struct, // typecode kind
       1752, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        43,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4174), 
-        ACE_NTOHL (0x74726962), 
-        ACE_NTOHL (0x75746544), 
-        ACE_NTOHL (0x65736372), 
-        ACE_NTOHL (0x69707469), 
-        ACE_NTOHL (0x6f6e3a31), 
+              TAO_ENCAP_BYTE_ORDER, // byte order
+              43,
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x6f6d672e),
+              ACE_NTOHL (0x6f72672f),
+              ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4174),
+        ACE_NTOHL (0x74726962),
+        ACE_NTOHL (0x75746544),
+              ACE_NTOHL (0x65736372),
+              ACE_NTOHL (0x69707469),
+              ACE_NTOHL (0x6f6e3a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDescription:1.0
         21,
-        ACE_NTOHL (0x41747472), 
-        ACE_NTOHL (0x69627574), 
-        ACE_NTOHL (0x65446573), 
-        ACE_NTOHL (0x63726970), 
-        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x41747472),
+        ACE_NTOHL (0x69627574),
+        ACE_NTOHL (0x65446573),
+        ACE_NTOHL (0x63726970),
+        ACE_NTOHL (0x74696f6e),
         ACE_NTOHL (0x0),  // name = AttributeDescription
         8, // member count
-        5,
-        ACE_NTOHL (0x6e616d65), 
-        ACE_NTOHL (0x0),  // name = name
+              5,
+              ACE_NTOHL (0x6e616d65),
+              ACE_NTOHL (0x0),  // name = name
         CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4964), 
-          ACE_NTOHL (0x656e7469), 
-          ACE_NTOHL (0x66696572), 
-          ACE_NTOHL (0x3a312e30), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4964),
+          ACE_NTOHL (0x656e7469),
+          ACE_NTOHL (0x66696572),
+          ACE_NTOHL (0x3a312e30),
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
           11,
-          ACE_NTOHL (0x4964656e), 
-          ACE_NTOHL (0x74696669), 
+          ACE_NTOHL (0x4964656e),
+          ACE_NTOHL (0x74696669),
           ACE_NTOHL (0x65720000),  // name = Identifier
-          CORBA::tk_string, 
-          0U, // string length
+              CORBA::tk_string,
+              0U, // string length
 
         3,
         ACE_NTOHL (0x69640000),  // name = id
         CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
+                TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5265), 
-          ACE_NTOHL (0x706f7369), 
-          ACE_NTOHL (0x746f7279), 
-          ACE_NTOHL (0x49643a31), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5265),
+          ACE_NTOHL (0x706f7369),
+          ACE_NTOHL (0x746f7279),
+          ACE_NTOHL (0x49643a31),
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
           13,
-          ACE_NTOHL (0x5265706f), 
-          ACE_NTOHL (0x7369746f), 
-          ACE_NTOHL (0x72794964), 
+          ACE_NTOHL (0x5265706f),
+          ACE_NTOHL (0x7369746f),
+          ACE_NTOHL (0x72794964),
           ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
+          CORBA::tk_string,
           0U, // string length
 
         11,
-        ACE_NTOHL (0x64656669), 
-        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x64656669),
+        ACE_NTOHL (0x6e65645f),
         ACE_NTOHL (0x696e0000),  // name = defined_in
         CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5265), 
-          ACE_NTOHL (0x706f7369), 
-          ACE_NTOHL (0x746f7279), 
-          ACE_NTOHL (0x49643a31), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5265),
+          ACE_NTOHL (0x706f7369),
+          ACE_NTOHL (0x746f7279),
+          ACE_NTOHL (0x49643a31),
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
           13,
-          ACE_NTOHL (0x5265706f), 
-          ACE_NTOHL (0x7369746f), 
-          ACE_NTOHL (0x72794964), 
+          ACE_NTOHL (0x5265706f),
+          ACE_NTOHL (0x7369746f),
+          ACE_NTOHL (0x72794964),
           ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
+          CORBA::tk_string,
           0U, // string length
 
         8,
-        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x76657273),
         ACE_NTOHL (0x696f6e00),  // name = version
         CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
+                TAO_ENCAP_BYTE_ORDER, // byte order
           34,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5665), 
-          ACE_NTOHL (0x7273696f), 
-          ACE_NTOHL (0x6e537065), 
-          ACE_NTOHL (0x633a312e), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5665),
+          ACE_NTOHL (0x7273696f),
+          ACE_NTOHL (0x6e537065),
+          ACE_NTOHL (0x633a312e),
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-          12,
-          ACE_NTOHL (0x56657273), 
-          ACE_NTOHL (0x696f6e53), 
+                12,
+          ACE_NTOHL (0x56657273),
+          ACE_NTOHL (0x696f6e53),
           ACE_NTOHL (0x70656300),  // name = VersionSpec
-          CORBA::tk_string, 
+          CORBA::tk_string,
           0U, // string length
 
         5,
-        ACE_NTOHL (0x74797065), 
+        ACE_NTOHL (0x74797065),
         ACE_NTOHL (0x0),  // name = type
         CORBA::tk_TypeCode,
 
         5,
-        ACE_NTOHL (0x6d6f6465), 
+        ACE_NTOHL (0x6d6f6465),
         ACE_NTOHL (0x0),  // name = mode
         CORBA::tk_enum, // typecode kind
         104, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           36,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4174), 
-          ACE_NTOHL (0x74726962), 
-          ACE_NTOHL (0x7574654d), 
-          ACE_NTOHL (0x6f64653a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4174),
+          ACE_NTOHL (0x74726962),
+          ACE_NTOHL (0x7574654d),
+          ACE_NTOHL (0x6f64653a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
           14,
-          ACE_NTOHL (0x41747472), 
-          ACE_NTOHL (0x69627574), 
-          ACE_NTOHL (0x654d6f64), 
+          ACE_NTOHL (0x41747472),
+          ACE_NTOHL (0x69627574),
+          ACE_NTOHL (0x654d6f64),
           ACE_NTOHL (0x65000000),  // name = AttributeMode
           2, // member count
           12,
-          ACE_NTOHL (0x41545452), 
-          ACE_NTOHL (0x5f4e4f52), 
+          ACE_NTOHL (0x41545452),
+          ACE_NTOHL (0x5f4e4f52),
           ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
           14,
-          ACE_NTOHL (0x41545452), 
-          ACE_NTOHL (0x5f524541), 
-          ACE_NTOHL (0x444f4e4c), 
+          ACE_NTOHL (0x41545452),
+          ACE_NTOHL (0x5f524541),
+          ACE_NTOHL (0x444f4e4c),
           ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
 
         15,
-        ACE_NTOHL (0x6765745f), 
-        ACE_NTOHL (0x65786365), 
-        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6765745f),
+        ACE_NTOHL (0x65786365),
+        ACE_NTOHL (0x7074696f),
         ACE_NTOHL (0x6e730000),  // name = get_exceptions
         CORBA::tk_alias, // typecode kind for typedefs
         556, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4578), 
-          ACE_NTOHL (0x63446573), 
-          ACE_NTOHL (0x63726970), 
-          ACE_NTOHL (0x74696f6e), 
-          ACE_NTOHL (0x5365713a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4578),
+          ACE_NTOHL (0x63446573),
+          ACE_NTOHL (0x63726970),
+          ACE_NTOHL (0x74696f6e),
+          ACE_NTOHL (0x5365713a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
           18,
-          ACE_NTOHL (0x45786344), 
-          ACE_NTOHL (0x65736372), 
-          ACE_NTOHL (0x69707469), 
-          ACE_NTOHL (0x6f6e5365), 
+          ACE_NTOHL (0x45786344),
+          ACE_NTOHL (0x65736372),
+          ACE_NTOHL (0x69707469),
+          ACE_NTOHL (0x6f6e5365),
           ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
           CORBA::tk_sequence, // typecode kind
           476, // encapsulation length
@@ -20582,47 +20769,47 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
             460, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f4578), 
-              ACE_NTOHL (0x63657074), 
-              ACE_NTOHL (0x696f6e44), 
-              ACE_NTOHL (0x65736372), 
-              ACE_NTOHL (0x69707469), 
-              ACE_NTOHL (0x6f6e3a31), 
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x6f6d672e),
+              ACE_NTOHL (0x6f72672f),
+              ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f4578),
+              ACE_NTOHL (0x63657074),
+              ACE_NTOHL (0x696f6e44),
+              ACE_NTOHL (0x65736372),
+              ACE_NTOHL (0x69707469),
+              ACE_NTOHL (0x6f6e3a31),
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
               21,
-              ACE_NTOHL (0x45786365), 
-              ACE_NTOHL (0x7074696f), 
-              ACE_NTOHL (0x6e446573), 
-              ACE_NTOHL (0x63726970), 
-              ACE_NTOHL (0x74696f6e), 
+              ACE_NTOHL (0x45786365),
+              ACE_NTOHL (0x7074696f),
+              ACE_NTOHL (0x6e446573),
+              ACE_NTOHL (0x63726970),
+              ACE_NTOHL (0x74696f6e),
               ACE_NTOHL (0x0),  // name = ExceptionDescription
               5, // member count
               5,
-              ACE_NTOHL (0x6e616d65), 
+              ACE_NTOHL (0x6e616d65),
               ACE_NTOHL (0x0),  // name = name
               CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f4964), 
-                ACE_NTOHL (0x656e7469), 
-                ACE_NTOHL (0x66696572), 
-                ACE_NTOHL (0x3a312e30), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f4964),
+                ACE_NTOHL (0x656e7469),
+                ACE_NTOHL (0x66696572),
+                ACE_NTOHL (0x3a312e30),
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-                ACE_NTOHL (0x4964656e), 
-                ACE_NTOHL (0x74696669), 
+                ACE_NTOHL (0x4964656e),
+                ACE_NTOHL (0x74696669),
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
-                0U, // string length
+              CORBA::tk_string,
+              0U, // string length
 
               3,
               ACE_NTOHL (0x69640000),  // name = id
@@ -20630,73 +20817,73 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f5265), 
-                ACE_NTOHL (0x706f7369), 
-                ACE_NTOHL (0x746f7279), 
-                ACE_NTOHL (0x49643a31), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f5265),
+                ACE_NTOHL (0x706f7369),
+                ACE_NTOHL (0x746f7279),
+                ACE_NTOHL (0x49643a31),
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-                ACE_NTOHL (0x5265706f), 
-                ACE_NTOHL (0x7369746f), 
-                ACE_NTOHL (0x72794964), 
+                ACE_NTOHL (0x5265706f),
+                ACE_NTOHL (0x7369746f),
+                ACE_NTOHL (0x72794964),
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string, 
-                0U, // string length
+              CORBA::tk_string,
+              0U, // string length
 
               11,
-              ACE_NTOHL (0x64656669), 
-              ACE_NTOHL (0x6e65645f), 
+              ACE_NTOHL (0x64656669),
+              ACE_NTOHL (0x6e65645f),
               ACE_NTOHL (0x696e0000),  // name = defined_in
               CORBA::tk_alias, // typecode kind for typedefs
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f5265), 
-                ACE_NTOHL (0x706f7369), 
-                ACE_NTOHL (0x746f7279), 
-                ACE_NTOHL (0x49643a31), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f5265),
+                ACE_NTOHL (0x706f7369),
+                ACE_NTOHL (0x746f7279),
+                ACE_NTOHL (0x49643a31),
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-                ACE_NTOHL (0x5265706f), 
-                ACE_NTOHL (0x7369746f), 
-                ACE_NTOHL (0x72794964), 
+                ACE_NTOHL (0x5265706f),
+                ACE_NTOHL (0x7369746f),
+                ACE_NTOHL (0x72794964),
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string, 
-                0U, // string length
+              CORBA::tk_string,
+              0U, // string length
 
               8,
-              ACE_NTOHL (0x76657273), 
+              ACE_NTOHL (0x76657273),
               ACE_NTOHL (0x696f6e00),  // name = version
               CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 34,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f5665), 
-                ACE_NTOHL (0x7273696f), 
-                ACE_NTOHL (0x6e537065), 
-                ACE_NTOHL (0x633a312e), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f5665),
+                ACE_NTOHL (0x7273696f),
+                ACE_NTOHL (0x6e537065),
+                ACE_NTOHL (0x633a312e),
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                 12,
-                ACE_NTOHL (0x56657273), 
-                ACE_NTOHL (0x696f6e53), 
+                ACE_NTOHL (0x56657273),
+                ACE_NTOHL (0x696f6e53),
                 ACE_NTOHL (0x70656300),  // name = VersionSpec
-                CORBA::tk_string, 
-                0U, // string length
+              CORBA::tk_string,
+              0U, // string length
 
               5,
-              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x74797065),
               ACE_NTOHL (0x0),  // name = type
               CORBA::tk_TypeCode,
 
@@ -20705,154 +20892,154 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
 
 
         15,
-        ACE_NTOHL (0x7075745f), 
-        ACE_NTOHL (0x65786365), 
-        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x7075745f),
+        ACE_NTOHL (0x65786365),
+        ACE_NTOHL (0x7074696f),
         ACE_NTOHL (0x6e730000),  // name = put_exceptions
-        CORBA::tk_alias, // typecode kind for typedefs
+  CORBA::tk_alias, // typecode kind for typedefs
         556, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4578), 
-          ACE_NTOHL (0x63446573), 
-          ACE_NTOHL (0x63726970), 
-          ACE_NTOHL (0x74696f6e), 
-          ACE_NTOHL (0x5365713a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4578),
+          ACE_NTOHL (0x63446573),
+          ACE_NTOHL (0x63726970),
+          ACE_NTOHL (0x74696f6e),
+          ACE_NTOHL (0x5365713a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
           18,
-          ACE_NTOHL (0x45786344), 
-          ACE_NTOHL (0x65736372), 
-          ACE_NTOHL (0x69707469), 
-          ACE_NTOHL (0x6f6e5365), 
+          ACE_NTOHL (0x45786344),
+          ACE_NTOHL (0x65736372),
+          ACE_NTOHL (0x69707469),
+          ACE_NTOHL (0x6f6e5365),
           ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
-          CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
           476, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            CORBA::tk_struct, // typecode kind
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      CORBA::tk_struct, // typecode kind
             460, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              43,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f4578), 
-              ACE_NTOHL (0x63657074), 
-              ACE_NTOHL (0x696f6e44), 
-              ACE_NTOHL (0x65736372), 
-              ACE_NTOHL (0x69707469), 
-              ACE_NTOHL (0x6f6e3a31), 
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        43,
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f4578),
+              ACE_NTOHL (0x63657074),
+              ACE_NTOHL (0x696f6e44),
+        ACE_NTOHL (0x65736372),
+        ACE_NTOHL (0x69707469),
+        ACE_NTOHL (0x6f6e3a31),
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
               21,
-              ACE_NTOHL (0x45786365), 
-              ACE_NTOHL (0x7074696f), 
-              ACE_NTOHL (0x6e446573), 
-              ACE_NTOHL (0x63726970), 
-              ACE_NTOHL (0x74696f6e), 
+              ACE_NTOHL (0x45786365),
+              ACE_NTOHL (0x7074696f),
+              ACE_NTOHL (0x6e446573),
+              ACE_NTOHL (0x63726970),
+              ACE_NTOHL (0x74696f6e),
               ACE_NTOHL (0x0),  // name = ExceptionDescription
               5, // member count
-              5,
-              ACE_NTOHL (0x6e616d65), 
-              ACE_NTOHL (0x0),  // name = name
+        5,
+        ACE_NTOHL (0x6e616d65),
+        ACE_NTOHL (0x0),  // name = name
               CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f4964), 
-                ACE_NTOHL (0x656e7469), 
-                ACE_NTOHL (0x66696572), 
-                ACE_NTOHL (0x3a312e30), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f4964),
+                ACE_NTOHL (0x656e7469),
+                ACE_NTOHL (0x66696572),
+                ACE_NTOHL (0x3a312e30),
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-                ACE_NTOHL (0x4964656e), 
-                ACE_NTOHL (0x74696669), 
+                ACE_NTOHL (0x4964656e),
+                ACE_NTOHL (0x74696669),
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
-                0U, // string length
+        CORBA::tk_string,
+        0U, // string length
 
-              3,
-              ACE_NTOHL (0x69640000),  // name = id
+        3,
+        ACE_NTOHL (0x69640000),  // name = id
               CORBA::tk_alias, // typecode kind for typedefs
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f5265), 
-                ACE_NTOHL (0x706f7369), 
-                ACE_NTOHL (0x746f7279), 
-                ACE_NTOHL (0x49643a31), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f5265),
+                ACE_NTOHL (0x706f7369),
+                ACE_NTOHL (0x746f7279),
+                ACE_NTOHL (0x49643a31),
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-                ACE_NTOHL (0x5265706f), 
-                ACE_NTOHL (0x7369746f), 
-                ACE_NTOHL (0x72794964), 
+                ACE_NTOHL (0x5265706f),
+                ACE_NTOHL (0x7369746f),
+                ACE_NTOHL (0x72794964),
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string, 
-                0U, // string length
+        CORBA::tk_string,
+        0U, // string length
 
-              11,
-              ACE_NTOHL (0x64656669), 
-              ACE_NTOHL (0x6e65645f), 
-              ACE_NTOHL (0x696e0000),  // name = defined_in
+        11,
+        ACE_NTOHL (0x64656669),
+        ACE_NTOHL (0x6e65645f),
+        ACE_NTOHL (0x696e0000),  // name = defined_in
               CORBA::tk_alias, // typecode kind for typedefs
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f5265), 
-                ACE_NTOHL (0x706f7369), 
-                ACE_NTOHL (0x746f7279), 
-                ACE_NTOHL (0x49643a31), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f5265),
+                ACE_NTOHL (0x706f7369),
+                ACE_NTOHL (0x746f7279),
+                ACE_NTOHL (0x49643a31),
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-                ACE_NTOHL (0x5265706f), 
-                ACE_NTOHL (0x7369746f), 
-                ACE_NTOHL (0x72794964), 
+                ACE_NTOHL (0x5265706f),
+                ACE_NTOHL (0x7369746f),
+                ACE_NTOHL (0x72794964),
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string, 
-                0U, // string length
+        CORBA::tk_string,
+        0U, // string length
 
-              8,
-              ACE_NTOHL (0x76657273), 
-              ACE_NTOHL (0x696f6e00),  // name = version
+        8,
+        ACE_NTOHL (0x76657273),
+        ACE_NTOHL (0x696f6e00),  // name = version
               CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 34,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f5665), 
-                ACE_NTOHL (0x7273696f), 
-                ACE_NTOHL (0x6e537065), 
-                ACE_NTOHL (0x633a312e), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f5665),
+                ACE_NTOHL (0x7273696f),
+                ACE_NTOHL (0x6e537065),
+                ACE_NTOHL (0x633a312e),
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                 12,
-                ACE_NTOHL (0x56657273), 
-                ACE_NTOHL (0x696f6e53), 
+                ACE_NTOHL (0x56657273),
+                ACE_NTOHL (0x696f6e53),
                 ACE_NTOHL (0x70656300),  // name = VersionSpec
-                CORBA::tk_string, 
-                0U, // string length
+        CORBA::tk_string,
+        0U, // string length
 
-              5,
-              ACE_NTOHL (0x74797065), 
-              ACE_NTOHL (0x0),  // name = type
-              CORBA::tk_TypeCode,
+        5,
+        ACE_NTOHL (0x74797065),
+        ACE_NTOHL (0x0),  // name = type
+        CORBA::tk_TypeCode,
 
 
             0U,
@@ -20863,8 +21050,8 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
 
 
   9,
-  ACE_NTOHL (0x69735f62), 
-  ACE_NTOHL (0x61736963), 
+  ACE_NTOHL (0x69735f62),
+  ACE_NTOHL (0x61736963),
   ACE_NTOHL (0x0),  // name = is_basic
   CORBA::tk_boolean,
 
@@ -20883,9 +21070,9 @@ TAO_NAMESPACE_BEGIN (IR)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_HomeDescription, &_tc_TAO_tc_IR_HomeDescription)
 TAO_NAMESPACE_END
 
-void IR::HomeDescription::_tao_any_destructor (void *x)
+void IR::HomeDescription::_tao_any_destructor (void *_tao_void_pointer)
 {
-  HomeDescription *tmp = ACE_static_cast (HomeDescription*,x);
+  HomeDescription *tmp = ACE_static_cast (HomeDescription*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -20933,13 +21120,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::RepositoryIdSe
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IR::_tc_RepositoryIdSeq, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -21024,13 +21211,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ComponentDefSe
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IR::_tc_ComponentDefSeq, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -21115,13 +21302,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ProvidesDefSeq
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDefSeq, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -21206,13 +21393,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::UsesDefSeq *&_
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IR::_tc_UsesDefSeq, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -21297,13 +21484,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::HomeDefSeq *&_
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IR::_tc_HomeDefSeq, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -21388,13 +21575,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::EmitsDefSeq *&
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IR::_tc_EmitsDefSeq, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -21479,13 +21666,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::PublishesDefSe
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IR::_tc_PublishesDefSeq, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -21570,13 +21757,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ConsumesDefSeq
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IR::_tc_ConsumesDefSeq, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -21661,13 +21848,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::FactoryDefSeq
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IR::_tc_FactoryDefSeq, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -21752,13 +21939,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::FinderDefSeq *
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IR::_tc_FinderDefSeq, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -21805,7 +21992,7 @@ void operator<<= (CORBA::Any &_tao_any, IR::ComponentRepository_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        IR::_tc_ComponentRepository, 
+        IR::_tc_ComponentRepository,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -21821,13 +22008,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ComponentRepository_
   {
     _tao_elem = IR::ComponentRepository::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IR::_tc_ComponentRepository, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -21866,7 +22053,7 @@ void operator<<= (CORBA::Any &_tao_any, IR::ProvidesDef_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        IR::_tc_ProvidesDef, 
+        IR::_tc_ProvidesDef,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -21882,13 +22069,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ProvidesDef_ptr &_ta
   {
     _tao_elem = IR::ProvidesDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDef, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -21957,13 +22144,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ProvidesDescri
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDescription, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -22010,7 +22197,7 @@ void operator<<= (CORBA::Any &_tao_any, IR::UsesDef_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        IR::_tc_UsesDef, 
+        IR::_tc_UsesDef,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -22026,13 +22213,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::UsesDef_ptr &_tao_el
   {
     _tao_elem = IR::UsesDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IR::_tc_UsesDef, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -22101,13 +22288,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::UsesDescriptio
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IR::_tc_UsesDescription, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -22192,13 +22379,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ProvidesDescSe
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDescSeq, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -22283,13 +22470,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::UsesDescSeq *&
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IR::_tc_UsesDescSeq, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -22336,7 +22523,7 @@ void operator<<= (CORBA::Any &_tao_any, IR::EventDef_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        IR::_tc_EventDef, 
+        IR::_tc_EventDef,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -22352,13 +22539,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::EventDef_ptr &_tao_e
   {
     _tao_elem = IR::EventDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IR::_tc_EventDef, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -22427,13 +22614,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::EventDescripti
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IR::_tc_EventDescription, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -22480,7 +22667,7 @@ void operator<<= (CORBA::Any &_tao_any, IR::EmitsDef_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        IR::_tc_EmitsDef, 
+        IR::_tc_EmitsDef,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -22496,13 +22683,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::EmitsDef_ptr &_tao_e
   {
     _tao_elem = IR::EmitsDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IR::_tc_EmitsDef, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -22541,7 +22728,7 @@ void operator<<= (CORBA::Any &_tao_any, IR::PublishesDef_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        IR::_tc_PublishesDef, 
+        IR::_tc_PublishesDef,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -22557,13 +22744,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::PublishesDef_ptr &_t
   {
     _tao_elem = IR::PublishesDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IR::_tc_PublishesDef, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -22602,7 +22789,7 @@ void operator<<= (CORBA::Any &_tao_any, IR::ConsumesDef_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        IR::_tc_ConsumesDef, 
+        IR::_tc_ConsumesDef,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -22618,13 +22805,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ConsumesDef_ptr &_ta
   {
     _tao_elem = IR::ConsumesDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IR::_tc_ConsumesDef, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -22663,7 +22850,7 @@ void operator<<= (CORBA::Any &_tao_any, IR::ComponentDef_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        IR::_tc_ComponentDef, 
+        IR::_tc_ComponentDef,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -22679,13 +22866,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ComponentDef_ptr &_t
   {
     _tao_elem = IR::ComponentDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IR::_tc_ComponentDef, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -22754,13 +22941,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ComponentDescr
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IR::_tc_ComponentDescription, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -22807,7 +22994,7 @@ void operator<<= (CORBA::Any &_tao_any, IR::PrimaryKeyDef_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        IR::_tc_PrimaryKeyDef, 
+        IR::_tc_PrimaryKeyDef,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -22823,13 +23010,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::PrimaryKeyDef_ptr &_
   {
     _tao_elem = IR::PrimaryKeyDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IR::_tc_PrimaryKeyDef, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -22898,13 +23085,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::PrimaryKeyDesc
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IR::_tc_PrimaryKeyDescription, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -22951,7 +23138,7 @@ void operator<<= (CORBA::Any &_tao_any, IR::FactoryDef_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        IR::_tc_FactoryDef, 
+        IR::_tc_FactoryDef,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -22967,13 +23154,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::FactoryDef_ptr &_tao
   {
     _tao_elem = IR::FactoryDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IR::_tc_FactoryDef, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -23012,7 +23199,7 @@ void operator<<= (CORBA::Any &_tao_any, IR::FinderDef_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        IR::_tc_FinderDef, 
+        IR::_tc_FinderDef,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -23028,13 +23215,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::FinderDef_ptr &_tao_
   {
     _tao_elem = IR::FinderDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IR::_tc_FinderDef, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -23073,7 +23260,7 @@ void operator<<= (CORBA::Any &_tao_any, IR::HomeDef_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        IR::_tc_HomeDef, 
+        IR::_tc_HomeDef,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -23089,13 +23276,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::HomeDef_ptr &_tao_el
   {
     _tao_elem = IR::HomeDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IR::_tc_HomeDef, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -23164,13 +23351,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::HomeDescriptio
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IR::_tc_HomeDescription, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -23240,7 +23427,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;
@@ -23282,7 +23469,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;
@@ -23324,7 +23511,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;
@@ -23366,7 +23553,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;
@@ -23408,7 +23595,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;
@@ -23450,7 +23637,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;
@@ -23492,7 +23679,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;
@@ -23534,7 +23721,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;
@@ -23576,7 +23763,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;
@@ -23618,7 +23805,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;
@@ -23768,7 +23955,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;
@@ -23810,7 +23997,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;
@@ -24146,4 +24333,3 @@ CORBA::Boolean operator>> (
   ACE_ENDTRY;
   return 0;
 }
-
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.h b/TAO/tao/IFR_Client/IFR_ComponentsC.h
index 102985b1e2b..bc0c80f81a2 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.h
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.h
@@ -59,22 +59,22 @@ TAO_NAMESPACE  IR
   typedef char * Identifier;
   typedef CORBA::String_var Identifier_var;
   typedef CORBA::String_out Identifier_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Identifier;
-
+  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Identifier;
+  
   typedef char * ScopedName;
   typedef CORBA::String_var ScopedName_var;
   typedef CORBA::String_out ScopedName_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ScopedName;
-
+  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ScopedName;
+  
   typedef char * RepositoryId;
   typedef CORBA::String_var RepositoryId_var;
   typedef CORBA::String_out RepositoryId_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RepositoryId;
-
-
+  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RepositoryId;
+  
+  
 #if !defined (_IR_REPOSITORYIDSEQ_CH_)
 #define _IR_REPOSITORYIDSEQ_CH_
-
+  
   class RepositoryIdSeq;
   class RepositoryIdSeq_var;
   
@@ -84,47 +84,48 @@ TAO_NAMESPACE  IR
   
   class TAO_IFR_Client_Export RepositoryIdSeq : public 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    TAO_Unbounded_String_Sequence
+  TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_String_Sequence
+  TAO_Unbounded_String_Sequence
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     RepositoryIdSeq (void); // default ctor
     RepositoryIdSeq (CORBA::ULong max); // uses max size
     RepositoryIdSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      char * *buffer, 
-      CORBA::Boolean release = 0
-    );
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        char * *buffer, 
+        CORBA::Boolean release = 0
+      );
     RepositoryIdSeq (const RepositoryIdSeq &); // copy ctor
     ~RepositoryIdSeq (void);
     static void _tao_any_destructor (void*);
-
+    
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef RepositoryIdSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-
+    
+    
   };
   
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_REPOSITORYIDSEQ___VAR_CH_)
 #define _IR_REPOSITORYIDSEQ___VAR_CH_
-
+  
   // *************************************************************
   // class IR::RepositoryIdSeq_var
   // *************************************************************
-
+  
   class TAO_IFR_Client_Export RepositoryIdSeq_var
   {
   public:
-    RepositoryIdSeq_var (void); // default constructor
+    RepositoryIdSeq_var (void);
     RepositoryIdSeq_var (RepositoryIdSeq *);
-    RepositoryIdSeq_var (const RepositoryIdSeq_var &); // copy constructor
-    ~RepositoryIdSeq_var (void); // destructor
+    RepositoryIdSeq_var (const RepositoryIdSeq_var &);
+    ~RepositoryIdSeq_var (void);
     
     RepositoryIdSeq_var &operator= (RepositoryIdSeq *);
     RepositoryIdSeq_var &operator= (const RepositoryIdSeq_var &);
@@ -144,18 +145,18 @@ TAO_NAMESPACE  IR
     RepositoryIdSeq *&out (void);
     RepositoryIdSeq *_retn (void);
     RepositoryIdSeq *ptr (void) const;
-
+  
   private:
     RepositoryIdSeq *ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_REPOSITORYIDSEQ___OUT_CH_)
 #define _IR_REPOSITORYIDSEQ___OUT_CH_
-
+  
   class TAO_IFR_Client_Export RepositoryIdSeq_out
   {
   public:
@@ -168,36 +169,36 @@ TAO_NAMESPACE  IR
     RepositoryIdSeq *&ptr (void);
     RepositoryIdSeq *operator-> (void);
     TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-    
+  
   private:
     RepositoryIdSeq *&ptr_;
-    // assignment from T_var not allowed
+    // Assignment from T_var not allowed.
     void operator= (const RepositoryIdSeq_var &);
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
+  
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RepositoryIdSeq;
-
+  
   typedef char * VersionSpec;
   typedef CORBA::String_var VersionSpec_var;
   typedef CORBA::String_out VersionSpec_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_VersionSpec;
-
+  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_VersionSpec;
+  
   class ComponentDef;
   
 #if !defined (_IR_COMPONENTDEF___PTR_CH_)
 #define _IR_COMPONENTDEF___PTR_CH_
-
+  
   typedef ComponentDef *ComponentDef_ptr;
-
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_COMPONENTDEF___VAR_CH_)
 #define _IR_COMPONENTDEF___VAR_CH_
-
+  
   class TAO_IFR_Client_Export ComponentDef_var : public TAO_Base_var
   {
   public:
@@ -224,7 +225,10 @@ TAO_NAMESPACE  IR
     static ComponentDef_ptr duplicate (ComponentDef_ptr);
     static void release (ComponentDef_ptr);
     static ComponentDef_ptr nil (void);
-    static ComponentDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static ComponentDef_ptr narrow (
+        CORBA::Object *,
+        CORBA::Environment &
+      );
     static CORBA::Object * upcast (void *);
   
   private:
@@ -236,11 +240,11 @@ TAO_NAMESPACE  IR
 
 
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_COMPONENTDEF___OUT_CH_)
 #define _IR_COMPONENTDEF___OUT_CH_
-
+  
   class TAO_IFR_Client_Export ComponentDef_out
   {
   public:
@@ -257,57 +261,71 @@ TAO_NAMESPACE  IR
   private:
     ComponentDef_ptr &ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    
+  
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CH_
-
-    class _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-      
-      _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (void);
-      _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (CORBA::ULong maximum);
-      _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (CORBA::ULong maximum,
+  
+  class _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq
+    : public TAO_Unbounded_Base_Sequence
+  {
+  public:
+    // = Initialization and termination methods.
+    _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (void);
+    _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (CORBA::ULong maximum);
+    _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (
+        CORBA::ULong maximum,
         CORBA::ULong length,
         ComponentDef* *value,
-        CORBA::Boolean release = 0);
-      _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &rhs);
-      virtual ~_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (void);
-      _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &rhs);
-      TAO_Object_Manager<IR::ComponentDef,IR::ComponentDef_var> operator[] (CORBA::ULong index) const;
-      static ComponentDef **allocbuf (CORBA::ULong nelems);
-      static void freebuf (ComponentDef **buffer);
-      // The Base_Sequence functions, please see tao/Sequence.h
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      ComponentDef* *get_buffer (CORBA::Boolean orphan = 0);
-      const ComponentDef* *get_buffer (void) const;
-      virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-      virtual void _downcast (
-          void* target,
-          CORBA_Object *src,
-          CORBA_Environment &ACE_TRY_ENV = 
-            TAO_default_environment ()
-        );
-      virtual CORBA_Object* _upcast (void *src) const;
-      
-    };
-
+        CORBA::Boolean release = 0
+      );
+    _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (
+        const _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &rhs
+      );
+    _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &operator= (
+        const _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &rhs
+      );
+    virtual ~_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (void);
+    
+    // = Accessors.
+    TAO_Object_Manager<IR::ComponentDef,IR::ComponentDef_var> operator[] (CORBA::ULong index) const;
+    
+    // = Static operations.
+    static ComponentDef **allocbuf (CORBA::ULong nelems);
+    static void freebuf (ComponentDef **buffer);
+    
+    // Implement the TAO_Base_Sequence methods (see Sequence.h)
+    virtual void _allocate_buffer (CORBA::ULong length);
+    virtual void _deallocate_buffer (void);
+    ComponentDef* *get_buffer (CORBA::Boolean orphan = 0);
+    const ComponentDef* *get_buffer (void) const;
+    virtual void _shrink_buffer (
+        CORBA::ULong nl,
+        CORBA::ULong ol
+      );
+    
+    virtual void _downcast (
+        void* target,
+        CORBA_Object *src,
+        CORBA_Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    virtual CORBA_Object* _upcast (void *src) const;
+  };
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   
 #if !defined (_IR_COMPONENTDEFSEQ_CH_)
 #define _IR_COMPONENTDEFSEQ_CH_
-
+  
   class ComponentDefSeq;
   class ComponentDefSeq_var;
   
@@ -317,47 +335,48 @@ TAO_NAMESPACE  IR
   
   class TAO_IFR_Client_Export ComponentDefSeq : public 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq
+  _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Object_Sequence<ComponentDef,ComponentDef_var>
+  TAO_Unbounded_Object_Sequence<ComponentDef,ComponentDef_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     ComponentDefSeq (void); // default ctor
     ComponentDefSeq (CORBA::ULong max); // uses max size
     ComponentDefSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      ComponentDef_ptr *buffer, 
-      CORBA::Boolean release = 0
-    );
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        ComponentDef_ptr *buffer, 
+        CORBA::Boolean release = 0
+      );
     ComponentDefSeq (const ComponentDefSeq &); // copy ctor
     ~ComponentDefSeq (void);
     static void _tao_any_destructor (void*);
-
+    
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ComponentDefSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-
+    
+    
   };
   
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_COMPONENTDEFSEQ___VAR_CH_)
 #define _IR_COMPONENTDEFSEQ___VAR_CH_
-
+  
   // *************************************************************
   // class IR::ComponentDefSeq_var
   // *************************************************************
-
+  
   class TAO_IFR_Client_Export ComponentDefSeq_var
   {
   public:
-    ComponentDefSeq_var (void); // default constructor
+    ComponentDefSeq_var (void);
     ComponentDefSeq_var (ComponentDefSeq *);
-    ComponentDefSeq_var (const ComponentDefSeq_var &); // copy constructor
-    ~ComponentDefSeq_var (void); // destructor
+    ComponentDefSeq_var (const ComponentDefSeq_var &);
+    ~ComponentDefSeq_var (void);
     
     ComponentDefSeq_var &operator= (ComponentDefSeq *);
     ComponentDefSeq_var &operator= (const ComponentDefSeq_var &);
@@ -377,18 +396,18 @@ TAO_NAMESPACE  IR
     ComponentDefSeq *&out (void);
     ComponentDefSeq *_retn (void);
     ComponentDefSeq *ptr (void) const;
-
+  
   private:
     ComponentDefSeq *ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_COMPONENTDEFSEQ___OUT_CH_)
 #define _IR_COMPONENTDEFSEQ___OUT_CH_
-
+  
   class TAO_IFR_Client_Export ComponentDefSeq_out
   {
   public:
@@ -401,31 +420,31 @@ TAO_NAMESPACE  IR
     ComponentDefSeq *&ptr (void);
     ComponentDefSeq *operator-> (void);
     TAO_Object_Manager<ComponentDef, ComponentDef_var> operator[] (CORBA::ULong index);
-    
+  
   private:
     ComponentDefSeq *&ptr_;
-    // assignment from T_var not allowed
+    // Assignment from T_var not allowed.
     void operator= (const ComponentDefSeq_var &);
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
+  
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ComponentDefSeq;
-
+  
   class ProvidesDef;
   
 #if !defined (_IR_PROVIDESDEF___PTR_CH_)
 #define _IR_PROVIDESDEF___PTR_CH_
-
+  
   typedef ProvidesDef *ProvidesDef_ptr;
-
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_PROVIDESDEF___VAR_CH_)
 #define _IR_PROVIDESDEF___VAR_CH_
-
+  
   class TAO_IFR_Client_Export ProvidesDef_var : public TAO_Base_var
   {
   public:
@@ -452,7 +471,10 @@ TAO_NAMESPACE  IR
     static ProvidesDef_ptr duplicate (ProvidesDef_ptr);
     static void release (ProvidesDef_ptr);
     static ProvidesDef_ptr nil (void);
-    static ProvidesDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static ProvidesDef_ptr narrow (
+        CORBA::Object *,
+        CORBA::Environment &
+      );
     static CORBA::Object * upcast (void *);
   
   private:
@@ -464,11 +486,11 @@ TAO_NAMESPACE  IR
 
 
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_PROVIDESDEF___OUT_CH_)
 #define _IR_PROVIDESDEF___OUT_CH_
-
+  
   class TAO_IFR_Client_Export ProvidesDef_out
   {
   public:
@@ -485,57 +507,71 @@ TAO_NAMESPACE  IR
   private:
     ProvidesDef_ptr &ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    
+  
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CH_
-
-    class _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-      
-      _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (void);
-      _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (CORBA::ULong maximum);
-      _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (CORBA::ULong maximum,
+  
+  class _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq
+    : public TAO_Unbounded_Base_Sequence
+  {
+  public:
+    // = Initialization and termination methods.
+    _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (void);
+    _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (CORBA::ULong maximum);
+    _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (
+        CORBA::ULong maximum,
         CORBA::ULong length,
         ProvidesDef* *value,
-        CORBA::Boolean release = 0);
-      _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &rhs);
-      virtual ~_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (void);
-      _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &rhs);
-      TAO_Object_Manager<IR::ProvidesDef,IR::ProvidesDef_var> operator[] (CORBA::ULong index) const;
-      static ProvidesDef **allocbuf (CORBA::ULong nelems);
-      static void freebuf (ProvidesDef **buffer);
-      // The Base_Sequence functions, please see tao/Sequence.h
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      ProvidesDef* *get_buffer (CORBA::Boolean orphan = 0);
-      const ProvidesDef* *get_buffer (void) const;
-      virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-      virtual void _downcast (
-          void* target,
-          CORBA_Object *src,
-          CORBA_Environment &ACE_TRY_ENV = 
-            TAO_default_environment ()
-        );
-      virtual CORBA_Object* _upcast (void *src) const;
-      
-    };
-
+        CORBA::Boolean release = 0
+      );
+    _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (
+        const _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &rhs
+      );
+    _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &operator= (
+        const _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &rhs
+      );
+    virtual ~_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (void);
+    
+    // = Accessors.
+    TAO_Object_Manager<IR::ProvidesDef,IR::ProvidesDef_var> operator[] (CORBA::ULong index) const;
+    
+    // = Static operations.
+    static ProvidesDef **allocbuf (CORBA::ULong nelems);
+    static void freebuf (ProvidesDef **buffer);
+    
+    // Implement the TAO_Base_Sequence methods (see Sequence.h)
+    virtual void _allocate_buffer (CORBA::ULong length);
+    virtual void _deallocate_buffer (void);
+    ProvidesDef* *get_buffer (CORBA::Boolean orphan = 0);
+    const ProvidesDef* *get_buffer (void) const;
+    virtual void _shrink_buffer (
+        CORBA::ULong nl,
+        CORBA::ULong ol
+      );
+    
+    virtual void _downcast (
+        void* target,
+        CORBA_Object *src,
+        CORBA_Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    virtual CORBA_Object* _upcast (void *src) const;
+  };
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   
 #if !defined (_IR_PROVIDESDEFSEQ_CH_)
 #define _IR_PROVIDESDEFSEQ_CH_
-
+  
   class ProvidesDefSeq;
   class ProvidesDefSeq_var;
   
@@ -545,47 +581,48 @@ TAO_NAMESPACE  IR
   
   class TAO_IFR_Client_Export ProvidesDefSeq : public 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq
+  _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Object_Sequence<ProvidesDef,ProvidesDef_var>
+  TAO_Unbounded_Object_Sequence<ProvidesDef,ProvidesDef_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     ProvidesDefSeq (void); // default ctor
     ProvidesDefSeq (CORBA::ULong max); // uses max size
     ProvidesDefSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      ProvidesDef_ptr *buffer, 
-      CORBA::Boolean release = 0
-    );
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        ProvidesDef_ptr *buffer, 
+        CORBA::Boolean release = 0
+      );
     ProvidesDefSeq (const ProvidesDefSeq &); // copy ctor
     ~ProvidesDefSeq (void);
     static void _tao_any_destructor (void*);
-
+    
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ProvidesDefSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-
+    
+    
   };
   
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_PROVIDESDEFSEQ___VAR_CH_)
 #define _IR_PROVIDESDEFSEQ___VAR_CH_
-
+  
   // *************************************************************
   // class IR::ProvidesDefSeq_var
   // *************************************************************
-
+  
   class TAO_IFR_Client_Export ProvidesDefSeq_var
   {
   public:
-    ProvidesDefSeq_var (void); // default constructor
+    ProvidesDefSeq_var (void);
     ProvidesDefSeq_var (ProvidesDefSeq *);
-    ProvidesDefSeq_var (const ProvidesDefSeq_var &); // copy constructor
-    ~ProvidesDefSeq_var (void); // destructor
+    ProvidesDefSeq_var (const ProvidesDefSeq_var &);
+    ~ProvidesDefSeq_var (void);
     
     ProvidesDefSeq_var &operator= (ProvidesDefSeq *);
     ProvidesDefSeq_var &operator= (const ProvidesDefSeq_var &);
@@ -605,18 +642,18 @@ TAO_NAMESPACE  IR
     ProvidesDefSeq *&out (void);
     ProvidesDefSeq *_retn (void);
     ProvidesDefSeq *ptr (void) const;
-
+  
   private:
     ProvidesDefSeq *ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_PROVIDESDEFSEQ___OUT_CH_)
 #define _IR_PROVIDESDEFSEQ___OUT_CH_
-
+  
   class TAO_IFR_Client_Export ProvidesDefSeq_out
   {
   public:
@@ -629,31 +666,31 @@ TAO_NAMESPACE  IR
     ProvidesDefSeq *&ptr (void);
     ProvidesDefSeq *operator-> (void);
     TAO_Object_Manager<ProvidesDef, ProvidesDef_var> operator[] (CORBA::ULong index);
-    
+  
   private:
     ProvidesDefSeq *&ptr_;
-    // assignment from T_var not allowed
+    // Assignment from T_var not allowed.
     void operator= (const ProvidesDefSeq_var &);
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
+  
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ProvidesDefSeq;
-
+  
   class UsesDef;
   
 #if !defined (_IR_USESDEF___PTR_CH_)
 #define _IR_USESDEF___PTR_CH_
-
+  
   typedef UsesDef *UsesDef_ptr;
-
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_USESDEF___VAR_CH_)
 #define _IR_USESDEF___VAR_CH_
-
+  
   class TAO_IFR_Client_Export UsesDef_var : public TAO_Base_var
   {
   public:
@@ -680,7 +717,10 @@ TAO_NAMESPACE  IR
     static UsesDef_ptr duplicate (UsesDef_ptr);
     static void release (UsesDef_ptr);
     static UsesDef_ptr nil (void);
-    static UsesDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static UsesDef_ptr narrow (
+        CORBA::Object *,
+        CORBA::Environment &
+      );
     static CORBA::Object * upcast (void *);
   
   private:
@@ -692,11 +732,11 @@ TAO_NAMESPACE  IR
 
 
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_USESDEF___OUT_CH_)
 #define _IR_USESDEF___OUT_CH_
-
+  
   class TAO_IFR_Client_Export UsesDef_out
   {
   public:
@@ -713,57 +753,71 @@ TAO_NAMESPACE  IR
   private:
     UsesDef_ptr &ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    
+  
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CH_
-
-    class _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-      
-      _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (void);
-      _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (CORBA::ULong maximum);
-      _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (CORBA::ULong maximum,
+  
+  class _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq
+    : public TAO_Unbounded_Base_Sequence
+  {
+  public:
+    // = Initialization and termination methods.
+    _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (void);
+    _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (CORBA::ULong maximum);
+    _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (
+        CORBA::ULong maximum,
         CORBA::ULong length,
         UsesDef* *value,
-        CORBA::Boolean release = 0);
-      _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &rhs);
-      virtual ~_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (void);
-      _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &rhs);
-      TAO_Object_Manager<IR::UsesDef,IR::UsesDef_var> operator[] (CORBA::ULong index) const;
-      static UsesDef **allocbuf (CORBA::ULong nelems);
-      static void freebuf (UsesDef **buffer);
-      // The Base_Sequence functions, please see tao/Sequence.h
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      UsesDef* *get_buffer (CORBA::Boolean orphan = 0);
-      const UsesDef* *get_buffer (void) const;
-      virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-      virtual void _downcast (
-          void* target,
-          CORBA_Object *src,
-          CORBA_Environment &ACE_TRY_ENV = 
-            TAO_default_environment ()
-        );
-      virtual CORBA_Object* _upcast (void *src) const;
-      
-    };
-
+        CORBA::Boolean release = 0
+      );
+    _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (
+        const _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &rhs
+      );
+    _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &operator= (
+        const _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &rhs
+      );
+    virtual ~_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (void);
+    
+    // = Accessors.
+    TAO_Object_Manager<IR::UsesDef,IR::UsesDef_var> operator[] (CORBA::ULong index) const;
+    
+    // = Static operations.
+    static UsesDef **allocbuf (CORBA::ULong nelems);
+    static void freebuf (UsesDef **buffer);
+    
+    // Implement the TAO_Base_Sequence methods (see Sequence.h)
+    virtual void _allocate_buffer (CORBA::ULong length);
+    virtual void _deallocate_buffer (void);
+    UsesDef* *get_buffer (CORBA::Boolean orphan = 0);
+    const UsesDef* *get_buffer (void) const;
+    virtual void _shrink_buffer (
+        CORBA::ULong nl,
+        CORBA::ULong ol
+      );
+    
+    virtual void _downcast (
+        void* target,
+        CORBA_Object *src,
+        CORBA_Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    virtual CORBA_Object* _upcast (void *src) const;
+  };
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   
 #if !defined (_IR_USESDEFSEQ_CH_)
 #define _IR_USESDEFSEQ_CH_
-
+  
   class UsesDefSeq;
   class UsesDefSeq_var;
   
@@ -773,47 +827,48 @@ TAO_NAMESPACE  IR
   
   class TAO_IFR_Client_Export UsesDefSeq : public 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq
+  _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Object_Sequence<UsesDef,UsesDef_var>
+  TAO_Unbounded_Object_Sequence<UsesDef,UsesDef_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     UsesDefSeq (void); // default ctor
     UsesDefSeq (CORBA::ULong max); // uses max size
     UsesDefSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      UsesDef_ptr *buffer, 
-      CORBA::Boolean release = 0
-    );
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        UsesDef_ptr *buffer, 
+        CORBA::Boolean release = 0
+      );
     UsesDefSeq (const UsesDefSeq &); // copy ctor
     ~UsesDefSeq (void);
     static void _tao_any_destructor (void*);
-
+    
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef UsesDefSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-
+    
+    
   };
   
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_USESDEFSEQ___VAR_CH_)
 #define _IR_USESDEFSEQ___VAR_CH_
-
+  
   // *************************************************************
   // class IR::UsesDefSeq_var
   // *************************************************************
-
+  
   class TAO_IFR_Client_Export UsesDefSeq_var
   {
   public:
-    UsesDefSeq_var (void); // default constructor
+    UsesDefSeq_var (void);
     UsesDefSeq_var (UsesDefSeq *);
-    UsesDefSeq_var (const UsesDefSeq_var &); // copy constructor
-    ~UsesDefSeq_var (void); // destructor
+    UsesDefSeq_var (const UsesDefSeq_var &);
+    ~UsesDefSeq_var (void);
     
     UsesDefSeq_var &operator= (UsesDefSeq *);
     UsesDefSeq_var &operator= (const UsesDefSeq_var &);
@@ -833,18 +888,18 @@ TAO_NAMESPACE  IR
     UsesDefSeq *&out (void);
     UsesDefSeq *_retn (void);
     UsesDefSeq *ptr (void) const;
-
+  
   private:
     UsesDefSeq *ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_USESDEFSEQ___OUT_CH_)
 #define _IR_USESDEFSEQ___OUT_CH_
-
+  
   class TAO_IFR_Client_Export UsesDefSeq_out
   {
   public:
@@ -857,31 +912,31 @@ TAO_NAMESPACE  IR
     UsesDefSeq *&ptr (void);
     UsesDefSeq *operator-> (void);
     TAO_Object_Manager<UsesDef, UsesDef_var> operator[] (CORBA::ULong index);
-    
+  
   private:
     UsesDefSeq *&ptr_;
-    // assignment from T_var not allowed
+    // Assignment from T_var not allowed.
     void operator= (const UsesDefSeq_var &);
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
+  
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UsesDefSeq;
-
+  
   class HomeDef;
   
 #if !defined (_IR_HOMEDEF___PTR_CH_)
 #define _IR_HOMEDEF___PTR_CH_
-
+  
   typedef HomeDef *HomeDef_ptr;
-
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_HOMEDEF___VAR_CH_)
 #define _IR_HOMEDEF___VAR_CH_
-
+  
   class TAO_IFR_Client_Export HomeDef_var : public TAO_Base_var
   {
   public:
@@ -908,7 +963,10 @@ TAO_NAMESPACE  IR
     static HomeDef_ptr duplicate (HomeDef_ptr);
     static void release (HomeDef_ptr);
     static HomeDef_ptr nil (void);
-    static HomeDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static HomeDef_ptr narrow (
+        CORBA::Object *,
+        CORBA::Environment &
+      );
     static CORBA::Object * upcast (void *);
   
   private:
@@ -920,11 +978,11 @@ TAO_NAMESPACE  IR
 
 
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_HOMEDEF___OUT_CH_)
 #define _IR_HOMEDEF___OUT_CH_
-
+  
   class TAO_IFR_Client_Export HomeDef_out
   {
   public:
@@ -941,57 +999,71 @@ TAO_NAMESPACE  IR
   private:
     HomeDef_ptr &ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    
+  
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CH_
-
-    class _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-      
-      _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (void);
-      _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (CORBA::ULong maximum);
-      _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (CORBA::ULong maximum,
+  
+  class _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq
+    : public TAO_Unbounded_Base_Sequence
+  {
+  public:
+    // = Initialization and termination methods.
+    _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (void);
+    _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (CORBA::ULong maximum);
+    _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (
+        CORBA::ULong maximum,
         CORBA::ULong length,
         HomeDef* *value,
-        CORBA::Boolean release = 0);
-      _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq(const _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &rhs);
-      virtual ~_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (void);
-      _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &rhs);
-      TAO_Object_Manager<IR::HomeDef,IR::HomeDef_var> operator[] (CORBA::ULong index) const;
-      static HomeDef **allocbuf (CORBA::ULong nelems);
-      static void freebuf (HomeDef **buffer);
-      // The Base_Sequence functions, please see tao/Sequence.h
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      HomeDef* *get_buffer (CORBA::Boolean orphan = 0);
-      const HomeDef* *get_buffer (void) const;
-      virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-      virtual void _downcast (
-          void* target,
-          CORBA_Object *src,
-          CORBA_Environment &ACE_TRY_ENV = 
-            TAO_default_environment ()
-        );
-      virtual CORBA_Object* _upcast (void *src) const;
-      
-    };
-
+        CORBA::Boolean release = 0
+      );
+    _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (
+        const _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &rhs
+      );
+    _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &operator= (
+        const _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &rhs
+      );
+    virtual ~_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (void);
+    
+    // = Accessors.
+    TAO_Object_Manager<IR::HomeDef,IR::HomeDef_var> operator[] (CORBA::ULong index) const;
+    
+    // = Static operations.
+    static HomeDef **allocbuf (CORBA::ULong nelems);
+    static void freebuf (HomeDef **buffer);
+    
+    // Implement the TAO_Base_Sequence methods (see Sequence.h)
+    virtual void _allocate_buffer (CORBA::ULong length);
+    virtual void _deallocate_buffer (void);
+    HomeDef* *get_buffer (CORBA::Boolean orphan = 0);
+    const HomeDef* *get_buffer (void) const;
+    virtual void _shrink_buffer (
+        CORBA::ULong nl,
+        CORBA::ULong ol
+      );
+    
+    virtual void _downcast (
+        void* target,
+        CORBA_Object *src,
+        CORBA_Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    virtual CORBA_Object* _upcast (void *src) const;
+  };
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   
 #if !defined (_IR_HOMEDEFSEQ_CH_)
 #define _IR_HOMEDEFSEQ_CH_
-
+  
   class HomeDefSeq;
   class HomeDefSeq_var;
   
@@ -1001,47 +1073,48 @@ TAO_NAMESPACE  IR
   
   class TAO_IFR_Client_Export HomeDefSeq : public 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq
+  _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Object_Sequence<HomeDef,HomeDef_var>
+  TAO_Unbounded_Object_Sequence<HomeDef,HomeDef_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     HomeDefSeq (void); // default ctor
     HomeDefSeq (CORBA::ULong max); // uses max size
     HomeDefSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      HomeDef_ptr *buffer, 
-      CORBA::Boolean release = 0
-    );
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        HomeDef_ptr *buffer, 
+        CORBA::Boolean release = 0
+      );
     HomeDefSeq (const HomeDefSeq &); // copy ctor
     ~HomeDefSeq (void);
     static void _tao_any_destructor (void*);
-
+    
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef HomeDefSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-
+    
+    
   };
   
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_HOMEDEFSEQ___VAR_CH_)
 #define _IR_HOMEDEFSEQ___VAR_CH_
-
+  
   // *************************************************************
   // class IR::HomeDefSeq_var
   // *************************************************************
-
+  
   class TAO_IFR_Client_Export HomeDefSeq_var
   {
   public:
-    HomeDefSeq_var (void); // default constructor
+    HomeDefSeq_var (void);
     HomeDefSeq_var (HomeDefSeq *);
-    HomeDefSeq_var (const HomeDefSeq_var &); // copy constructor
-    ~HomeDefSeq_var (void); // destructor
+    HomeDefSeq_var (const HomeDefSeq_var &);
+    ~HomeDefSeq_var (void);
     
     HomeDefSeq_var &operator= (HomeDefSeq *);
     HomeDefSeq_var &operator= (const HomeDefSeq_var &);
@@ -1061,18 +1134,18 @@ TAO_NAMESPACE  IR
     HomeDefSeq *&out (void);
     HomeDefSeq *_retn (void);
     HomeDefSeq *ptr (void) const;
-
+  
   private:
     HomeDefSeq *ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_HOMEDEFSEQ___OUT_CH_)
 #define _IR_HOMEDEFSEQ___OUT_CH_
-
+  
   class TAO_IFR_Client_Export HomeDefSeq_out
   {
   public:
@@ -1085,31 +1158,31 @@ TAO_NAMESPACE  IR
     HomeDefSeq *&ptr (void);
     HomeDefSeq *operator-> (void);
     TAO_Object_Manager<HomeDef, HomeDef_var> operator[] (CORBA::ULong index);
-    
+  
   private:
     HomeDefSeq *&ptr_;
-    // assignment from T_var not allowed
+    // Assignment from T_var not allowed.
     void operator= (const HomeDefSeq_var &);
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
+  
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_HomeDefSeq;
-
+  
   class EventDef;
   
 #if !defined (_IR_EVENTDEF___PTR_CH_)
 #define _IR_EVENTDEF___PTR_CH_
-
+  
   typedef EventDef *EventDef_ptr;
-
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_EVENTDEF___VAR_CH_)
 #define _IR_EVENTDEF___VAR_CH_
-
+  
   class TAO_IFR_Client_Export EventDef_var : public TAO_Base_var
   {
   public:
@@ -1136,7 +1209,10 @@ TAO_NAMESPACE  IR
     static EventDef_ptr duplicate (EventDef_ptr);
     static void release (EventDef_ptr);
     static EventDef_ptr nil (void);
-    static EventDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static EventDef_ptr narrow (
+        CORBA::Object *,
+        CORBA::Environment &
+      );
     static CORBA::Object * upcast (void *);
   
   private:
@@ -1148,11 +1224,11 @@ TAO_NAMESPACE  IR
 
 
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_EVENTDEF___OUT_CH_)
 #define _IR_EVENTDEF___OUT_CH_
-
+  
   class TAO_IFR_Client_Export EventDef_out
   {
   public:
@@ -1169,23 +1245,23 @@ TAO_NAMESPACE  IR
   private:
     EventDef_ptr &ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
+  
   class EmitsDef;
   
 #if !defined (_IR_EMITSDEF___PTR_CH_)
 #define _IR_EMITSDEF___PTR_CH_
-
+  
   typedef EmitsDef *EmitsDef_ptr;
-
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_EMITSDEF___VAR_CH_)
 #define _IR_EMITSDEF___VAR_CH_
-
+  
   class TAO_IFR_Client_Export EmitsDef_var : public TAO_Base_var
   {
   public:
@@ -1212,7 +1288,10 @@ TAO_NAMESPACE  IR
     static EmitsDef_ptr duplicate (EmitsDef_ptr);
     static void release (EmitsDef_ptr);
     static EmitsDef_ptr nil (void);
-    static EmitsDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static EmitsDef_ptr narrow (
+        CORBA::Object *,
+        CORBA::Environment &
+      );
     static CORBA::Object * upcast (void *);
   
   private:
@@ -1224,11 +1303,11 @@ TAO_NAMESPACE  IR
 
 
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_EMITSDEF___OUT_CH_)
 #define _IR_EMITSDEF___OUT_CH_
-
+  
   class TAO_IFR_Client_Export EmitsDef_out
   {
   public:
@@ -1245,57 +1324,71 @@ TAO_NAMESPACE  IR
   private:
     EmitsDef_ptr &ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    
+  
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CH_
-
-    class _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-      
-      _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (void);
-      _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (CORBA::ULong maximum);
-      _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (CORBA::ULong maximum,
+  
+  class _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq
+    : public TAO_Unbounded_Base_Sequence
+  {
+  public:
+    // = Initialization and termination methods.
+    _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (void);
+    _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (CORBA::ULong maximum);
+    _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (
+        CORBA::ULong maximum,
         CORBA::ULong length,
         EmitsDef* *value,
-        CORBA::Boolean release = 0);
-      _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq(const _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &rhs);
-      virtual ~_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (void);
-      _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &rhs);
-      TAO_Object_Manager<IR::EmitsDef,IR::EmitsDef_var> operator[] (CORBA::ULong index) const;
-      static EmitsDef **allocbuf (CORBA::ULong nelems);
-      static void freebuf (EmitsDef **buffer);
-      // The Base_Sequence functions, please see tao/Sequence.h
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      EmitsDef* *get_buffer (CORBA::Boolean orphan = 0);
-      const EmitsDef* *get_buffer (void) const;
-      virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-      virtual void _downcast (
-          void* target,
-          CORBA_Object *src,
-          CORBA_Environment &ACE_TRY_ENV = 
-            TAO_default_environment ()
-        );
-      virtual CORBA_Object* _upcast (void *src) const;
-      
-    };
-
+        CORBA::Boolean release = 0
+      );
+    _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (
+        const _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &rhs
+      );
+    _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &operator= (
+        const _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &rhs
+      );
+    virtual ~_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (void);
+    
+    // = Accessors.
+    TAO_Object_Manager<IR::EmitsDef,IR::EmitsDef_var> operator[] (CORBA::ULong index) const;
+    
+    // = Static operations.
+    static EmitsDef **allocbuf (CORBA::ULong nelems);
+    static void freebuf (EmitsDef **buffer);
+    
+    // Implement the TAO_Base_Sequence methods (see Sequence.h)
+    virtual void _allocate_buffer (CORBA::ULong length);
+    virtual void _deallocate_buffer (void);
+    EmitsDef* *get_buffer (CORBA::Boolean orphan = 0);
+    const EmitsDef* *get_buffer (void) const;
+    virtual void _shrink_buffer (
+        CORBA::ULong nl,
+        CORBA::ULong ol
+      );
+    
+    virtual void _downcast (
+        void* target,
+        CORBA_Object *src,
+        CORBA_Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    virtual CORBA_Object* _upcast (void *src) const;
+  };
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   
 #if !defined (_IR_EMITSDEFSEQ_CH_)
 #define _IR_EMITSDEFSEQ_CH_
-
+  
   class EmitsDefSeq;
   class EmitsDefSeq_var;
   
@@ -1305,47 +1398,48 @@ TAO_NAMESPACE  IR
   
   class TAO_IFR_Client_Export EmitsDefSeq : public 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq
+  _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Object_Sequence<EmitsDef,EmitsDef_var>
+  TAO_Unbounded_Object_Sequence<EmitsDef,EmitsDef_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     EmitsDefSeq (void); // default ctor
     EmitsDefSeq (CORBA::ULong max); // uses max size
     EmitsDefSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      EmitsDef_ptr *buffer, 
-      CORBA::Boolean release = 0
-    );
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        EmitsDef_ptr *buffer, 
+        CORBA::Boolean release = 0
+      );
     EmitsDefSeq (const EmitsDefSeq &); // copy ctor
     ~EmitsDefSeq (void);
     static void _tao_any_destructor (void*);
-
+    
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef EmitsDefSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-
+    
+    
   };
   
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_EMITSDEFSEQ___VAR_CH_)
 #define _IR_EMITSDEFSEQ___VAR_CH_
-
+  
   // *************************************************************
   // class IR::EmitsDefSeq_var
   // *************************************************************
-
+  
   class TAO_IFR_Client_Export EmitsDefSeq_var
   {
   public:
-    EmitsDefSeq_var (void); // default constructor
+    EmitsDefSeq_var (void);
     EmitsDefSeq_var (EmitsDefSeq *);
-    EmitsDefSeq_var (const EmitsDefSeq_var &); // copy constructor
-    ~EmitsDefSeq_var (void); // destructor
+    EmitsDefSeq_var (const EmitsDefSeq_var &);
+    ~EmitsDefSeq_var (void);
     
     EmitsDefSeq_var &operator= (EmitsDefSeq *);
     EmitsDefSeq_var &operator= (const EmitsDefSeq_var &);
@@ -1365,18 +1459,18 @@ TAO_NAMESPACE  IR
     EmitsDefSeq *&out (void);
     EmitsDefSeq *_retn (void);
     EmitsDefSeq *ptr (void) const;
-
+  
   private:
     EmitsDefSeq *ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_EMITSDEFSEQ___OUT_CH_)
 #define _IR_EMITSDEFSEQ___OUT_CH_
-
+  
   class TAO_IFR_Client_Export EmitsDefSeq_out
   {
   public:
@@ -1389,31 +1483,31 @@ TAO_NAMESPACE  IR
     EmitsDefSeq *&ptr (void);
     EmitsDefSeq *operator-> (void);
     TAO_Object_Manager<EmitsDef, EmitsDef_var> operator[] (CORBA::ULong index);
-    
+  
   private:
     EmitsDefSeq *&ptr_;
-    // assignment from T_var not allowed
+    // Assignment from T_var not allowed.
     void operator= (const EmitsDefSeq_var &);
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
+  
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EmitsDefSeq;
-
+  
   class PublishesDef;
   
 #if !defined (_IR_PUBLISHESDEF___PTR_CH_)
 #define _IR_PUBLISHESDEF___PTR_CH_
-
+  
   typedef PublishesDef *PublishesDef_ptr;
-
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_PUBLISHESDEF___VAR_CH_)
 #define _IR_PUBLISHESDEF___VAR_CH_
-
+  
   class TAO_IFR_Client_Export PublishesDef_var : public TAO_Base_var
   {
   public:
@@ -1440,7 +1534,10 @@ TAO_NAMESPACE  IR
     static PublishesDef_ptr duplicate (PublishesDef_ptr);
     static void release (PublishesDef_ptr);
     static PublishesDef_ptr nil (void);
-    static PublishesDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static PublishesDef_ptr narrow (
+        CORBA::Object *,
+        CORBA::Environment &
+      );
     static CORBA::Object * upcast (void *);
   
   private:
@@ -1452,11 +1549,11 @@ TAO_NAMESPACE  IR
 
 
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_PUBLISHESDEF___OUT_CH_)
 #define _IR_PUBLISHESDEF___OUT_CH_
-
+  
   class TAO_IFR_Client_Export PublishesDef_out
   {
   public:
@@ -1473,57 +1570,71 @@ TAO_NAMESPACE  IR
   private:
     PublishesDef_ptr &ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    
+  
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CH_
-
-    class _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-      
-      _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (void);
-      _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (CORBA::ULong maximum);
-      _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (CORBA::ULong maximum,
+  
+  class _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq
+    : public TAO_Unbounded_Base_Sequence
+  {
+  public:
+    // = Initialization and termination methods.
+    _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (void);
+    _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (CORBA::ULong maximum);
+    _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (
+        CORBA::ULong maximum,
         CORBA::ULong length,
         PublishesDef* *value,
-        CORBA::Boolean release = 0);
-      _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &rhs);
-      virtual ~_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (void);
-      _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &rhs);
-      TAO_Object_Manager<IR::PublishesDef,IR::PublishesDef_var> operator[] (CORBA::ULong index) const;
-      static PublishesDef **allocbuf (CORBA::ULong nelems);
-      static void freebuf (PublishesDef **buffer);
-      // The Base_Sequence functions, please see tao/Sequence.h
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      PublishesDef* *get_buffer (CORBA::Boolean orphan = 0);
-      const PublishesDef* *get_buffer (void) const;
-      virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-      virtual void _downcast (
-          void* target,
-          CORBA_Object *src,
-          CORBA_Environment &ACE_TRY_ENV = 
-            TAO_default_environment ()
-        );
-      virtual CORBA_Object* _upcast (void *src) const;
-      
-    };
-
+        CORBA::Boolean release = 0
+      );
+    _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (
+        const _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &rhs
+      );
+    _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &operator= (
+        const _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &rhs
+      );
+    virtual ~_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (void);
+    
+    // = Accessors.
+    TAO_Object_Manager<IR::PublishesDef,IR::PublishesDef_var> operator[] (CORBA::ULong index) const;
+    
+    // = Static operations.
+    static PublishesDef **allocbuf (CORBA::ULong nelems);
+    static void freebuf (PublishesDef **buffer);
+    
+    // Implement the TAO_Base_Sequence methods (see Sequence.h)
+    virtual void _allocate_buffer (CORBA::ULong length);
+    virtual void _deallocate_buffer (void);
+    PublishesDef* *get_buffer (CORBA::Boolean orphan = 0);
+    const PublishesDef* *get_buffer (void) const;
+    virtual void _shrink_buffer (
+        CORBA::ULong nl,
+        CORBA::ULong ol
+      );
+    
+    virtual void _downcast (
+        void* target,
+        CORBA_Object *src,
+        CORBA_Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    virtual CORBA_Object* _upcast (void *src) const;
+  };
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   
 #if !defined (_IR_PUBLISHESDEFSEQ_CH_)
 #define _IR_PUBLISHESDEFSEQ_CH_
-
+  
   class PublishesDefSeq;
   class PublishesDefSeq_var;
   
@@ -1533,47 +1644,48 @@ TAO_NAMESPACE  IR
   
   class TAO_IFR_Client_Export PublishesDefSeq : public 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq
+  _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Object_Sequence<PublishesDef,PublishesDef_var>
+  TAO_Unbounded_Object_Sequence<PublishesDef,PublishesDef_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     PublishesDefSeq (void); // default ctor
     PublishesDefSeq (CORBA::ULong max); // uses max size
     PublishesDefSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      PublishesDef_ptr *buffer, 
-      CORBA::Boolean release = 0
-    );
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        PublishesDef_ptr *buffer, 
+        CORBA::Boolean release = 0
+      );
     PublishesDefSeq (const PublishesDefSeq &); // copy ctor
     ~PublishesDefSeq (void);
     static void _tao_any_destructor (void*);
-
+    
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef PublishesDefSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-
+    
+    
   };
   
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_PUBLISHESDEFSEQ___VAR_CH_)
 #define _IR_PUBLISHESDEFSEQ___VAR_CH_
-
+  
   // *************************************************************
   // class IR::PublishesDefSeq_var
   // *************************************************************
-
+  
   class TAO_IFR_Client_Export PublishesDefSeq_var
   {
   public:
-    PublishesDefSeq_var (void); // default constructor
+    PublishesDefSeq_var (void);
     PublishesDefSeq_var (PublishesDefSeq *);
-    PublishesDefSeq_var (const PublishesDefSeq_var &); // copy constructor
-    ~PublishesDefSeq_var (void); // destructor
+    PublishesDefSeq_var (const PublishesDefSeq_var &);
+    ~PublishesDefSeq_var (void);
     
     PublishesDefSeq_var &operator= (PublishesDefSeq *);
     PublishesDefSeq_var &operator= (const PublishesDefSeq_var &);
@@ -1593,18 +1705,18 @@ TAO_NAMESPACE  IR
     PublishesDefSeq *&out (void);
     PublishesDefSeq *_retn (void);
     PublishesDefSeq *ptr (void) const;
-
+  
   private:
     PublishesDefSeq *ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_PUBLISHESDEFSEQ___OUT_CH_)
 #define _IR_PUBLISHESDEFSEQ___OUT_CH_
-
+  
   class TAO_IFR_Client_Export PublishesDefSeq_out
   {
   public:
@@ -1617,31 +1729,31 @@ TAO_NAMESPACE  IR
     PublishesDefSeq *&ptr (void);
     PublishesDefSeq *operator-> (void);
     TAO_Object_Manager<PublishesDef, PublishesDef_var> operator[] (CORBA::ULong index);
-    
+  
   private:
     PublishesDefSeq *&ptr_;
-    // assignment from T_var not allowed
+    // Assignment from T_var not allowed.
     void operator= (const PublishesDefSeq_var &);
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
+  
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PublishesDefSeq;
-
+  
   class ConsumesDef;
   
 #if !defined (_IR_CONSUMESDEF___PTR_CH_)
 #define _IR_CONSUMESDEF___PTR_CH_
-
+  
   typedef ConsumesDef *ConsumesDef_ptr;
-
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_CONSUMESDEF___VAR_CH_)
 #define _IR_CONSUMESDEF___VAR_CH_
-
+  
   class TAO_IFR_Client_Export ConsumesDef_var : public TAO_Base_var
   {
   public:
@@ -1668,7 +1780,10 @@ TAO_NAMESPACE  IR
     static ConsumesDef_ptr duplicate (ConsumesDef_ptr);
     static void release (ConsumesDef_ptr);
     static ConsumesDef_ptr nil (void);
-    static ConsumesDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static ConsumesDef_ptr narrow (
+        CORBA::Object *,
+        CORBA::Environment &
+      );
     static CORBA::Object * upcast (void *);
   
   private:
@@ -1680,11 +1795,11 @@ TAO_NAMESPACE  IR
 
 
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_CONSUMESDEF___OUT_CH_)
 #define _IR_CONSUMESDEF___OUT_CH_
-
+  
   class TAO_IFR_Client_Export ConsumesDef_out
   {
   public:
@@ -1701,57 +1816,71 @@ TAO_NAMESPACE  IR
   private:
     ConsumesDef_ptr &ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    
+  
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CH_
-
-    class _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-      
-      _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (void);
-      _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (CORBA::ULong maximum);
-      _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (CORBA::ULong maximum,
+  
+  class _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq
+    : public TAO_Unbounded_Base_Sequence
+  {
+  public:
+    // = Initialization and termination methods.
+    _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (void);
+    _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (CORBA::ULong maximum);
+    _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (
+        CORBA::ULong maximum,
         CORBA::ULong length,
         ConsumesDef* *value,
-        CORBA::Boolean release = 0);
-      _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &rhs);
-      virtual ~_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (void);
-      _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &rhs);
-      TAO_Object_Manager<IR::ConsumesDef,IR::ConsumesDef_var> operator[] (CORBA::ULong index) const;
-      static ConsumesDef **allocbuf (CORBA::ULong nelems);
-      static void freebuf (ConsumesDef **buffer);
-      // The Base_Sequence functions, please see tao/Sequence.h
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      ConsumesDef* *get_buffer (CORBA::Boolean orphan = 0);
-      const ConsumesDef* *get_buffer (void) const;
-      virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-      virtual void _downcast (
-          void* target,
-          CORBA_Object *src,
-          CORBA_Environment &ACE_TRY_ENV = 
-            TAO_default_environment ()
-        );
-      virtual CORBA_Object* _upcast (void *src) const;
-      
-    };
-
+        CORBA::Boolean release = 0
+      );
+    _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (
+        const _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &rhs
+      );
+    _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &operator= (
+        const _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &rhs
+      );
+    virtual ~_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (void);
+    
+    // = Accessors.
+    TAO_Object_Manager<IR::ConsumesDef,IR::ConsumesDef_var> operator[] (CORBA::ULong index) const;
+    
+    // = Static operations.
+    static ConsumesDef **allocbuf (CORBA::ULong nelems);
+    static void freebuf (ConsumesDef **buffer);
+    
+    // Implement the TAO_Base_Sequence methods (see Sequence.h)
+    virtual void _allocate_buffer (CORBA::ULong length);
+    virtual void _deallocate_buffer (void);
+    ConsumesDef* *get_buffer (CORBA::Boolean orphan = 0);
+    const ConsumesDef* *get_buffer (void) const;
+    virtual void _shrink_buffer (
+        CORBA::ULong nl,
+        CORBA::ULong ol
+      );
+    
+    virtual void _downcast (
+        void* target,
+        CORBA_Object *src,
+        CORBA_Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    virtual CORBA_Object* _upcast (void *src) const;
+  };
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   
 #if !defined (_IR_CONSUMESDEFSEQ_CH_)
 #define _IR_CONSUMESDEFSEQ_CH_
-
+  
   class ConsumesDefSeq;
   class ConsumesDefSeq_var;
   
@@ -1761,47 +1890,48 @@ TAO_NAMESPACE  IR
   
   class TAO_IFR_Client_Export ConsumesDefSeq : public 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq
+  _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Object_Sequence<ConsumesDef,ConsumesDef_var>
+  TAO_Unbounded_Object_Sequence<ConsumesDef,ConsumesDef_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     ConsumesDefSeq (void); // default ctor
     ConsumesDefSeq (CORBA::ULong max); // uses max size
     ConsumesDefSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      ConsumesDef_ptr *buffer, 
-      CORBA::Boolean release = 0
-    );
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        ConsumesDef_ptr *buffer, 
+        CORBA::Boolean release = 0
+      );
     ConsumesDefSeq (const ConsumesDefSeq &); // copy ctor
     ~ConsumesDefSeq (void);
     static void _tao_any_destructor (void*);
-
+    
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ConsumesDefSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-
+    
+    
   };
   
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_CONSUMESDEFSEQ___VAR_CH_)
 #define _IR_CONSUMESDEFSEQ___VAR_CH_
-
+  
   // *************************************************************
   // class IR::ConsumesDefSeq_var
   // *************************************************************
-
+  
   class TAO_IFR_Client_Export ConsumesDefSeq_var
   {
   public:
-    ConsumesDefSeq_var (void); // default constructor
+    ConsumesDefSeq_var (void);
     ConsumesDefSeq_var (ConsumesDefSeq *);
-    ConsumesDefSeq_var (const ConsumesDefSeq_var &); // copy constructor
-    ~ConsumesDefSeq_var (void); // destructor
+    ConsumesDefSeq_var (const ConsumesDefSeq_var &);
+    ~ConsumesDefSeq_var (void);
     
     ConsumesDefSeq_var &operator= (ConsumesDefSeq *);
     ConsumesDefSeq_var &operator= (const ConsumesDefSeq_var &);
@@ -1821,18 +1951,18 @@ TAO_NAMESPACE  IR
     ConsumesDefSeq *&out (void);
     ConsumesDefSeq *_retn (void);
     ConsumesDefSeq *ptr (void) const;
-
+  
   private:
     ConsumesDefSeq *ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_CONSUMESDEFSEQ___OUT_CH_)
 #define _IR_CONSUMESDEFSEQ___OUT_CH_
-
+  
   class TAO_IFR_Client_Export ConsumesDefSeq_out
   {
   public:
@@ -1845,31 +1975,31 @@ TAO_NAMESPACE  IR
     ConsumesDefSeq *&ptr (void);
     ConsumesDefSeq *operator-> (void);
     TAO_Object_Manager<ConsumesDef, ConsumesDef_var> operator[] (CORBA::ULong index);
-    
+  
   private:
     ConsumesDefSeq *&ptr_;
-    // assignment from T_var not allowed
+    // Assignment from T_var not allowed.
     void operator= (const ConsumesDefSeq_var &);
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
+  
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ConsumesDefSeq;
-
+  
   class FactoryDef;
   
 #if !defined (_IR_FACTORYDEF___PTR_CH_)
 #define _IR_FACTORYDEF___PTR_CH_
-
+  
   typedef FactoryDef *FactoryDef_ptr;
-
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_FACTORYDEF___VAR_CH_)
 #define _IR_FACTORYDEF___VAR_CH_
-
+  
   class TAO_IFR_Client_Export FactoryDef_var : public TAO_Base_var
   {
   public:
@@ -1896,7 +2026,10 @@ TAO_NAMESPACE  IR
     static FactoryDef_ptr duplicate (FactoryDef_ptr);
     static void release (FactoryDef_ptr);
     static FactoryDef_ptr nil (void);
-    static FactoryDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static FactoryDef_ptr narrow (
+        CORBA::Object *,
+        CORBA::Environment &
+      );
     static CORBA::Object * upcast (void *);
   
   private:
@@ -1908,11 +2041,11 @@ TAO_NAMESPACE  IR
 
 
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_FACTORYDEF___OUT_CH_)
 #define _IR_FACTORYDEF___OUT_CH_
-
+  
   class TAO_IFR_Client_Export FactoryDef_out
   {
   public:
@@ -1929,57 +2062,71 @@ TAO_NAMESPACE  IR
   private:
     FactoryDef_ptr &ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    
+  
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CH_
-
-    class _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-      
-      _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (void);
-      _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (CORBA::ULong maximum);
-      _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (CORBA::ULong maximum,
+  
+  class _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq
+    : public TAO_Unbounded_Base_Sequence
+  {
+  public:
+    // = Initialization and termination methods.
+    _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (void);
+    _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (CORBA::ULong maximum);
+    _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (
+        CORBA::ULong maximum,
         CORBA::ULong length,
         FactoryDef* *value,
-        CORBA::Boolean release = 0);
-      _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq(const _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &rhs);
-      virtual ~_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (void);
-      _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &rhs);
-      TAO_Object_Manager<IR::FactoryDef,IR::FactoryDef_var> operator[] (CORBA::ULong index) const;
-      static FactoryDef **allocbuf (CORBA::ULong nelems);
-      static void freebuf (FactoryDef **buffer);
-      // The Base_Sequence functions, please see tao/Sequence.h
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      FactoryDef* *get_buffer (CORBA::Boolean orphan = 0);
-      const FactoryDef* *get_buffer (void) const;
-      virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-      virtual void _downcast (
-          void* target,
-          CORBA_Object *src,
-          CORBA_Environment &ACE_TRY_ENV = 
-            TAO_default_environment ()
-        );
-      virtual CORBA_Object* _upcast (void *src) const;
-      
-    };
-
+        CORBA::Boolean release = 0
+      );
+    _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (
+        const _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &rhs
+      );
+    _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &operator= (
+        const _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &rhs
+      );
+    virtual ~_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (void);
+    
+    // = Accessors.
+    TAO_Object_Manager<IR::FactoryDef,IR::FactoryDef_var> operator[] (CORBA::ULong index) const;
+    
+    // = Static operations.
+    static FactoryDef **allocbuf (CORBA::ULong nelems);
+    static void freebuf (FactoryDef **buffer);
+    
+    // Implement the TAO_Base_Sequence methods (see Sequence.h)
+    virtual void _allocate_buffer (CORBA::ULong length);
+    virtual void _deallocate_buffer (void);
+    FactoryDef* *get_buffer (CORBA::Boolean orphan = 0);
+    const FactoryDef* *get_buffer (void) const;
+    virtual void _shrink_buffer (
+        CORBA::ULong nl,
+        CORBA::ULong ol
+      );
+    
+    virtual void _downcast (
+        void* target,
+        CORBA_Object *src,
+        CORBA_Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    virtual CORBA_Object* _upcast (void *src) const;
+  };
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   
 #if !defined (_IR_FACTORYDEFSEQ_CH_)
 #define _IR_FACTORYDEFSEQ_CH_
-
+  
   class FactoryDefSeq;
   class FactoryDefSeq_var;
   
@@ -1989,47 +2136,48 @@ TAO_NAMESPACE  IR
   
   class TAO_IFR_Client_Export FactoryDefSeq : public 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq
+  _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Object_Sequence<FactoryDef,FactoryDef_var>
+  TAO_Unbounded_Object_Sequence<FactoryDef,FactoryDef_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     FactoryDefSeq (void); // default ctor
     FactoryDefSeq (CORBA::ULong max); // uses max size
     FactoryDefSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      FactoryDef_ptr *buffer, 
-      CORBA::Boolean release = 0
-    );
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        FactoryDef_ptr *buffer, 
+        CORBA::Boolean release = 0
+      );
     FactoryDefSeq (const FactoryDefSeq &); // copy ctor
     ~FactoryDefSeq (void);
     static void _tao_any_destructor (void*);
-
+    
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef FactoryDefSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-
+    
+    
   };
   
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_FACTORYDEFSEQ___VAR_CH_)
 #define _IR_FACTORYDEFSEQ___VAR_CH_
-
+  
   // *************************************************************
   // class IR::FactoryDefSeq_var
   // *************************************************************
-
+  
   class TAO_IFR_Client_Export FactoryDefSeq_var
   {
   public:
-    FactoryDefSeq_var (void); // default constructor
+    FactoryDefSeq_var (void);
     FactoryDefSeq_var (FactoryDefSeq *);
-    FactoryDefSeq_var (const FactoryDefSeq_var &); // copy constructor
-    ~FactoryDefSeq_var (void); // destructor
+    FactoryDefSeq_var (const FactoryDefSeq_var &);
+    ~FactoryDefSeq_var (void);
     
     FactoryDefSeq_var &operator= (FactoryDefSeq *);
     FactoryDefSeq_var &operator= (const FactoryDefSeq_var &);
@@ -2049,18 +2197,18 @@ TAO_NAMESPACE  IR
     FactoryDefSeq *&out (void);
     FactoryDefSeq *_retn (void);
     FactoryDefSeq *ptr (void) const;
-
+  
   private:
     FactoryDefSeq *ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_FACTORYDEFSEQ___OUT_CH_)
 #define _IR_FACTORYDEFSEQ___OUT_CH_
-
+  
   class TAO_IFR_Client_Export FactoryDefSeq_out
   {
   public:
@@ -2073,31 +2221,31 @@ TAO_NAMESPACE  IR
     FactoryDefSeq *&ptr (void);
     FactoryDefSeq *operator-> (void);
     TAO_Object_Manager<FactoryDef, FactoryDef_var> operator[] (CORBA::ULong index);
-    
+  
   private:
     FactoryDefSeq *&ptr_;
-    // assignment from T_var not allowed
+    // Assignment from T_var not allowed.
     void operator= (const FactoryDefSeq_var &);
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
+  
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_FactoryDefSeq;
-
+  
   class FinderDef;
   
 #if !defined (_IR_FINDERDEF___PTR_CH_)
 #define _IR_FINDERDEF___PTR_CH_
-
+  
   typedef FinderDef *FinderDef_ptr;
-
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_FINDERDEF___VAR_CH_)
 #define _IR_FINDERDEF___VAR_CH_
-
+  
   class TAO_IFR_Client_Export FinderDef_var : public TAO_Base_var
   {
   public:
@@ -2124,7 +2272,10 @@ TAO_NAMESPACE  IR
     static FinderDef_ptr duplicate (FinderDef_ptr);
     static void release (FinderDef_ptr);
     static FinderDef_ptr nil (void);
-    static FinderDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static FinderDef_ptr narrow (
+        CORBA::Object *,
+        CORBA::Environment &
+      );
     static CORBA::Object * upcast (void *);
   
   private:
@@ -2136,11 +2287,11 @@ TAO_NAMESPACE  IR
 
 
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_FINDERDEF___OUT_CH_)
 #define _IR_FINDERDEF___OUT_CH_
-
+  
   class TAO_IFR_Client_Export FinderDef_out
   {
   public:
@@ -2157,57 +2308,71 @@ TAO_NAMESPACE  IR
   private:
     FinderDef_ptr &ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    
+  
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CH_
-
-    class _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-      
-      _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (void);
-      _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (CORBA::ULong maximum);
-      _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (CORBA::ULong maximum,
+  
+  class _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq
+    : public TAO_Unbounded_Base_Sequence
+  {
+  public:
+    // = Initialization and termination methods.
+    _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (void);
+    _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (CORBA::ULong maximum);
+    _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (
+        CORBA::ULong maximum,
         CORBA::ULong length,
         FinderDef* *value,
-        CORBA::Boolean release = 0);
-      _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq(const _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &rhs);
-      virtual ~_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (void);
-      _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &rhs);
-      TAO_Object_Manager<IR::FinderDef,IR::FinderDef_var> operator[] (CORBA::ULong index) const;
-      static FinderDef **allocbuf (CORBA::ULong nelems);
-      static void freebuf (FinderDef **buffer);
-      // The Base_Sequence functions, please see tao/Sequence.h
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      FinderDef* *get_buffer (CORBA::Boolean orphan = 0);
-      const FinderDef* *get_buffer (void) const;
-      virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-      virtual void _downcast (
-          void* target,
-          CORBA_Object *src,
-          CORBA_Environment &ACE_TRY_ENV = 
-            TAO_default_environment ()
-        );
-      virtual CORBA_Object* _upcast (void *src) const;
-      
-    };
-
+        CORBA::Boolean release = 0
+      );
+    _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (
+        const _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &rhs
+      );
+    _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &operator= (
+        const _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &rhs
+      );
+    virtual ~_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (void);
+    
+    // = Accessors.
+    TAO_Object_Manager<IR::FinderDef,IR::FinderDef_var> operator[] (CORBA::ULong index) const;
+    
+    // = Static operations.
+    static FinderDef **allocbuf (CORBA::ULong nelems);
+    static void freebuf (FinderDef **buffer);
+    
+    // Implement the TAO_Base_Sequence methods (see Sequence.h)
+    virtual void _allocate_buffer (CORBA::ULong length);
+    virtual void _deallocate_buffer (void);
+    FinderDef* *get_buffer (CORBA::Boolean orphan = 0);
+    const FinderDef* *get_buffer (void) const;
+    virtual void _shrink_buffer (
+        CORBA::ULong nl,
+        CORBA::ULong ol
+      );
+    
+    virtual void _downcast (
+        void* target,
+        CORBA_Object *src,
+        CORBA_Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    virtual CORBA_Object* _upcast (void *src) const;
+  };
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   
 #if !defined (_IR_FINDERDEFSEQ_CH_)
 #define _IR_FINDERDEFSEQ_CH_
-
+  
   class FinderDefSeq;
   class FinderDefSeq_var;
   
@@ -2217,47 +2382,48 @@ TAO_NAMESPACE  IR
   
   class TAO_IFR_Client_Export FinderDefSeq : public 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq
+  _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Object_Sequence<FinderDef,FinderDef_var>
+  TAO_Unbounded_Object_Sequence<FinderDef,FinderDef_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     FinderDefSeq (void); // default ctor
     FinderDefSeq (CORBA::ULong max); // uses max size
     FinderDefSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      FinderDef_ptr *buffer, 
-      CORBA::Boolean release = 0
-    );
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        FinderDef_ptr *buffer, 
+        CORBA::Boolean release = 0
+      );
     FinderDefSeq (const FinderDefSeq &); // copy ctor
     ~FinderDefSeq (void);
     static void _tao_any_destructor (void*);
-
+    
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef FinderDefSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-
+    
+    
   };
   
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_FINDERDEFSEQ___VAR_CH_)
 #define _IR_FINDERDEFSEQ___VAR_CH_
-
+  
   // *************************************************************
   // class IR::FinderDefSeq_var
   // *************************************************************
-
+  
   class TAO_IFR_Client_Export FinderDefSeq_var
   {
   public:
-    FinderDefSeq_var (void); // default constructor
+    FinderDefSeq_var (void);
     FinderDefSeq_var (FinderDefSeq *);
-    FinderDefSeq_var (const FinderDefSeq_var &); // copy constructor
-    ~FinderDefSeq_var (void); // destructor
+    FinderDefSeq_var (const FinderDefSeq_var &);
+    ~FinderDefSeq_var (void);
     
     FinderDefSeq_var &operator= (FinderDefSeq *);
     FinderDefSeq_var &operator= (const FinderDefSeq_var &);
@@ -2277,18 +2443,18 @@ TAO_NAMESPACE  IR
     FinderDefSeq *&out (void);
     FinderDefSeq *_retn (void);
     FinderDefSeq *ptr (void) const;
-
+  
   private:
     FinderDefSeq *ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_FINDERDEFSEQ___OUT_CH_)
 #define _IR_FINDERDEFSEQ___OUT_CH_
-
+  
   class TAO_IFR_Client_Export FinderDefSeq_out
   {
   public:
@@ -2301,31 +2467,31 @@ TAO_NAMESPACE  IR
     FinderDefSeq *&ptr (void);
     FinderDefSeq *operator-> (void);
     TAO_Object_Manager<FinderDef, FinderDef_var> operator[] (CORBA::ULong index);
-    
+  
   private:
     FinderDefSeq *&ptr_;
-    // assignment from T_var not allowed
+    // Assignment from T_var not allowed.
     void operator= (const FinderDefSeq_var &);
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
+  
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_FinderDefSeq;
-
+  
   class PrimaryKeyDef;
   
 #if !defined (_IR_PRIMARYKEYDEF___PTR_CH_)
 #define _IR_PRIMARYKEYDEF___PTR_CH_
-
+  
   typedef PrimaryKeyDef *PrimaryKeyDef_ptr;
-
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_PRIMARYKEYDEF___VAR_CH_)
 #define _IR_PRIMARYKEYDEF___VAR_CH_
-
+  
   class TAO_IFR_Client_Export PrimaryKeyDef_var : public TAO_Base_var
   {
   public:
@@ -2352,7 +2518,10 @@ TAO_NAMESPACE  IR
     static PrimaryKeyDef_ptr duplicate (PrimaryKeyDef_ptr);
     static void release (PrimaryKeyDef_ptr);
     static PrimaryKeyDef_ptr nil (void);
-    static PrimaryKeyDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static PrimaryKeyDef_ptr narrow (
+        CORBA::Object *,
+        CORBA::Environment &
+      );
     static CORBA::Object * upcast (void *);
   
   private:
@@ -2364,11 +2533,11 @@ TAO_NAMESPACE  IR
 
 
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_PRIMARYKEYDEF___OUT_CH_)
 #define _IR_PRIMARYKEYDEF___OUT_CH_
-
+  
   class TAO_IFR_Client_Export PrimaryKeyDef_out
   {
   public:
@@ -2385,23 +2554,23 @@ TAO_NAMESPACE  IR
   private:
     PrimaryKeyDef_ptr &ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_COMPONENTREPOSITORY___PTR_CH_)
 #define _IR_COMPONENTREPOSITORY___PTR_CH_
-
+  
   class ComponentRepository;
   typedef ComponentRepository *ComponentRepository_ptr;
   
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_COMPONENTREPOSITORY___VAR_CH_)
 #define _IR_COMPONENTREPOSITORY___VAR_CH_
-
+  
   class TAO_IFR_Client_Export ComponentRepository_var : public TAO_Base_var
   {
   public:
@@ -2428,7 +2597,10 @@ TAO_NAMESPACE  IR
     static ComponentRepository_ptr duplicate (ComponentRepository_ptr);
     static void release (ComponentRepository_ptr);
     static ComponentRepository_ptr nil (void);
-    static ComponentRepository_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static ComponentRepository_ptr narrow (
+        CORBA::Object *,
+        CORBA::Environment &
+      );
     static CORBA::Object * upcast (void *);
   
   private:
@@ -2440,11 +2612,11 @@ TAO_NAMESPACE  IR
 
 
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_COMPONENTREPOSITORY___OUT_CH_)
 #define _IR_COMPONENTREPOSITORY___OUT_CH_
-
+  
   class TAO_IFR_Client_Export ComponentRepository_out
   {
   public:
@@ -2461,21 +2633,22 @@ TAO_NAMESPACE  IR
   private:
     ComponentRepository_ptr &ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IR_COMPONENTREPOSITORY_CH_)
 #define _IR_COMPONENTREPOSITORY_CH_
-
-// Forward Classes Declaration
+  
+  // Forward Classes Declaration
   class _TAO_ComponentRepository_Proxy_Impl;
   class _TAO_ComponentRepository_Remote_Proxy_Impl;
   class _TAO_ComponentRepository_Proxy_Broker;
   class _TAO_ComponentRepository_Remote_Proxy_Broker;
   
-  class TAO_IFR_Client_Export ComponentRepository: public virtual CORBA_Repository
+  class TAO_IFR_Client_Export ComponentRepository
+    : public virtual CORBA_Repository
   {
   public:
   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -2485,23 +2658,26 @@ TAO_NAMESPACE  IR
 
     // the static operations
     static ComponentRepository_ptr _duplicate (ComponentRepository_ptr obj);
+    
     static ComponentRepository_ptr _narrow (
         CORBA::Object_ptr obj,
         CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       );
+    
     static ComponentRepository_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
         CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       );
+    
     static ComponentRepository_ptr _nil (void)
       {
         return (ComponentRepository_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void*);
-
+    
     virtual IR::ComponentDef_ptr create_component (
         const char * id,
         const char * name,
@@ -2514,7 +2690,7 @@ TAO_NAMESPACE  IR
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     virtual IR::HomeDef_ptr create_home (
         const char * id,
         const char * name,
@@ -2528,12 +2704,13 @@ TAO_NAMESPACE  IR
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id, 
         CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       );
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
@@ -2544,44 +2721,42 @@ TAO_NAMESPACE  IR
   protected:
     ComponentRepository (int collocated = 0);
     
-    protected:
-      // This methods travese the inheritance tree and set the
-      // parents piece of the given class in the right mode
-      virtual void IR_ComponentRepository_setup_collocation (int collocated);
-      
-      ComponentRepository (
+    // This methods travese the inheritance tree and set the
+    // parents piece of the given class in the right mode
+    virtual void IR_ComponentRepository_setup_collocation (int collocated);
+    
+    ComponentRepository (
         TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
-        );
-      
-      friend class _TAO_ComponentRepository_Remote_Proxy_Impl;
-      friend class _TAO_ComponentRepository_ThruPOA_Proxy_Impl;
-      friend class _TAO_ComponentRepository_Direct_Proxy_Impl;
+      );
+    
+    friend class _TAO_ComponentRepository_Remote_Proxy_Impl;
+    friend class _TAO_ComponentRepository_ThruPOA_Proxy_Impl;
+    friend class _TAO_ComponentRepository_Direct_Proxy_Impl;
     
     virtual ~ComponentRepository (void);
+  
   private:
     ComponentRepository (const ComponentRepository &);
     void operator= (const ComponentRepository &);
   };
-
   
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
-
-
+  // The Proxy Implementations are used by each interface to
+  // perform a call. Each different implementation encapsulate
+  // an invocation logics.
+  
+  
   ///////////////////////////////////////////////////////////////////////
-  //                    Base  Impl. Declaration
+  //                    Base Proxy Impl. Declaration
   //
   
-  class TAO_IFR_Client_Export _TAO_ComponentRepository_Proxy_Impl : 
-    public virtual _TAO_CORBA_Repository_Proxy_Impl
+  class TAO_IFR_Client_Export _TAO_ComponentRepository_Proxy_Impl
+    : public virtual _TAO_CORBA_Repository_Proxy_Impl
   {
   public:
     virtual ~_TAO_ComponentRepository_Proxy_Impl (void) { }
-    
-        virtual IR::ComponentDef_ptr create_component (
+    virtual IR::ComponentDef_ptr create_component (
         CORBA_Object *_collocated_tao_target_,
         const char * id,
         const char * name,
@@ -2593,7 +2768,7 @@ TAO_NAMESPACE  IR
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     virtual IR::HomeDef_ptr create_home (
         CORBA_Object *_collocated_tao_target_,
         const char * id,
@@ -2607,4146 +2782,4189 @@ TAO_NAMESPACE  IR
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
-protected:
+    
+    
+  protected:
     _TAO_ComponentRepository_Proxy_Impl (void);
-  
   };
+  
   //
-  //                Base  Proxy Impl. Declaration
+  //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
   
   
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_ComponentRepository_Remote_Proxy_Impl : 
-  public virtual _TAO_ComponentRepository_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_Repository_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_ComponentRepository_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_ComponentRepository_Remote_Proxy_Impl (void) { }
+  ///////////////////////////////////////////////////////////////////////
+  //                Remote Proxy Impl. Declaration
+  //
   
+  class TAO_IFR_Client_Export _TAO_ComponentRepository_Remote_Proxy_Impl
+    : public virtual _TAO_ComponentRepository_Proxy_Impl,
+      public virtual TAO_Remote_Object_Proxy_Impl,
+      public virtual _TAO_CORBA_Repository_Remote_Proxy_Impl
+  {
+  public:
+    _TAO_ComponentRepository_Remote_Proxy_Impl (void);
+    
+    virtual ~_TAO_ComponentRepository_Remote_Proxy_Impl (void) { }
     virtual IR::ComponentDef_ptr create_component (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      IR::ComponentDef_ptr base_component,
-      const CORBA_InterfaceDefSeq & supports_interfaces,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::HomeDef_ptr create_home (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      IR::HomeDef_ptr base_home,
-      IR::ComponentDef_ptr managed_component,
-      CORBA_ValueDef_ptr primary_key,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-};
-
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
-
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_ComponentRepository_Proxy_Broker
-{
-public:
-  virtual ~_TAO_ComponentRepository_Proxy_Broker (void);
-  virtual _TAO_ComponentRepository_Proxy_Impl &select_proxy (
-    ComponentRepository *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
-
-protected:
-  _TAO_ComponentRepository_Proxy_Broker (void);
+        CORBA_Object *_collocated_tao_target_,
+        const char * id,
+        const char * name,
+        const char * version,
+        IR::ComponentDef_ptr base_component,
+        const CORBA_InterfaceDefSeq & supports_interfaces,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    virtual IR::HomeDef_ptr create_home (
+        CORBA_Object *_collocated_tao_target_,
+        const char * id,
+        const char * name,
+        const char * version,
+        IR::HomeDef_ptr base_home,
+        IR::ComponentDef_ptr managed_component,
+        CORBA_ValueDef_ptr primary_key,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    
+  };
   
-};
-
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_ComponentRepository_Remote_Proxy_Broker : public virtual _TAO_ComponentRepository_Proxy_Broker
-{
-public: 
-  _TAO_ComponentRepository_Remote_Proxy_Broker (void);
+  //
+  //             End Remote Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
   
-  virtual ~_TAO_ComponentRepository_Remote_Proxy_Broker (void);
+  // The Proxy Brokers are used by each interface to get
+  // the right proxy for performing a call. In the new 
+  // collocation scheme, the proxy to be used can vary on
+  // a call by call basis.
   
-  virtual _TAO_ComponentRepository_Proxy_Impl &select_proxy (
-    ComponentRepository *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
-
-private:
-  _TAO_ComponentRepository_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
-
-public:
-  static _TAO_ComponentRepository_Remote_Proxy_Broker *the_TAO_ComponentRepository_Remote_Proxy_Broker (void);
-};
-
-
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-#endif /* end #if !defined */
-
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ComponentRepository;
-
-
-#if !defined (_IR_PROVIDESDEF_CH_)
-#define _IR_PROVIDESDEF_CH_
-
-// Forward Classes Declaration
-class _TAO_ProvidesDef_Proxy_Impl;
-class _TAO_ProvidesDef_Remote_Proxy_Impl;
-class _TAO_ProvidesDef_Proxy_Broker;
-class _TAO_ProvidesDef_Remote_Proxy_Broker;
-
-class TAO_IFR_Client_Export ProvidesDef: public virtual CORBA_Contained
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef ProvidesDef_ptr _ptr_type;
-  typedef ProvidesDef_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static ProvidesDef_ptr _duplicate (ProvidesDef_ptr obj);
-  static ProvidesDef_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static ProvidesDef_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static ProvidesDef_ptr _nil (void)
-    {
-      return (ProvidesDef_ptr)0;
-    }
-
-  static void _tao_any_destructor (void*);
-
-  virtual CORBA_InterfaceDef_ptr interface_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
-
-private:
-  _TAO_ProvidesDef_Proxy_Broker *the_TAO_ProvidesDef_Proxy_Broker_;
   
-protected:
-  ProvidesDef (int collocated = 0);
+  ///////////////////////////////////////////////////////////////////////
+  //                 Base Proxy Broker Declaration 
+  //
   
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void IR_ProvidesDef_setup_collocation (int collocated);
+    class TAO_IFR_Client_Export _TAO_ComponentRepository_Proxy_Broker
+  {
+  public:
+    virtual ~_TAO_ComponentRepository_Proxy_Broker (void);
+    virtual _TAO_ComponentRepository_Proxy_Impl &select_proxy (
+        ComponentRepository *object,
+        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+      ) = 0;
     
-    ProvidesDef (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
+  protected:
+    _TAO_ComponentRepository_Proxy_Broker (void);
     
-    friend class _TAO_ProvidesDef_Remote_Proxy_Impl;
-    friend class _TAO_ProvidesDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ProvidesDef_Direct_Proxy_Impl;
-  
-  virtual ~ProvidesDef (void);
-private:
-  ProvidesDef (const ProvidesDef &);
-  void operator= (const ProvidesDef &);
-};
-
-
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_ProvidesDef_Proxy_Impl : 
-  public virtual _TAO_CORBA_Contained_Proxy_Impl
-{
-public:
-  virtual ~_TAO_ProvidesDef_Proxy_Impl (void) { }
-  
-    virtual CORBA_InterfaceDef_ptr interface_type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-protected:
-  _TAO_ProvidesDef_Proxy_Impl (void);
-
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_ProvidesDef_Remote_Proxy_Impl : 
-  public virtual _TAO_ProvidesDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_ProvidesDef_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_ProvidesDef_Remote_Proxy_Impl (void) { }
-  
-    virtual CORBA_InterfaceDef_ptr interface_type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-};
-
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
-
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_ProvidesDef_Proxy_Broker
-{
-public:
-  virtual ~_TAO_ProvidesDef_Proxy_Broker (void);
-  virtual _TAO_ProvidesDef_Proxy_Impl &select_proxy (
-    ProvidesDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
-
-protected:
-  _TAO_ProvidesDef_Proxy_Broker (void);
+  };
   
-};
-
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_ProvidesDef_Remote_Proxy_Broker : public virtual _TAO_ProvidesDef_Proxy_Broker
-{
-public: 
-  _TAO_ProvidesDef_Remote_Proxy_Broker (void);
+  //
+  //              End Base Proxy Broker Declaration 
+  ///////////////////////////////////////////////////////////////////////
   
-  virtual ~_TAO_ProvidesDef_Remote_Proxy_Broker (void);
+    
+  ///////////////////////////////////////////////////////////////////////
+  //                 Remote Proxy Broker Declaration 
+  //
   
-  virtual _TAO_ProvidesDef_Proxy_Impl &select_proxy (
-    ProvidesDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
-
-private:
-  _TAO_ProvidesDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
-
-public:
-  static _TAO_ProvidesDef_Remote_Proxy_Broker *the_TAO_ProvidesDef_Remote_Proxy_Broker (void);
-};
-
-
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
+  class TAO_IFR_Client_Export _TAO_ComponentRepository_Remote_Proxy_Broker
+    : public virtual _TAO_ComponentRepository_Proxy_Broker
+  {
+  public: 
+    _TAO_ComponentRepository_Remote_Proxy_Broker (void);
+    
+    virtual ~_TAO_ComponentRepository_Remote_Proxy_Broker (void);
+    
+    virtual _TAO_ComponentRepository_Proxy_Impl &select_proxy (
+        ComponentRepository *object,
+        CORBA_Environment &ACE_TRY_ENV
+      );
+    
+    private:
+      _TAO_ComponentRepository_Remote_Proxy_Impl remote_proxy_impl_;
+    
+    public:
+      // This member function is used to get an handle to the unique instance
+      // of the Remote Proxy Broker that is available for a given
+      // interface.
+      static _TAO_ComponentRepository_Remote_Proxy_Broker *the_TAO_ComponentRepository_Remote_Proxy_Broker (void);
+    };
+    
+    //
+    //              End Remote Proxy Broker Declaration 
+    ///////////////////////////////////////////////////////////////////////
+    
+    
 #endif /* end #if !defined */
+    
+    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ComponentRepository;
+    
+    
+#if !defined (_IR_PROVIDESDEF_CH_)
+#define _IR_PROVIDESDEF_CH_
+    
+    // Forward Classes Declaration
+    class _TAO_ProvidesDef_Proxy_Impl;
+    class _TAO_ProvidesDef_Remote_Proxy_Impl;
+    class _TAO_ProvidesDef_Proxy_Broker;
+    class _TAO_ProvidesDef_Remote_Proxy_Broker;
+    
+    class TAO_IFR_Client_Export ProvidesDef
+      : public virtual CORBA_Contained
+    {
+    public:
+    #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+      typedef ProvidesDef_ptr _ptr_type;
+      typedef ProvidesDef_var _var_type;
+    #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ProvidesDef;
-
-struct ProvidesDescription;
-class ProvidesDescription_var;
-
-struct TAO_IFR_Client_Export ProvidesDescription
-{
+      // the static operations
+      static ProvidesDef_ptr _duplicate (ProvidesDef_ptr obj);
+      
+      static ProvidesDef_ptr _narrow (
+          CORBA::Object_ptr obj,
+          CORBA::Environment &ACE_TRY_ENV = 
+            TAO_default_environment ()
+        );
+      
+      static ProvidesDef_ptr _unchecked_narrow (
+          CORBA::Object_ptr obj,
+          CORBA::Environment &ACE_TRY_ENV = 
+            TAO_default_environment ()
+        );
+      
+      static ProvidesDef_ptr _nil (void)
+        {
+          return (ProvidesDef_ptr)0;
+        }
+      
+      static void _tao_any_destructor (void*);
+      
+      virtual CORBA_InterfaceDef_ptr interface_type (
+          CORBA::Environment &ACE_TRY_ENV = 
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      virtual CORBA::Boolean _is_a (
+          const CORBA::Char *type_id, 
+          CORBA::Environment &ACE_TRY_ENV = 
+            TAO_default_environment ()
+        );
+      
+      virtual void *_tao_QueryInterface (ptr_arith_t type);
+      
+      virtual const char* _interface_repository_id (void) const;
 
+    private:
+      _TAO_ProvidesDef_Proxy_Broker *the_TAO_ProvidesDef_Proxy_Broker_;
+      
+    protected:
+      ProvidesDef (int collocated = 0);
+      
+      // This methods travese the inheritance tree and set the
+      // parents piece of the given class in the right mode
+      virtual void IR_ProvidesDef_setup_collocation (int collocated);
+      
+      ProvidesDef (
+          TAO_Stub *objref, 
+          CORBA::Boolean _tao_collocated = 0,
+          TAO_Abstract_ServantBase *servant = 0
+        );
+      
+      friend class _TAO_ProvidesDef_Remote_Proxy_Impl;
+      friend class _TAO_ProvidesDef_ThruPOA_Proxy_Impl;
+      friend class _TAO_ProvidesDef_Direct_Proxy_Impl;
+      
+      virtual ~ProvidesDef (void);
+    
+    private:
+      ProvidesDef (const ProvidesDef &);
+      void operator= (const ProvidesDef &);
+    };
+    
+    // The Proxy Implementations are used by each interface to
+    // perform a call. Each different implementation encapsulate
+    // an invocation logics.
+    
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                    Base Proxy Impl. Declaration
+    //
+    
+    class TAO_IFR_Client_Export _TAO_ProvidesDef_Proxy_Impl
+      : public virtual _TAO_CORBA_Contained_Proxy_Impl
+    {
+    public:
+      virtual ~_TAO_ProvidesDef_Proxy_Impl (void) { }
+      virtual CORBA_InterfaceDef_ptr interface_type (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+      
+      
+    protected:
+      _TAO_ProvidesDef_Proxy_Impl (void);
+    };
+    
+    //
+    //               End Base Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+    
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                Remote Proxy Impl. Declaration
+    //
+    
+    class TAO_IFR_Client_Export _TAO_ProvidesDef_Remote_Proxy_Impl
+      : public virtual _TAO_ProvidesDef_Proxy_Impl,
+        public virtual TAO_Remote_Object_Proxy_Impl,
+        public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl
+    {
+    public:
+      _TAO_ProvidesDef_Remote_Proxy_Impl (void);
+      
+      virtual ~_TAO_ProvidesDef_Remote_Proxy_Impl (void) { }
+      virtual CORBA_InterfaceDef_ptr interface_type (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      
+    };
+    
+    //
+    //             End Remote Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+    
+    // The Proxy Brokers are used by each interface to get
+    // the right proxy for performing a call. In the new 
+    // collocation scheme, the proxy to be used can vary on
+    // a call by call basis.
+    
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                 Base Proxy Broker Declaration 
+    //
+    
+        class TAO_IFR_Client_Export _TAO_ProvidesDef_Proxy_Broker
+    {
+    public:
+      virtual ~_TAO_ProvidesDef_Proxy_Broker (void);
+      virtual _TAO_ProvidesDef_Proxy_Impl &select_proxy (
+          ProvidesDef *object,
+          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+        ) = 0;
+      
+    protected:
+      _TAO_ProvidesDef_Proxy_Broker (void);
+      
+    };
+    
+    //
+    //              End Base Proxy Broker Declaration 
+    ///////////////////////////////////////////////////////////////////////
+    
+        
+    ///////////////////////////////////////////////////////////////////////
+    //                 Remote Proxy Broker Declaration 
+    //
+    
+    class TAO_IFR_Client_Export _TAO_ProvidesDef_Remote_Proxy_Broker
+      : public virtual _TAO_ProvidesDef_Proxy_Broker
+    {
+    public: 
+      _TAO_ProvidesDef_Remote_Proxy_Broker (void);
+      
+      virtual ~_TAO_ProvidesDef_Remote_Proxy_Broker (void);
+      
+      virtual _TAO_ProvidesDef_Proxy_Impl &select_proxy (
+          ProvidesDef *object,
+          CORBA_Environment &ACE_TRY_ENV
+        );
+      
+      private:
+        _TAO_ProvidesDef_Remote_Proxy_Impl remote_proxy_impl_;
+      
+      public:
+        // This member function is used to get an handle to the unique instance
+        // of the Remote Proxy Broker that is available for a given
+        // interface.
+        static _TAO_ProvidesDef_Remote_Proxy_Broker *the_TAO_ProvidesDef_Remote_Proxy_Broker (void);
+      };
+      
+      //
+      //              End Remote Proxy Broker Declaration 
+      ///////////////////////////////////////////////////////////////////////
+      
+      
+#endif /* end #if !defined */
+      
+      TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ProvidesDef;
+      
+      struct ProvidesDescription;
+      class ProvidesDescription_var;
+      
+      struct TAO_IFR_Client_Export ProvidesDescription
+      {
+        
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef ProvidesDescription_var _var_type;
+        typedef ProvidesDescription_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-  static void _tao_any_destructor (void*);
-
-  TAO_String_Manager name;
-  TAO_String_Manager id;
-  TAO_String_Manager defined_in;
-  TAO_String_Manager version;
-  CORBA_InterfaceDef_var interface_type;
-};
-
-class TAO_IFR_Client_Export ProvidesDescription_var
-{
-public:
-  ProvidesDescription_var (void); // default constructor
-  ProvidesDescription_var (ProvidesDescription *);
-  ProvidesDescription_var (const ProvidesDescription_var &); // copy constructor
-  ~ProvidesDescription_var (void); // destructor
-  
-  ProvidesDescription_var &operator= (ProvidesDescription *);
-  ProvidesDescription_var &operator= (const ProvidesDescription_var &);
-  ProvidesDescription *operator-> (void);
-  const ProvidesDescription *operator-> (void) const;
-  
-  operator const ProvidesDescription &() const;
-  operator ProvidesDescription &();
-  operator ProvidesDescription &() const;
-  operator ProvidesDescription *&(); // variable-size types only
-  
-  // in, inout, out, _retn 
-  const ProvidesDescription &in (void) const;
-  ProvidesDescription &inout (void);
-  ProvidesDescription *&out (void);
-  ProvidesDescription *_retn (void);
-  ProvidesDescription *ptr (void) const;
-
-private:
-  ProvidesDescription *ptr_;
-};
-
-class TAO_IFR_Client_Export ProvidesDescription_out
-{
-public:
-  ProvidesDescription_out (ProvidesDescription *&);
-  ProvidesDescription_out (ProvidesDescription_var &);
-  ProvidesDescription_out (const ProvidesDescription_out &);
-  ProvidesDescription_out &operator= (const ProvidesDescription_out &);
-  ProvidesDescription_out &operator= (ProvidesDescription *);
-  operator ProvidesDescription *&();
-  ProvidesDescription *&ptr (void);
-  ProvidesDescription *operator-> (void);
-  
-private:
-  ProvidesDescription *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const ProvidesDescription_var &);
-};
-
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ProvidesDescription;
-
-
+        static void _tao_any_destructor (void*);
+        
+        TAO_String_Manager name;
+        TAO_String_Manager id;
+        TAO_String_Manager defined_in;
+        TAO_String_Manager version;
+        CORBA_InterfaceDef_var interface_type;
+        
+      };
+      
+      class TAO_IFR_Client_Export ProvidesDescription_var
+      {
+      public:
+        ProvidesDescription_var (void);
+        ProvidesDescription_var (ProvidesDescription *);
+        ProvidesDescription_var (const ProvidesDescription_var &);
+        ~ProvidesDescription_var (void);
+        
+        ProvidesDescription_var &operator= (ProvidesDescription *);
+        ProvidesDescription_var &operator= (const ProvidesDescription_var &);
+        ProvidesDescription *operator-> (void);
+        const ProvidesDescription *operator-> (void) const;
+        
+        operator const ProvidesDescription &() const;
+        operator ProvidesDescription &();
+        operator ProvidesDescription &() const;
+        // Variable-size types only.
+        operator ProvidesDescription *&();
+        
+        // in, inout, out, _retn 
+        const ProvidesDescription &in (void) const;
+        ProvidesDescription &inout (void);
+        ProvidesDescription *&out (void);
+        ProvidesDescription *_retn (void);
+        ProvidesDescription *ptr (void) const;
+      
+      private:
+        ProvidesDescription *ptr_;
+      };
+      
+      class TAO_IFR_Client_Export ProvidesDescription_out
+      {
+      public:
+        ProvidesDescription_out (ProvidesDescription *&);
+        ProvidesDescription_out (ProvidesDescription_var &);
+        ProvidesDescription_out (const ProvidesDescription_out &);
+        ProvidesDescription_out &operator= (const ProvidesDescription_out &);
+        ProvidesDescription_out &operator= (ProvidesDescription *);
+        operator ProvidesDescription *&();
+        ProvidesDescription *&ptr (void);
+        ProvidesDescription *operator-> (void);
+        
+      private:
+        ProvidesDescription *&ptr_;
+        // Assignment from T_var not allowed.
+        void operator= (const ProvidesDescription_var &);
+      };
+      
+      TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ProvidesDescription;
+      
+      
 #if !defined (_IR_USESDEF_CH_)
 #define _IR_USESDEF_CH_
-
-// Forward Classes Declaration
-class _TAO_UsesDef_Proxy_Impl;
-class _TAO_UsesDef_Remote_Proxy_Impl;
-class _TAO_UsesDef_Proxy_Broker;
-class _TAO_UsesDef_Remote_Proxy_Broker;
-
-class TAO_IFR_Client_Export UsesDef: public virtual CORBA_Contained
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef UsesDef_ptr _ptr_type;
-  typedef UsesDef_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static UsesDef_ptr _duplicate (UsesDef_ptr obj);
-  static UsesDef_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static UsesDef_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static UsesDef_ptr _nil (void)
-    {
-      return (UsesDef_ptr)0;
-    }
-
-  static void _tao_any_destructor (void*);
-
-  virtual CORBA_InterfaceDef_ptr interface_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean is_multiple (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
-
-private:
-  _TAO_UsesDef_Proxy_Broker *the_TAO_UsesDef_Proxy_Broker_;
-  
-protected:
-  UsesDef (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void IR_UsesDef_setup_collocation (int collocated);
-    
-    UsesDef (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_UsesDef_Remote_Proxy_Impl;
-    friend class _TAO_UsesDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_UsesDef_Direct_Proxy_Impl;
-  
-  virtual ~UsesDef (void);
-private:
-  UsesDef (const UsesDef &);
-  void operator= (const UsesDef &);
-};
-
-
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_UsesDef_Proxy_Impl : 
-  public virtual _TAO_CORBA_Contained_Proxy_Impl
-{
-public:
-  virtual ~_TAO_UsesDef_Proxy_Impl (void) { }
-  
-    virtual CORBA_InterfaceDef_ptr interface_type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA::Boolean is_multiple (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-protected:
-  _TAO_UsesDef_Proxy_Impl (void);
-
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_UsesDef_Remote_Proxy_Impl : 
-  public virtual _TAO_UsesDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_UsesDef_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_UsesDef_Remote_Proxy_Impl (void) { }
-  
-    virtual CORBA_InterfaceDef_ptr interface_type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean is_multiple (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-};
-
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
-
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_UsesDef_Proxy_Broker
-{
-public:
-  virtual ~_TAO_UsesDef_Proxy_Broker (void);
-  virtual _TAO_UsesDef_Proxy_Impl &select_proxy (
-    UsesDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
-
-protected:
-  _TAO_UsesDef_Proxy_Broker (void);
-  
-};
-
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_UsesDef_Remote_Proxy_Broker : public virtual _TAO_UsesDef_Proxy_Broker
-{
-public: 
-  _TAO_UsesDef_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_UsesDef_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_UsesDef_Proxy_Impl &select_proxy (
-    UsesDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
-
-private:
-  _TAO_UsesDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
-
-public:
-  static _TAO_UsesDef_Remote_Proxy_Broker *the_TAO_UsesDef_Remote_Proxy_Broker (void);
-};
-
-
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
+      
+      // Forward Classes Declaration
+      class _TAO_UsesDef_Proxy_Impl;
+      class _TAO_UsesDef_Remote_Proxy_Impl;
+      class _TAO_UsesDef_Proxy_Broker;
+      class _TAO_UsesDef_Remote_Proxy_Broker;
+      
+      class TAO_IFR_Client_Export UsesDef
+        : public virtual CORBA_Contained
+      {
+      public:
+      #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+        typedef UsesDef_ptr _ptr_type;
+        typedef UsesDef_var _var_type;
+      #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+        // the static operations
+        static UsesDef_ptr _duplicate (UsesDef_ptr obj);
+        
+        static UsesDef_ptr _narrow (
+            CORBA::Object_ptr obj,
+            CORBA::Environment &ACE_TRY_ENV = 
+              TAO_default_environment ()
+          );
+        
+        static UsesDef_ptr _unchecked_narrow (
+            CORBA::Object_ptr obj,
+            CORBA::Environment &ACE_TRY_ENV = 
+              TAO_default_environment ()
+          );
+        
+        static UsesDef_ptr _nil (void)
+          {
+            return (UsesDef_ptr)0;
+          }
+        
+        static void _tao_any_destructor (void*);
+        
+        virtual CORBA_InterfaceDef_ptr interface_type (
+            CORBA::Environment &ACE_TRY_ENV = 
+              TAO_default_environment ()
+          )
+          ACE_THROW_SPEC ((
+            CORBA::SystemException
+          ));
+        
+        virtual CORBA::Boolean is_multiple (
+            CORBA::Environment &ACE_TRY_ENV = 
+              TAO_default_environment ()
+          )
+          ACE_THROW_SPEC ((
+            CORBA::SystemException
+          ));
+        
+        virtual CORBA::Boolean _is_a (
+            const CORBA::Char *type_id, 
+            CORBA::Environment &ACE_TRY_ENV = 
+              TAO_default_environment ()
+          );
+        
+        virtual void *_tao_QueryInterface (ptr_arith_t type);
+        
+        virtual const char* _interface_repository_id (void) const;
+
+      private:
+        _TAO_UsesDef_Proxy_Broker *the_TAO_UsesDef_Proxy_Broker_;
+        
+      protected:
+        UsesDef (int collocated = 0);
+        
+        // This methods travese the inheritance tree and set the
+        // parents piece of the given class in the right mode
+        virtual void IR_UsesDef_setup_collocation (int collocated);
+        
+        UsesDef (
+            TAO_Stub *objref, 
+            CORBA::Boolean _tao_collocated = 0,
+            TAO_Abstract_ServantBase *servant = 0
+          );
+        
+        friend class _TAO_UsesDef_Remote_Proxy_Impl;
+        friend class _TAO_UsesDef_ThruPOA_Proxy_Impl;
+        friend class _TAO_UsesDef_Direct_Proxy_Impl;
+        
+        virtual ~UsesDef (void);
+      
+      private:
+        UsesDef (const UsesDef &);
+        void operator= (const UsesDef &);
+      };
+      
+      // The Proxy Implementations are used by each interface to
+      // perform a call. Each different implementation encapsulate
+      // an invocation logics.
+      
+      
+      ///////////////////////////////////////////////////////////////////////
+      //                    Base Proxy Impl. Declaration
+      //
+      
+      class TAO_IFR_Client_Export _TAO_UsesDef_Proxy_Impl
+        : public virtual _TAO_CORBA_Contained_Proxy_Impl
+      {
+      public:
+        virtual ~_TAO_UsesDef_Proxy_Impl (void) { }
+        virtual CORBA_InterfaceDef_ptr interface_type (
+            CORBA_Object *_collocated_tao_target_,
+            CORBA::Environment &ACE_TRY_ENV
+          )
+          ACE_THROW_SPEC ((
+            CORBA::SystemException
+          )) = 0;
+        
+        virtual CORBA::Boolean is_multiple (
+            CORBA_Object *_collocated_tao_target_,
+            CORBA::Environment &ACE_TRY_ENV
+          )
+          ACE_THROW_SPEC ((
+            CORBA::SystemException
+          )) = 0;
+        
+        
+      protected:
+        _TAO_UsesDef_Proxy_Impl (void);
+      };
+      
+      //
+      //               End Base Proxy Impl. Declaration
+      ///////////////////////////////////////////////////////////////////////
+      
+      
+      ///////////////////////////////////////////////////////////////////////
+      //                Remote Proxy Impl. Declaration
+      //
+      
+      class TAO_IFR_Client_Export _TAO_UsesDef_Remote_Proxy_Impl
+        : public virtual _TAO_UsesDef_Proxy_Impl,
+          public virtual TAO_Remote_Object_Proxy_Impl,
+          public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl
+      {
+      public:
+        _TAO_UsesDef_Remote_Proxy_Impl (void);
+        
+        virtual ~_TAO_UsesDef_Remote_Proxy_Impl (void) { }
+        virtual CORBA_InterfaceDef_ptr interface_type (
+            CORBA_Object *_collocated_tao_target_,
+            CORBA::Environment &ACE_TRY_ENV
+          )
+          ACE_THROW_SPEC ((
+            CORBA::SystemException
+          ));
+        
+        virtual CORBA::Boolean is_multiple (
+            CORBA_Object *_collocated_tao_target_,
+            CORBA::Environment &ACE_TRY_ENV
+          )
+          ACE_THROW_SPEC ((
+            CORBA::SystemException
+          ));
+        
+        
+      };
+      
+      //
+      //             End Remote Proxy Impl. Declaration
+      ///////////////////////////////////////////////////////////////////////
+      
+      // The Proxy Brokers are used by each interface to get
+      // the right proxy for performing a call. In the new 
+      // collocation scheme, the proxy to be used can vary on
+      // a call by call basis.
+      
+      
+      ///////////////////////////////////////////////////////////////////////
+      //                 Base Proxy Broker Declaration 
+      //
+      
+            class TAO_IFR_Client_Export _TAO_UsesDef_Proxy_Broker
+      {
+      public:
+        virtual ~_TAO_UsesDef_Proxy_Broker (void);
+        virtual _TAO_UsesDef_Proxy_Impl &select_proxy (
+            UsesDef *object,
+            CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+          ) = 0;
+        
+      protected:
+        _TAO_UsesDef_Proxy_Broker (void);
+        
+      };
+      
+      //
+      //              End Base Proxy Broker Declaration 
+      ///////////////////////////////////////////////////////////////////////
+      
+            
+      ///////////////////////////////////////////////////////////////////////
+      //                 Remote Proxy Broker Declaration 
+      //
+      
+      class TAO_IFR_Client_Export _TAO_UsesDef_Remote_Proxy_Broker
+        : public virtual _TAO_UsesDef_Proxy_Broker
+      {
+      public: 
+        _TAO_UsesDef_Remote_Proxy_Broker (void);
+        
+        virtual ~_TAO_UsesDef_Remote_Proxy_Broker (void);
+        
+        virtual _TAO_UsesDef_Proxy_Impl &select_proxy (
+            UsesDef *object,
+            CORBA_Environment &ACE_TRY_ENV
+          );
+        
+        private:
+          _TAO_UsesDef_Remote_Proxy_Impl remote_proxy_impl_;
+        
+        public:
+          // This member function is used to get an handle to the unique instance
+          // of the Remote Proxy Broker that is available for a given
+          // interface.
+          static _TAO_UsesDef_Remote_Proxy_Broker *the_TAO_UsesDef_Remote_Proxy_Broker (void);
+        };
+        
+        //
+        //              End Remote Proxy Broker Declaration 
+        ///////////////////////////////////////////////////////////////////////
+        
+        
 #endif /* end #if !defined */
-
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UsesDef;
-
-struct UsesDescription;
-class UsesDescription_var;
-
-struct TAO_IFR_Client_Export UsesDescription
-{
-
+        
+        TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UsesDef;
+        
+        struct UsesDescription;
+        class UsesDescription_var;
+        
+        struct TAO_IFR_Client_Export UsesDescription
+        {
+          
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef UsesDescription_var _var_type;
+          typedef UsesDescription_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-  static void _tao_any_destructor (void*);
-
-  TAO_String_Manager name;
-  TAO_String_Manager id;
-  TAO_String_Manager defined_in;
-  TAO_String_Manager version;
-  CORBA_InterfaceDef_var interface_type;
-  CORBA::Boolean is_multiple;
-};
-
-class TAO_IFR_Client_Export UsesDescription_var
-{
-public:
-  UsesDescription_var (void); // default constructor
-  UsesDescription_var (UsesDescription *);
-  UsesDescription_var (const UsesDescription_var &); // copy constructor
-  ~UsesDescription_var (void); // destructor
-  
-  UsesDescription_var &operator= (UsesDescription *);
-  UsesDescription_var &operator= (const UsesDescription_var &);
-  UsesDescription *operator-> (void);
-  const UsesDescription *operator-> (void) const;
-  
-  operator const UsesDescription &() const;
-  operator UsesDescription &();
-  operator UsesDescription &() const;
-  operator UsesDescription *&(); // variable-size types only
-  
-  // in, inout, out, _retn 
-  const UsesDescription &in (void) const;
-  UsesDescription &inout (void);
-  UsesDescription *&out (void);
-  UsesDescription *_retn (void);
-  UsesDescription *ptr (void) const;
-
-private:
-  UsesDescription *ptr_;
-};
-
-class TAO_IFR_Client_Export UsesDescription_out
-{
-public:
-  UsesDescription_out (UsesDescription *&);
-  UsesDescription_out (UsesDescription_var &);
-  UsesDescription_out (const UsesDescription_out &);
-  UsesDescription_out &operator= (const UsesDescription_out &);
-  UsesDescription_out &operator= (UsesDescription *);
-  operator UsesDescription *&();
-  UsesDescription *&ptr (void);
-  UsesDescription *operator-> (void);
-  
-private:
-  UsesDescription *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const UsesDescription_var &);
-};
-
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UsesDescription;
-
-
+          static void _tao_any_destructor (void*);
+          
+          TAO_String_Manager name;
+          TAO_String_Manager id;
+          TAO_String_Manager defined_in;
+          TAO_String_Manager version;
+          CORBA_InterfaceDef_var interface_type;
+          CORBA::Boolean is_multiple;
+          
+        };
+        
+        class TAO_IFR_Client_Export UsesDescription_var
+        {
+        public:
+          UsesDescription_var (void);
+          UsesDescription_var (UsesDescription *);
+          UsesDescription_var (const UsesDescription_var &);
+          ~UsesDescription_var (void);
+          
+          UsesDescription_var &operator= (UsesDescription *);
+          UsesDescription_var &operator= (const UsesDescription_var &);
+          UsesDescription *operator-> (void);
+          const UsesDescription *operator-> (void) const;
+          
+          operator const UsesDescription &() const;
+          operator UsesDescription &();
+          operator UsesDescription &() const;
+          // Variable-size types only.
+          operator UsesDescription *&();
+          
+          // in, inout, out, _retn 
+          const UsesDescription &in (void) const;
+          UsesDescription &inout (void);
+          UsesDescription *&out (void);
+          UsesDescription *_retn (void);
+          UsesDescription *ptr (void) const;
+        
+        private:
+          UsesDescription *ptr_;
+        };
+        
+        class TAO_IFR_Client_Export UsesDescription_out
+        {
+        public:
+          UsesDescription_out (UsesDescription *&);
+          UsesDescription_out (UsesDescription_var &);
+          UsesDescription_out (const UsesDescription_out &);
+          UsesDescription_out &operator= (const UsesDescription_out &);
+          UsesDescription_out &operator= (UsesDescription *);
+          operator UsesDescription *&();
+          UsesDescription *&ptr (void);
+          UsesDescription *operator-> (void);
+          
+        private:
+          UsesDescription *&ptr_;
+          // Assignment from T_var not allowed.
+          void operator= (const UsesDescription_var &);
+        };
+        
+        TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UsesDescription;
+        
+        
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+        
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CH_
-
-  class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_ProvidesDescSeq : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    // = Initialization and termination methods.
-    
-    _TAO_Unbounded_Sequence_IR_ProvidesDescSeq (void); // Default constructor.
-    _TAO_Unbounded_Sequence_IR_ProvidesDescSeq (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_IR_ProvidesDescSeq (CORBA::ULong maximum,
-      CORBA::ULong length,
-      ProvidesDescription *data,
-      CORBA::Boolean release = 0);
-    _TAO_Unbounded_Sequence_IR_ProvidesDescSeq (const _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &rhs);
-    _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &operator= (const _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &rhs);
-    virtual ~_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (void); // Dtor.
-    // = Accessors.
-    ProvidesDescription &operator[] (CORBA::ULong i);
-    const ProvidesDescription &operator[] (CORBA::ULong i) const;
-    // = Static operations.
-    static ProvidesDescription *allocbuf (CORBA::ULong size);
-    static void freebuf (ProvidesDescription *buffer);
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    
-    ProvidesDescription *get_buffer (CORBA::Boolean orphan = 0);
-    const ProvidesDescription *get_buffer (void) const;
-    void replace (CORBA::ULong max,
-      CORBA::ULong length,
-      ProvidesDescription *data,
-      CORBA::Boolean release);
-  };
-
+        
+        class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_ProvidesDescSeq
+          : public TAO_Unbounded_Base_Sequence
+        {
+        public:
+          // = Initialization and termination methods.
+          _TAO_Unbounded_Sequence_IR_ProvidesDescSeq (void);
+          _TAO_Unbounded_Sequence_IR_ProvidesDescSeq (CORBA::ULong maximum); 
+          _TAO_Unbounded_Sequence_IR_ProvidesDescSeq (
+              CORBA::ULong maximum,
+              CORBA::ULong length,
+              ProvidesDescription *data,
+              CORBA::Boolean release = 0
+            );
+          _TAO_Unbounded_Sequence_IR_ProvidesDescSeq (
+              const _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &rhs
+            );
+          _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &operator= (
+              const _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &rhs
+            );
+          virtual ~_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (void);
+          
+          // = Accessors.
+          ProvidesDescription &operator[] (CORBA::ULong i);
+          const ProvidesDescription &operator[] (CORBA::ULong i) const;
+          
+          // = Static operations.
+          static ProvidesDescription *allocbuf (CORBA::ULong size);
+          static void freebuf (ProvidesDescription *buffer);
+          
+          // Implement the TAO_Base_Sequence methods (see Sequence.h)
+          virtual void _allocate_buffer (CORBA::ULong length);
+          virtual void _deallocate_buffer (void);
+          ProvidesDescription *get_buffer (CORBA::Boolean orphan = 0);
+          const ProvidesDescription *get_buffer (void) const;
+          void replace (
+              CORBA::ULong max,
+              CORBA::ULong length,
+              ProvidesDescription *data,
+              CORBA::Boolean release
+            );
+        };
+        
 #endif /* end #if !defined */
-
-
+        
+        
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
+        
 #if !defined (_IR_PROVIDESDESCSEQ_CH_)
 #define _IR_PROVIDESDESCSEQ_CH_
-
-class ProvidesDescSeq;
-class ProvidesDescSeq_var;
-
-// *************************************************************
-// ProvidesDescSeq
-// *************************************************************
-
-class TAO_IFR_Client_Export ProvidesDescSeq : public 
+        
+        class ProvidesDescSeq;
+        class ProvidesDescSeq_var;
+        
+        // *************************************************************
+        // ProvidesDescSeq
+        // *************************************************************
+        
+        class TAO_IFR_Client_Export ProvidesDescSeq : public 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_IR_ProvidesDescSeq
+        _TAO_Unbounded_Sequence_IR_ProvidesDescSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<ProvidesDescription>
+        TAO_Unbounded_Sequence<ProvidesDescription>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-{
-public:
-  ProvidesDescSeq (void); // default ctor
-  ProvidesDescSeq (CORBA::ULong max); // uses max size
-  ProvidesDescSeq (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    ProvidesDescription *buffer, 
-    CORBA::Boolean release = 0
-  );
-  ProvidesDescSeq (const ProvidesDescSeq &); // copy ctor
-  ~ProvidesDescSeq (void);
-  static void _tao_any_destructor (void*);
-
+        {
+        public:
+          ProvidesDescSeq (void); // default ctor
+          ProvidesDescSeq (CORBA::ULong max); // uses max size
+          ProvidesDescSeq (
+              CORBA::ULong max, 
+              CORBA::ULong length, 
+              ProvidesDescription *buffer, 
+              CORBA::Boolean release = 0
+            );
+          ProvidesDescSeq (const ProvidesDescSeq &); // copy ctor
+          ~ProvidesDescSeq (void);
+          static void _tao_any_destructor (void*);
+          
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef ProvidesDescSeq_var _var_type;
+          typedef ProvidesDescSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-
-};
-
+          
+          
+        };
+        
 #endif /* end #if !defined */
-
-
+        
+        
 #if !defined (_IR_PROVIDESDESCSEQ___VAR_CH_)
 #define _IR_PROVIDESDESCSEQ___VAR_CH_
-
-// *************************************************************
-// class IR::ProvidesDescSeq_var
-// *************************************************************
-
-class TAO_IFR_Client_Export ProvidesDescSeq_var
-{
-public:
-  ProvidesDescSeq_var (void); // default constructor
-  ProvidesDescSeq_var (ProvidesDescSeq *);
-  ProvidesDescSeq_var (const ProvidesDescSeq_var &); // copy constructor
-  ~ProvidesDescSeq_var (void); // destructor
-  
-  ProvidesDescSeq_var &operator= (ProvidesDescSeq *);
-  ProvidesDescSeq_var &operator= (const ProvidesDescSeq_var &);
-  ProvidesDescSeq *operator-> (void);
-  const ProvidesDescSeq *operator-> (void) const;
-  
-  operator const ProvidesDescSeq &() const;
-  operator ProvidesDescSeq &();
-  operator ProvidesDescSeq &() const;
-  operator ProvidesDescSeq *&(); // variable-size base types only
-  
-  ProvidesDescription & operator[] (CORBA::ULong index);
-  const ProvidesDescription & operator[] (CORBA::ULong index) const;
-  
-  // in, inout, out, _retn 
-  const ProvidesDescSeq &in (void) const;
-  ProvidesDescSeq &inout (void);
-  ProvidesDescSeq *&out (void);
-  ProvidesDescSeq *_retn (void);
-  ProvidesDescSeq *ptr (void) const;
-
-private:
-  ProvidesDescSeq *ptr_;
-};
-
-
+        
+        // *************************************************************
+        // class IR::ProvidesDescSeq_var
+        // *************************************************************
+        
+        class TAO_IFR_Client_Export ProvidesDescSeq_var
+        {
+        public:
+          ProvidesDescSeq_var (void);
+          ProvidesDescSeq_var (ProvidesDescSeq *);
+          ProvidesDescSeq_var (const ProvidesDescSeq_var &);
+          ~ProvidesDescSeq_var (void);
+          
+          ProvidesDescSeq_var &operator= (ProvidesDescSeq *);
+          ProvidesDescSeq_var &operator= (const ProvidesDescSeq_var &);
+          ProvidesDescSeq *operator-> (void);
+          const ProvidesDescSeq *operator-> (void) const;
+          
+          operator const ProvidesDescSeq &() const;
+          operator ProvidesDescSeq &();
+          operator ProvidesDescSeq &() const;
+          operator ProvidesDescSeq *&(); // variable-size base types only
+          
+          ProvidesDescription & operator[] (CORBA::ULong index);
+          const ProvidesDescription & operator[] (CORBA::ULong index) const;
+          
+          // in, inout, out, _retn 
+          const ProvidesDescSeq &in (void) const;
+          ProvidesDescSeq &inout (void);
+          ProvidesDescSeq *&out (void);
+          ProvidesDescSeq *_retn (void);
+          ProvidesDescSeq *ptr (void) const;
+        
+        private:
+          ProvidesDescSeq *ptr_;
+        };
+        
+        
 #endif /* end #if !defined */
-
-
+        
+        
 #if !defined (_IR_PROVIDESDESCSEQ___OUT_CH_)
 #define _IR_PROVIDESDESCSEQ___OUT_CH_
-
-class TAO_IFR_Client_Export ProvidesDescSeq_out
-{
-public:
-  ProvidesDescSeq_out (ProvidesDescSeq *&);
-  ProvidesDescSeq_out (ProvidesDescSeq_var &);
-  ProvidesDescSeq_out (const ProvidesDescSeq_out &);
-  ProvidesDescSeq_out &operator= (const ProvidesDescSeq_out &);
-  ProvidesDescSeq_out &operator= (ProvidesDescSeq *);
-  operator ProvidesDescSeq *&();
-  ProvidesDescSeq *&ptr (void);
-  ProvidesDescSeq *operator-> (void);
-  ProvidesDescription & operator[] (CORBA::ULong index);
-  
-private:
-  ProvidesDescSeq *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const ProvidesDescSeq_var &);
-};
-
-
+        
+        class TAO_IFR_Client_Export ProvidesDescSeq_out
+        {
+        public:
+          ProvidesDescSeq_out (ProvidesDescSeq *&);
+          ProvidesDescSeq_out (ProvidesDescSeq_var &);
+          ProvidesDescSeq_out (const ProvidesDescSeq_out &);
+          ProvidesDescSeq_out &operator= (const ProvidesDescSeq_out &);
+          ProvidesDescSeq_out &operator= (ProvidesDescSeq *);
+          operator ProvidesDescSeq *&();
+          ProvidesDescSeq *&ptr (void);
+          ProvidesDescSeq *operator-> (void);
+          ProvidesDescription & operator[] (CORBA::ULong index);
+        
+        private:
+          ProvidesDescSeq *&ptr_;
+          // Assignment from T_var not allowed.
+          void operator= (const ProvidesDescSeq_var &);
+        };
+        
+        
 #endif /* end #if !defined */
-
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ProvidesDescSeq;
-
-
+        
+        TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ProvidesDescSeq;
+        
+        
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+        
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CH_
-
-  class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_UsesDescSeq : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    // = Initialization and termination methods.
-    
-    _TAO_Unbounded_Sequence_IR_UsesDescSeq (void); // Default constructor.
-    _TAO_Unbounded_Sequence_IR_UsesDescSeq (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_IR_UsesDescSeq (CORBA::ULong maximum,
-      CORBA::ULong length,
-      UsesDescription *data,
-      CORBA::Boolean release = 0);
-    _TAO_Unbounded_Sequence_IR_UsesDescSeq (const _TAO_Unbounded_Sequence_IR_UsesDescSeq &rhs);
-    _TAO_Unbounded_Sequence_IR_UsesDescSeq &operator= (const _TAO_Unbounded_Sequence_IR_UsesDescSeq &rhs);
-    virtual ~_TAO_Unbounded_Sequence_IR_UsesDescSeq (void); // Dtor.
-    // = Accessors.
-    UsesDescription &operator[] (CORBA::ULong i);
-    const UsesDescription &operator[] (CORBA::ULong i) const;
-    // = Static operations.
-    static UsesDescription *allocbuf (CORBA::ULong size);
-    static void freebuf (UsesDescription *buffer);
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    
-    UsesDescription *get_buffer (CORBA::Boolean orphan = 0);
-    const UsesDescription *get_buffer (void) const;
-    void replace (CORBA::ULong max,
-      CORBA::ULong length,
-      UsesDescription *data,
-      CORBA::Boolean release);
-  };
-
+        
+        class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_UsesDescSeq
+          : public TAO_Unbounded_Base_Sequence
+        {
+        public:
+          // = Initialization and termination methods.
+          _TAO_Unbounded_Sequence_IR_UsesDescSeq (void);
+          _TAO_Unbounded_Sequence_IR_UsesDescSeq (CORBA::ULong maximum); 
+          _TAO_Unbounded_Sequence_IR_UsesDescSeq (
+              CORBA::ULong maximum,
+              CORBA::ULong length,
+              UsesDescription *data,
+              CORBA::Boolean release = 0
+            );
+          _TAO_Unbounded_Sequence_IR_UsesDescSeq (
+              const _TAO_Unbounded_Sequence_IR_UsesDescSeq &rhs
+            );
+          _TAO_Unbounded_Sequence_IR_UsesDescSeq &operator= (
+              const _TAO_Unbounded_Sequence_IR_UsesDescSeq &rhs
+            );
+          virtual ~_TAO_Unbounded_Sequence_IR_UsesDescSeq (void);
+          
+          // = Accessors.
+          UsesDescription &operator[] (CORBA::ULong i);
+          const UsesDescription &operator[] (CORBA::ULong i) const;
+          
+          // = Static operations.
+          static UsesDescription *allocbuf (CORBA::ULong size);
+          static void freebuf (UsesDescription *buffer);
+          
+          // Implement the TAO_Base_Sequence methods (see Sequence.h)
+          virtual void _allocate_buffer (CORBA::ULong length);
+          virtual void _deallocate_buffer (void);
+          UsesDescription *get_buffer (CORBA::Boolean orphan = 0);
+          const UsesDescription *get_buffer (void) const;
+          void replace (
+              CORBA::ULong max,
+              CORBA::ULong length,
+              UsesDescription *data,
+              CORBA::Boolean release
+            );
+        };
+        
 #endif /* end #if !defined */
-
-
+        
+        
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
+        
 #if !defined (_IR_USESDESCSEQ_CH_)
 #define _IR_USESDESCSEQ_CH_
-
-class UsesDescSeq;
-class UsesDescSeq_var;
-
-// *************************************************************
-// UsesDescSeq
-// *************************************************************
-
-class TAO_IFR_Client_Export UsesDescSeq : public 
+        
+        class UsesDescSeq;
+        class UsesDescSeq_var;
+        
+        // *************************************************************
+        // UsesDescSeq
+        // *************************************************************
+        
+        class TAO_IFR_Client_Export UsesDescSeq : public 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_IR_UsesDescSeq
+        _TAO_Unbounded_Sequence_IR_UsesDescSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<UsesDescription>
+        TAO_Unbounded_Sequence<UsesDescription>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-{
-public:
-  UsesDescSeq (void); // default ctor
-  UsesDescSeq (CORBA::ULong max); // uses max size
-  UsesDescSeq (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    UsesDescription *buffer, 
-    CORBA::Boolean release = 0
-  );
-  UsesDescSeq (const UsesDescSeq &); // copy ctor
-  ~UsesDescSeq (void);
-  static void _tao_any_destructor (void*);
-
+        {
+        public:
+          UsesDescSeq (void); // default ctor
+          UsesDescSeq (CORBA::ULong max); // uses max size
+          UsesDescSeq (
+              CORBA::ULong max, 
+              CORBA::ULong length, 
+              UsesDescription *buffer, 
+              CORBA::Boolean release = 0
+            );
+          UsesDescSeq (const UsesDescSeq &); // copy ctor
+          ~UsesDescSeq (void);
+          static void _tao_any_destructor (void*);
+          
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef UsesDescSeq_var _var_type;
+          typedef UsesDescSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-
-};
-
+          
+          
+        };
+        
 #endif /* end #if !defined */
-
-
+        
+        
 #if !defined (_IR_USESDESCSEQ___VAR_CH_)
 #define _IR_USESDESCSEQ___VAR_CH_
-
-// *************************************************************
-// class IR::UsesDescSeq_var
-// *************************************************************
-
-class TAO_IFR_Client_Export UsesDescSeq_var
-{
-public:
-  UsesDescSeq_var (void); // default constructor
-  UsesDescSeq_var (UsesDescSeq *);
-  UsesDescSeq_var (const UsesDescSeq_var &); // copy constructor
-  ~UsesDescSeq_var (void); // destructor
-  
-  UsesDescSeq_var &operator= (UsesDescSeq *);
-  UsesDescSeq_var &operator= (const UsesDescSeq_var &);
-  UsesDescSeq *operator-> (void);
-  const UsesDescSeq *operator-> (void) const;
-  
-  operator const UsesDescSeq &() const;
-  operator UsesDescSeq &();
-  operator UsesDescSeq &() const;
-  operator UsesDescSeq *&(); // variable-size base types only
-  
-  UsesDescription & operator[] (CORBA::ULong index);
-  const UsesDescription & operator[] (CORBA::ULong index) const;
-  
-  // in, inout, out, _retn 
-  const UsesDescSeq &in (void) const;
-  UsesDescSeq &inout (void);
-  UsesDescSeq *&out (void);
-  UsesDescSeq *_retn (void);
-  UsesDescSeq *ptr (void) const;
-
-private:
-  UsesDescSeq *ptr_;
-};
-
-
+        
+        // *************************************************************
+        // class IR::UsesDescSeq_var
+        // *************************************************************
+        
+        class TAO_IFR_Client_Export UsesDescSeq_var
+        {
+        public:
+          UsesDescSeq_var (void);
+          UsesDescSeq_var (UsesDescSeq *);
+          UsesDescSeq_var (const UsesDescSeq_var &);
+          ~UsesDescSeq_var (void);
+          
+          UsesDescSeq_var &operator= (UsesDescSeq *);
+          UsesDescSeq_var &operator= (const UsesDescSeq_var &);
+          UsesDescSeq *operator-> (void);
+          const UsesDescSeq *operator-> (void) const;
+          
+          operator const UsesDescSeq &() const;
+          operator UsesDescSeq &();
+          operator UsesDescSeq &() const;
+          operator UsesDescSeq *&(); // variable-size base types only
+          
+          UsesDescription & operator[] (CORBA::ULong index);
+          const UsesDescription & operator[] (CORBA::ULong index) const;
+          
+          // in, inout, out, _retn 
+          const UsesDescSeq &in (void) const;
+          UsesDescSeq &inout (void);
+          UsesDescSeq *&out (void);
+          UsesDescSeq *_retn (void);
+          UsesDescSeq *ptr (void) const;
+        
+        private:
+          UsesDescSeq *ptr_;
+        };
+        
+        
 #endif /* end #if !defined */
-
-
+        
+        
 #if !defined (_IR_USESDESCSEQ___OUT_CH_)
 #define _IR_USESDESCSEQ___OUT_CH_
-
-class TAO_IFR_Client_Export UsesDescSeq_out
-{
-public:
-  UsesDescSeq_out (UsesDescSeq *&);
-  UsesDescSeq_out (UsesDescSeq_var &);
-  UsesDescSeq_out (const UsesDescSeq_out &);
-  UsesDescSeq_out &operator= (const UsesDescSeq_out &);
-  UsesDescSeq_out &operator= (UsesDescSeq *);
-  operator UsesDescSeq *&();
-  UsesDescSeq *&ptr (void);
-  UsesDescSeq *operator-> (void);
-  UsesDescription & operator[] (CORBA::ULong index);
-  
-private:
-  UsesDescSeq *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const UsesDescSeq_var &);
-};
-
-
+        
+        class TAO_IFR_Client_Export UsesDescSeq_out
+        {
+        public:
+          UsesDescSeq_out (UsesDescSeq *&);
+          UsesDescSeq_out (UsesDescSeq_var &);
+          UsesDescSeq_out (const UsesDescSeq_out &);
+          UsesDescSeq_out &operator= (const UsesDescSeq_out &);
+          UsesDescSeq_out &operator= (UsesDescSeq *);
+          operator UsesDescSeq *&();
+          UsesDescSeq *&ptr (void);
+          UsesDescSeq *operator-> (void);
+          UsesDescription & operator[] (CORBA::ULong index);
+        
+        private:
+          UsesDescSeq *&ptr_;
+          // Assignment from T_var not allowed.
+          void operator= (const UsesDescSeq_var &);
+        };
+        
+        
 #endif /* end #if !defined */
-
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UsesDescSeq;
-
-
+        
+        TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UsesDescSeq;
+        
+        
 #if !defined (_IR_EVENTDEF_CH_)
 #define _IR_EVENTDEF_CH_
-
-// Forward Classes Declaration
-class _TAO_EventDef_Proxy_Impl;
-class _TAO_EventDef_Remote_Proxy_Impl;
-class _TAO_EventDef_Proxy_Broker;
-class _TAO_EventDef_Remote_Proxy_Broker;
-
-class TAO_IFR_Client_Export EventDef: public virtual CORBA_Contained
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef EventDef_ptr _ptr_type;
-  typedef EventDef_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static EventDef_ptr _duplicate (EventDef_ptr obj);
-  static EventDef_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static EventDef_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static EventDef_ptr _nil (void)
-    {
-      return (EventDef_ptr)0;
-    }
-
-  static void _tao_any_destructor (void*);
-
-  virtual CORBA::Boolean is_a (
-      const char * event_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_ValueDef_ptr event (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
-
-private:
-  _TAO_EventDef_Proxy_Broker *the_TAO_EventDef_Proxy_Broker_;
-  
-protected:
-  EventDef (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void IR_EventDef_setup_collocation (int collocated);
-    
-    EventDef (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_EventDef_Remote_Proxy_Impl;
-    friend class _TAO_EventDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_EventDef_Direct_Proxy_Impl;
-  
-  virtual ~EventDef (void);
-private:
-  EventDef (const EventDef &);
-  void operator= (const EventDef &);
-};
-
-
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_EventDef_Proxy_Impl : 
-  public virtual _TAO_CORBA_Contained_Proxy_Impl
-{
-public:
-  virtual ~_TAO_EventDef_Proxy_Impl (void) { }
-  
-    virtual CORBA::Boolean is_a (
-      CORBA_Object *_collocated_tao_target_,
-      const char * event_id,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_ValueDef_ptr event (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-protected:
-  _TAO_EventDef_Proxy_Impl (void);
-
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_EventDef_Remote_Proxy_Impl : 
-  public virtual _TAO_EventDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_EventDef_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_EventDef_Remote_Proxy_Impl (void) { }
-  
-    virtual CORBA::Boolean is_a (
-      CORBA_Object *_collocated_tao_target_,
-      const char * event_id,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_ValueDef_ptr event (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-};
-
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
-
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_EventDef_Proxy_Broker
-{
-public:
-  virtual ~_TAO_EventDef_Proxy_Broker (void);
-  virtual _TAO_EventDef_Proxy_Impl &select_proxy (
-    EventDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
-
-protected:
-  _TAO_EventDef_Proxy_Broker (void);
-  
-};
-
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_EventDef_Remote_Proxy_Broker : public virtual _TAO_EventDef_Proxy_Broker
-{
-public: 
-  _TAO_EventDef_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_EventDef_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_EventDef_Proxy_Impl &select_proxy (
-    EventDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
-
-private:
-  _TAO_EventDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
-
-public:
-  static _TAO_EventDef_Remote_Proxy_Broker *the_TAO_EventDef_Remote_Proxy_Broker (void);
-};
-
-
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
+        
+        // Forward Classes Declaration
+        class _TAO_EventDef_Proxy_Impl;
+        class _TAO_EventDef_Remote_Proxy_Impl;
+        class _TAO_EventDef_Proxy_Broker;
+        class _TAO_EventDef_Remote_Proxy_Broker;
+        
+        class TAO_IFR_Client_Export EventDef
+          : public virtual CORBA_Contained
+        {
+        public:
+        #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+          typedef EventDef_ptr _ptr_type;
+          typedef EventDef_var _var_type;
+        #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+          // the static operations
+          static EventDef_ptr _duplicate (EventDef_ptr obj);
+          
+          static EventDef_ptr _narrow (
+              CORBA::Object_ptr obj,
+              CORBA::Environment &ACE_TRY_ENV = 
+                TAO_default_environment ()
+            );
+          
+          static EventDef_ptr _unchecked_narrow (
+              CORBA::Object_ptr obj,
+              CORBA::Environment &ACE_TRY_ENV = 
+                TAO_default_environment ()
+            );
+          
+          static EventDef_ptr _nil (void)
+            {
+              return (EventDef_ptr)0;
+            }
+          
+          static void _tao_any_destructor (void*);
+          
+          virtual CORBA::Boolean is_a (
+              const char * event_id,
+              CORBA::Environment &ACE_TRY_ENV = 
+                TAO_default_environment ()
+            )
+            ACE_THROW_SPEC ((
+              CORBA::SystemException
+            ));
+          
+          virtual CORBA_ValueDef_ptr event (
+              CORBA::Environment &ACE_TRY_ENV = 
+                TAO_default_environment ()
+            )
+            ACE_THROW_SPEC ((
+              CORBA::SystemException
+            ));
+          
+          virtual CORBA::Boolean _is_a (
+              const CORBA::Char *type_id, 
+              CORBA::Environment &ACE_TRY_ENV = 
+                TAO_default_environment ()
+            );
+          
+          virtual void *_tao_QueryInterface (ptr_arith_t type);
+          
+          virtual const char* _interface_repository_id (void) const;
+
+        private:
+          _TAO_EventDef_Proxy_Broker *the_TAO_EventDef_Proxy_Broker_;
+          
+        protected:
+          EventDef (int collocated = 0);
+          
+          // This methods travese the inheritance tree and set the
+          // parents piece of the given class in the right mode
+          virtual void IR_EventDef_setup_collocation (int collocated);
+          
+          EventDef (
+              TAO_Stub *objref, 
+              CORBA::Boolean _tao_collocated = 0,
+              TAO_Abstract_ServantBase *servant = 0
+            );
+          
+          friend class _TAO_EventDef_Remote_Proxy_Impl;
+          friend class _TAO_EventDef_ThruPOA_Proxy_Impl;
+          friend class _TAO_EventDef_Direct_Proxy_Impl;
+          
+          virtual ~EventDef (void);
+        
+        private:
+          EventDef (const EventDef &);
+          void operator= (const EventDef &);
+        };
+        
+        // The Proxy Implementations are used by each interface to
+        // perform a call. Each different implementation encapsulate
+        // an invocation logics.
+        
+        
+        ///////////////////////////////////////////////////////////////////////
+        //                    Base Proxy Impl. Declaration
+        //
+        
+        class TAO_IFR_Client_Export _TAO_EventDef_Proxy_Impl
+          : public virtual _TAO_CORBA_Contained_Proxy_Impl
+        {
+        public:
+          virtual ~_TAO_EventDef_Proxy_Impl (void) { }
+          virtual CORBA::Boolean is_a (
+              CORBA_Object *_collocated_tao_target_,
+              const char * event_id,
+              CORBA::Environment &ACE_TRY_ENV
+            )
+            ACE_THROW_SPEC ((
+              CORBA::SystemException
+            )) = 0;
+          
+          virtual CORBA_ValueDef_ptr event (
+              CORBA_Object *_collocated_tao_target_,
+              CORBA::Environment &ACE_TRY_ENV
+            )
+            ACE_THROW_SPEC ((
+              CORBA::SystemException
+            )) = 0;
+          
+          
+        protected:
+          _TAO_EventDef_Proxy_Impl (void);
+        };
+        
+        //
+        //               End Base Proxy Impl. Declaration
+        ///////////////////////////////////////////////////////////////////////
+        
+        
+        ///////////////////////////////////////////////////////////////////////
+        //                Remote Proxy Impl. Declaration
+        //
+        
+        class TAO_IFR_Client_Export _TAO_EventDef_Remote_Proxy_Impl
+          : public virtual _TAO_EventDef_Proxy_Impl,
+            public virtual TAO_Remote_Object_Proxy_Impl,
+            public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl
+        {
+        public:
+          _TAO_EventDef_Remote_Proxy_Impl (void);
+          
+          virtual ~_TAO_EventDef_Remote_Proxy_Impl (void) { }
+          virtual CORBA::Boolean is_a (
+              CORBA_Object *_collocated_tao_target_,
+              const char * event_id,
+              CORBA::Environment &ACE_TRY_ENV
+            )
+            ACE_THROW_SPEC ((
+              CORBA::SystemException
+            ));
+          
+          virtual CORBA_ValueDef_ptr event (
+              CORBA_Object *_collocated_tao_target_,
+              CORBA::Environment &ACE_TRY_ENV
+            )
+            ACE_THROW_SPEC ((
+              CORBA::SystemException
+            ));
+          
+          
+        };
+        
+        //
+        //             End Remote Proxy Impl. Declaration
+        ///////////////////////////////////////////////////////////////////////
+        
+        // The Proxy Brokers are used by each interface to get
+        // the right proxy for performing a call. In the new 
+        // collocation scheme, the proxy to be used can vary on
+        // a call by call basis.
+        
+        
+        ///////////////////////////////////////////////////////////////////////
+        //                 Base Proxy Broker Declaration 
+        //
+        
+                class TAO_IFR_Client_Export _TAO_EventDef_Proxy_Broker
+        {
+        public:
+          virtual ~_TAO_EventDef_Proxy_Broker (void);
+          virtual _TAO_EventDef_Proxy_Impl &select_proxy (
+              EventDef *object,
+              CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+            ) = 0;
+          
+        protected:
+          _TAO_EventDef_Proxy_Broker (void);
+          
+        };
+        
+        //
+        //              End Base Proxy Broker Declaration 
+        ///////////////////////////////////////////////////////////////////////
+        
+                
+        ///////////////////////////////////////////////////////////////////////
+        //                 Remote Proxy Broker Declaration 
+        //
+        
+        class TAO_IFR_Client_Export _TAO_EventDef_Remote_Proxy_Broker
+          : public virtual _TAO_EventDef_Proxy_Broker
+        {
+        public: 
+          _TAO_EventDef_Remote_Proxy_Broker (void);
+          
+          virtual ~_TAO_EventDef_Remote_Proxy_Broker (void);
+          
+          virtual _TAO_EventDef_Proxy_Impl &select_proxy (
+              EventDef *object,
+              CORBA_Environment &ACE_TRY_ENV
+            );
+          
+          private:
+            _TAO_EventDef_Remote_Proxy_Impl remote_proxy_impl_;
+          
+          public:
+            // This member function is used to get an handle to the unique instance
+            // of the Remote Proxy Broker that is available for a given
+            // interface.
+            static _TAO_EventDef_Remote_Proxy_Broker *the_TAO_EventDef_Remote_Proxy_Broker (void);
+          };
+          
+          //
+          //              End Remote Proxy Broker Declaration 
+          ///////////////////////////////////////////////////////////////////////
+          
+          
 #endif /* end #if !defined */
-
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EventDef;
-
-struct EventDescription;
-class EventDescription_var;
-
-struct TAO_IFR_Client_Export EventDescription
-{
-
+          
+          TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EventDef;
+          
+          struct EventDescription;
+          class EventDescription_var;
+          
+          struct TAO_IFR_Client_Export EventDescription
+          {
+            
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef EventDescription_var _var_type;
+            typedef EventDescription_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-  static void _tao_any_destructor (void*);
-
-  TAO_String_Manager name;
-  TAO_String_Manager id;
-  TAO_String_Manager defined_in;
-  TAO_String_Manager version;
-  CORBA_ValueDef_var value;
-};
-
-class TAO_IFR_Client_Export EventDescription_var
-{
-public:
-  EventDescription_var (void); // default constructor
-  EventDescription_var (EventDescription *);
-  EventDescription_var (const EventDescription_var &); // copy constructor
-  ~EventDescription_var (void); // destructor
-  
-  EventDescription_var &operator= (EventDescription *);
-  EventDescription_var &operator= (const EventDescription_var &);
-  EventDescription *operator-> (void);
-  const EventDescription *operator-> (void) const;
-  
-  operator const EventDescription &() const;
-  operator EventDescription &();
-  operator EventDescription &() const;
-  operator EventDescription *&(); // variable-size types only
-  
-  // in, inout, out, _retn 
-  const EventDescription &in (void) const;
-  EventDescription &inout (void);
-  EventDescription *&out (void);
-  EventDescription *_retn (void);
-  EventDescription *ptr (void) const;
-
-private:
-  EventDescription *ptr_;
-};
-
-class TAO_IFR_Client_Export EventDescription_out
-{
-public:
-  EventDescription_out (EventDescription *&);
-  EventDescription_out (EventDescription_var &);
-  EventDescription_out (const EventDescription_out &);
-  EventDescription_out &operator= (const EventDescription_out &);
-  EventDescription_out &operator= (EventDescription *);
-  operator EventDescription *&();
-  EventDescription *&ptr (void);
-  EventDescription *operator-> (void);
-  
-private:
-  EventDescription *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const EventDescription_var &);
-};
-
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EventDescription;
-
-
+            static void _tao_any_destructor (void*);
+            
+            TAO_String_Manager name;
+            TAO_String_Manager id;
+            TAO_String_Manager defined_in;
+            TAO_String_Manager version;
+            CORBA_ValueDef_var value;
+            
+          };
+          
+          class TAO_IFR_Client_Export EventDescription_var
+          {
+          public:
+            EventDescription_var (void);
+            EventDescription_var (EventDescription *);
+            EventDescription_var (const EventDescription_var &);
+            ~EventDescription_var (void);
+            
+            EventDescription_var &operator= (EventDescription *);
+            EventDescription_var &operator= (const EventDescription_var &);
+            EventDescription *operator-> (void);
+            const EventDescription *operator-> (void) const;
+            
+            operator const EventDescription &() const;
+            operator EventDescription &();
+            operator EventDescription &() const;
+            // Variable-size types only.
+            operator EventDescription *&();
+            
+            // in, inout, out, _retn 
+            const EventDescription &in (void) const;
+            EventDescription &inout (void);
+            EventDescription *&out (void);
+            EventDescription *_retn (void);
+            EventDescription *ptr (void) const;
+          
+          private:
+            EventDescription *ptr_;
+          };
+          
+          class TAO_IFR_Client_Export EventDescription_out
+          {
+          public:
+            EventDescription_out (EventDescription *&);
+            EventDescription_out (EventDescription_var &);
+            EventDescription_out (const EventDescription_out &);
+            EventDescription_out &operator= (const EventDescription_out &);
+            EventDescription_out &operator= (EventDescription *);
+            operator EventDescription *&();
+            EventDescription *&ptr (void);
+            EventDescription *operator-> (void);
+            
+          private:
+            EventDescription *&ptr_;
+            // Assignment from T_var not allowed.
+            void operator= (const EventDescription_var &);
+          };
+          
+          TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EventDescription;
+          
+          
 #if !defined (_IR_EMITSDEF_CH_)
 #define _IR_EMITSDEF_CH_
-
-// Forward Classes Declaration
-class _TAO_EmitsDef_Proxy_Impl;
-class _TAO_EmitsDef_Remote_Proxy_Impl;
-class _TAO_EmitsDef_Proxy_Broker;
-class _TAO_EmitsDef_Remote_Proxy_Broker;
-
-class TAO_IFR_Client_Export EmitsDef: public virtual EventDef
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef EmitsDef_ptr _ptr_type;
-  typedef EmitsDef_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static EmitsDef_ptr _duplicate (EmitsDef_ptr obj);
-  static EmitsDef_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static EmitsDef_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static EmitsDef_ptr _nil (void)
-    {
-      return (EmitsDef_ptr)0;
-    }
-
-  static void _tao_any_destructor (void*);
-
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
-
-private:
-  _TAO_EmitsDef_Proxy_Broker *the_TAO_EmitsDef_Proxy_Broker_;
-  
-protected:
-  EmitsDef (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void IR_EmitsDef_setup_collocation (int collocated);
-    
-    EmitsDef (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_EmitsDef_Remote_Proxy_Impl;
-    friend class _TAO_EmitsDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_EmitsDef_Direct_Proxy_Impl;
-  
-  virtual ~EmitsDef (void);
-private:
-  EmitsDef (const EmitsDef &);
-  void operator= (const EmitsDef &);
-};
-
-
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_EmitsDef_Proxy_Impl : 
-  public virtual IR::_TAO_EventDef_Proxy_Impl
-{
-public:
-  virtual ~_TAO_EmitsDef_Proxy_Impl (void) { }
-  
-  protected:
-  _TAO_EmitsDef_Proxy_Impl (void);
-
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_EmitsDef_Remote_Proxy_Impl : 
-  public virtual _TAO_EmitsDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual IR::_TAO_EventDef_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_EmitsDef_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_EmitsDef_Remote_Proxy_Impl (void) { }
-  
-  };
-
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
-
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_EmitsDef_Proxy_Broker
-{
-public:
-  virtual ~_TAO_EmitsDef_Proxy_Broker (void);
-  virtual _TAO_EmitsDef_Proxy_Impl &select_proxy (
-    EmitsDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
-
-protected:
-  _TAO_EmitsDef_Proxy_Broker (void);
-  
-};
-
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_EmitsDef_Remote_Proxy_Broker : public virtual _TAO_EmitsDef_Proxy_Broker
-{
-public: 
-  _TAO_EmitsDef_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_EmitsDef_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_EmitsDef_Proxy_Impl &select_proxy (
-    EmitsDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
-
-private:
-  _TAO_EmitsDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
-
-public:
-  static _TAO_EmitsDef_Remote_Proxy_Broker *the_TAO_EmitsDef_Remote_Proxy_Broker (void);
-};
-
-
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
+          
+          // Forward Classes Declaration
+          class _TAO_EmitsDef_Proxy_Impl;
+          class _TAO_EmitsDef_Remote_Proxy_Impl;
+          class _TAO_EmitsDef_Proxy_Broker;
+          class _TAO_EmitsDef_Remote_Proxy_Broker;
+          
+          class TAO_IFR_Client_Export EmitsDef
+            : public virtual EventDef
+          {
+          public:
+          #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+            typedef EmitsDef_ptr _ptr_type;
+            typedef EmitsDef_var _var_type;
+          #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+            // the static operations
+            static EmitsDef_ptr _duplicate (EmitsDef_ptr obj);
+            
+            static EmitsDef_ptr _narrow (
+                CORBA::Object_ptr obj,
+                CORBA::Environment &ACE_TRY_ENV = 
+                  TAO_default_environment ()
+              );
+            
+            static EmitsDef_ptr _unchecked_narrow (
+                CORBA::Object_ptr obj,
+                CORBA::Environment &ACE_TRY_ENV = 
+                  TAO_default_environment ()
+              );
+            
+            static EmitsDef_ptr _nil (void)
+              {
+                return (EmitsDef_ptr)0;
+              }
+            
+            static void _tao_any_destructor (void*);
+            
+            virtual CORBA::Boolean _is_a (
+                const CORBA::Char *type_id, 
+                CORBA::Environment &ACE_TRY_ENV = 
+                  TAO_default_environment ()
+              );
+            
+            virtual void *_tao_QueryInterface (ptr_arith_t type);
+            
+            virtual const char* _interface_repository_id (void) const;
+
+          private:
+            _TAO_EmitsDef_Proxy_Broker *the_TAO_EmitsDef_Proxy_Broker_;
+            
+          protected:
+            EmitsDef (int collocated = 0);
+            
+            // This methods travese the inheritance tree and set the
+            // parents piece of the given class in the right mode
+            virtual void IR_EmitsDef_setup_collocation (int collocated);
+            
+            EmitsDef (
+                TAO_Stub *objref, 
+                CORBA::Boolean _tao_collocated = 0,
+                TAO_Abstract_ServantBase *servant = 0
+              );
+            
+            friend class _TAO_EmitsDef_Remote_Proxy_Impl;
+            friend class _TAO_EmitsDef_ThruPOA_Proxy_Impl;
+            friend class _TAO_EmitsDef_Direct_Proxy_Impl;
+            
+            virtual ~EmitsDef (void);
+          
+          private:
+            EmitsDef (const EmitsDef &);
+            void operator= (const EmitsDef &);
+          };
+          
+          // The Proxy Implementations are used by each interface to
+          // perform a call. Each different implementation encapsulate
+          // an invocation logics.
+          
+          
+          ///////////////////////////////////////////////////////////////////////
+          //                    Base Proxy Impl. Declaration
+          //
+          
+          class TAO_IFR_Client_Export _TAO_EmitsDef_Proxy_Impl
+            : public virtual IR::_TAO_EventDef_Proxy_Impl
+          {
+          public:
+            virtual ~_TAO_EmitsDef_Proxy_Impl (void) { }
+            
+          protected:
+            _TAO_EmitsDef_Proxy_Impl (void);
+          };
+          
+          //
+          //               End Base Proxy Impl. Declaration
+          ///////////////////////////////////////////////////////////////////////
+          
+          
+          ///////////////////////////////////////////////////////////////////////
+          //                Remote Proxy Impl. Declaration
+          //
+          
+          class TAO_IFR_Client_Export _TAO_EmitsDef_Remote_Proxy_Impl
+            : public virtual _TAO_EmitsDef_Proxy_Impl,
+              public virtual TAO_Remote_Object_Proxy_Impl,
+              public virtual IR::_TAO_EventDef_Remote_Proxy_Impl
+          {
+          public:
+            _TAO_EmitsDef_Remote_Proxy_Impl (void);
+            
+            virtual ~_TAO_EmitsDef_Remote_Proxy_Impl (void) { }
+            
+          };
+          
+          //
+          //             End Remote Proxy Impl. Declaration
+          ///////////////////////////////////////////////////////////////////////
+          
+          // The Proxy Brokers are used by each interface to get
+          // the right proxy for performing a call. In the new 
+          // collocation scheme, the proxy to be used can vary on
+          // a call by call basis.
+          
+          
+          ///////////////////////////////////////////////////////////////////////
+          //                 Base Proxy Broker Declaration 
+          //
+          
+                    class TAO_IFR_Client_Export _TAO_EmitsDef_Proxy_Broker
+          {
+          public:
+            virtual ~_TAO_EmitsDef_Proxy_Broker (void);
+            virtual _TAO_EmitsDef_Proxy_Impl &select_proxy (
+                EmitsDef *object,
+                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+              ) = 0;
+            
+          protected:
+            _TAO_EmitsDef_Proxy_Broker (void);
+            
+          };
+          
+          //
+          //              End Base Proxy Broker Declaration 
+          ///////////////////////////////////////////////////////////////////////
+          
+                    
+          ///////////////////////////////////////////////////////////////////////
+          //                 Remote Proxy Broker Declaration 
+          //
+          
+          class TAO_IFR_Client_Export _TAO_EmitsDef_Remote_Proxy_Broker
+            : public virtual _TAO_EmitsDef_Proxy_Broker
+          {
+          public: 
+            _TAO_EmitsDef_Remote_Proxy_Broker (void);
+            
+            virtual ~_TAO_EmitsDef_Remote_Proxy_Broker (void);
+            
+            virtual _TAO_EmitsDef_Proxy_Impl &select_proxy (
+                EmitsDef *object,
+                CORBA_Environment &ACE_TRY_ENV
+              );
+            
+            private:
+              _TAO_EmitsDef_Remote_Proxy_Impl remote_proxy_impl_;
+            
+            public:
+              // This member function is used to get an handle to the unique instance
+              // of the Remote Proxy Broker that is available for a given
+              // interface.
+              static _TAO_EmitsDef_Remote_Proxy_Broker *the_TAO_EmitsDef_Remote_Proxy_Broker (void);
+            };
+            
+            //
+            //              End Remote Proxy Broker Declaration 
+            ///////////////////////////////////////////////////////////////////////
+            
+            
 #endif /* end #if !defined */
-
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EmitsDef;
-
-
+            
+            TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EmitsDef;
+            
+            
 #if !defined (_IR_PUBLISHESDEF_CH_)
 #define _IR_PUBLISHESDEF_CH_
-
-// Forward Classes Declaration
-class _TAO_PublishesDef_Proxy_Impl;
-class _TAO_PublishesDef_Remote_Proxy_Impl;
-class _TAO_PublishesDef_Proxy_Broker;
-class _TAO_PublishesDef_Remote_Proxy_Broker;
-
-class TAO_IFR_Client_Export PublishesDef: public virtual EventDef
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef PublishesDef_ptr _ptr_type;
-  typedef PublishesDef_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static PublishesDef_ptr _duplicate (PublishesDef_ptr obj);
-  static PublishesDef_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static PublishesDef_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static PublishesDef_ptr _nil (void)
-    {
-      return (PublishesDef_ptr)0;
-    }
-
-  static void _tao_any_destructor (void*);
-
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
-
-private:
-  _TAO_PublishesDef_Proxy_Broker *the_TAO_PublishesDef_Proxy_Broker_;
-  
-protected:
-  PublishesDef (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void IR_PublishesDef_setup_collocation (int collocated);
-    
-    PublishesDef (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_PublishesDef_Remote_Proxy_Impl;
-    friend class _TAO_PublishesDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_PublishesDef_Direct_Proxy_Impl;
-  
-  virtual ~PublishesDef (void);
-private:
-  PublishesDef (const PublishesDef &);
-  void operator= (const PublishesDef &);
-};
-
-
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_PublishesDef_Proxy_Impl : 
-  public virtual IR::_TAO_EventDef_Proxy_Impl
-{
-public:
-  virtual ~_TAO_PublishesDef_Proxy_Impl (void) { }
-  
-  protected:
-  _TAO_PublishesDef_Proxy_Impl (void);
-
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_PublishesDef_Remote_Proxy_Impl : 
-  public virtual _TAO_PublishesDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual IR::_TAO_EventDef_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_PublishesDef_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_PublishesDef_Remote_Proxy_Impl (void) { }
-  
-  };
-
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
-
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_PublishesDef_Proxy_Broker
-{
-public:
-  virtual ~_TAO_PublishesDef_Proxy_Broker (void);
-  virtual _TAO_PublishesDef_Proxy_Impl &select_proxy (
-    PublishesDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
-
-protected:
-  _TAO_PublishesDef_Proxy_Broker (void);
-  
-};
-
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_PublishesDef_Remote_Proxy_Broker : public virtual _TAO_PublishesDef_Proxy_Broker
-{
-public: 
-  _TAO_PublishesDef_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_PublishesDef_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_PublishesDef_Proxy_Impl &select_proxy (
-    PublishesDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
-
-private:
-  _TAO_PublishesDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
-
-public:
-  static _TAO_PublishesDef_Remote_Proxy_Broker *the_TAO_PublishesDef_Remote_Proxy_Broker (void);
-};
-
-
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
+            
+            // Forward Classes Declaration
+            class _TAO_PublishesDef_Proxy_Impl;
+            class _TAO_PublishesDef_Remote_Proxy_Impl;
+            class _TAO_PublishesDef_Proxy_Broker;
+            class _TAO_PublishesDef_Remote_Proxy_Broker;
+            
+            class TAO_IFR_Client_Export PublishesDef
+              : public virtual EventDef
+            {
+            public:
+            #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+              typedef PublishesDef_ptr _ptr_type;
+              typedef PublishesDef_var _var_type;
+            #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+              // the static operations
+              static PublishesDef_ptr _duplicate (PublishesDef_ptr obj);
+              
+              static PublishesDef_ptr _narrow (
+                  CORBA::Object_ptr obj,
+                  CORBA::Environment &ACE_TRY_ENV = 
+                    TAO_default_environment ()
+                );
+              
+              static PublishesDef_ptr _unchecked_narrow (
+                  CORBA::Object_ptr obj,
+                  CORBA::Environment &ACE_TRY_ENV = 
+                    TAO_default_environment ()
+                );
+              
+              static PublishesDef_ptr _nil (void)
+                {
+                  return (PublishesDef_ptr)0;
+                }
+              
+              static void _tao_any_destructor (void*);
+              
+              virtual CORBA::Boolean _is_a (
+                  const CORBA::Char *type_id, 
+                  CORBA::Environment &ACE_TRY_ENV = 
+                    TAO_default_environment ()
+                );
+              
+              virtual void *_tao_QueryInterface (ptr_arith_t type);
+              
+              virtual const char* _interface_repository_id (void) const;
+
+            private:
+              _TAO_PublishesDef_Proxy_Broker *the_TAO_PublishesDef_Proxy_Broker_;
+              
+            protected:
+              PublishesDef (int collocated = 0);
+              
+              // This methods travese the inheritance tree and set the
+              // parents piece of the given class in the right mode
+              virtual void IR_PublishesDef_setup_collocation (int collocated);
+              
+              PublishesDef (
+                  TAO_Stub *objref, 
+                  CORBA::Boolean _tao_collocated = 0,
+                  TAO_Abstract_ServantBase *servant = 0
+                );
+              
+              friend class _TAO_PublishesDef_Remote_Proxy_Impl;
+              friend class _TAO_PublishesDef_ThruPOA_Proxy_Impl;
+              friend class _TAO_PublishesDef_Direct_Proxy_Impl;
+              
+              virtual ~PublishesDef (void);
+            
+            private:
+              PublishesDef (const PublishesDef &);
+              void operator= (const PublishesDef &);
+            };
+            
+            // The Proxy Implementations are used by each interface to
+            // perform a call. Each different implementation encapsulate
+            // an invocation logics.
+            
+            
+            ///////////////////////////////////////////////////////////////////////
+            //                    Base Proxy Impl. Declaration
+            //
+            
+            class TAO_IFR_Client_Export _TAO_PublishesDef_Proxy_Impl
+              : public virtual IR::_TAO_EventDef_Proxy_Impl
+            {
+            public:
+              virtual ~_TAO_PublishesDef_Proxy_Impl (void) { }
+              
+            protected:
+              _TAO_PublishesDef_Proxy_Impl (void);
+            };
+            
+            //
+            //               End Base Proxy Impl. Declaration
+            ///////////////////////////////////////////////////////////////////////
+            
+            
+            ///////////////////////////////////////////////////////////////////////
+            //                Remote Proxy Impl. Declaration
+            //
+            
+            class TAO_IFR_Client_Export _TAO_PublishesDef_Remote_Proxy_Impl
+              : public virtual _TAO_PublishesDef_Proxy_Impl,
+                public virtual TAO_Remote_Object_Proxy_Impl,
+                public virtual IR::_TAO_EventDef_Remote_Proxy_Impl
+            {
+            public:
+              _TAO_PublishesDef_Remote_Proxy_Impl (void);
+              
+              virtual ~_TAO_PublishesDef_Remote_Proxy_Impl (void) { }
+              
+            };
+            
+            //
+            //             End Remote Proxy Impl. Declaration
+            ///////////////////////////////////////////////////////////////////////
+            
+            // The Proxy Brokers are used by each interface to get
+            // the right proxy for performing a call. In the new 
+            // collocation scheme, the proxy to be used can vary on
+            // a call by call basis.
+            
+            
+            ///////////////////////////////////////////////////////////////////////
+            //                 Base Proxy Broker Declaration 
+            //
+            
+                        class TAO_IFR_Client_Export _TAO_PublishesDef_Proxy_Broker
+            {
+            public:
+              virtual ~_TAO_PublishesDef_Proxy_Broker (void);
+              virtual _TAO_PublishesDef_Proxy_Impl &select_proxy (
+                  PublishesDef *object,
+                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                ) = 0;
+              
+            protected:
+              _TAO_PublishesDef_Proxy_Broker (void);
+              
+            };
+            
+            //
+            //              End Base Proxy Broker Declaration 
+            ///////////////////////////////////////////////////////////////////////
+            
+                        
+            ///////////////////////////////////////////////////////////////////////
+            //                 Remote Proxy Broker Declaration 
+            //
+            
+            class TAO_IFR_Client_Export _TAO_PublishesDef_Remote_Proxy_Broker
+              : public virtual _TAO_PublishesDef_Proxy_Broker
+            {
+            public: 
+              _TAO_PublishesDef_Remote_Proxy_Broker (void);
+              
+              virtual ~_TAO_PublishesDef_Remote_Proxy_Broker (void);
+              
+              virtual _TAO_PublishesDef_Proxy_Impl &select_proxy (
+                  PublishesDef *object,
+                  CORBA_Environment &ACE_TRY_ENV
+                );
+              
+              private:
+                _TAO_PublishesDef_Remote_Proxy_Impl remote_proxy_impl_;
+              
+              public:
+                // This member function is used to get an handle to the unique instance
+                // of the Remote Proxy Broker that is available for a given
+                // interface.
+                static _TAO_PublishesDef_Remote_Proxy_Broker *the_TAO_PublishesDef_Remote_Proxy_Broker (void);
+              };
+              
+              //
+              //              End Remote Proxy Broker Declaration 
+              ///////////////////////////////////////////////////////////////////////
+              
+              
 #endif /* end #if !defined */
-
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PublishesDef;
-
-
+              
+              TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PublishesDef;
+              
+              
 #if !defined (_IR_CONSUMESDEF_CH_)
 #define _IR_CONSUMESDEF_CH_
-
-// Forward Classes Declaration
-class _TAO_ConsumesDef_Proxy_Impl;
-class _TAO_ConsumesDef_Remote_Proxy_Impl;
-class _TAO_ConsumesDef_Proxy_Broker;
-class _TAO_ConsumesDef_Remote_Proxy_Broker;
-
-class TAO_IFR_Client_Export ConsumesDef: public virtual EventDef
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef ConsumesDef_ptr _ptr_type;
-  typedef ConsumesDef_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static ConsumesDef_ptr _duplicate (ConsumesDef_ptr obj);
-  static ConsumesDef_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static ConsumesDef_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static ConsumesDef_ptr _nil (void)
-    {
-      return (ConsumesDef_ptr)0;
-    }
-
-  static void _tao_any_destructor (void*);
-
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
-
-private:
-  _TAO_ConsumesDef_Proxy_Broker *the_TAO_ConsumesDef_Proxy_Broker_;
-  
-protected:
-  ConsumesDef (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void IR_ConsumesDef_setup_collocation (int collocated);
-    
-    ConsumesDef (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_ConsumesDef_Remote_Proxy_Impl;
-    friend class _TAO_ConsumesDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ConsumesDef_Direct_Proxy_Impl;
-  
-  virtual ~ConsumesDef (void);
-private:
-  ConsumesDef (const ConsumesDef &);
-  void operator= (const ConsumesDef &);
-};
-
-
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_ConsumesDef_Proxy_Impl : 
-  public virtual IR::_TAO_EventDef_Proxy_Impl
-{
-public:
-  virtual ~_TAO_ConsumesDef_Proxy_Impl (void) { }
-  
-  protected:
-  _TAO_ConsumesDef_Proxy_Impl (void);
-
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_ConsumesDef_Remote_Proxy_Impl : 
-  public virtual _TAO_ConsumesDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual IR::_TAO_EventDef_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_ConsumesDef_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_ConsumesDef_Remote_Proxy_Impl (void) { }
-  
-  };
-
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
-
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_ConsumesDef_Proxy_Broker
-{
-public:
-  virtual ~_TAO_ConsumesDef_Proxy_Broker (void);
-  virtual _TAO_ConsumesDef_Proxy_Impl &select_proxy (
-    ConsumesDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
-
-protected:
-  _TAO_ConsumesDef_Proxy_Broker (void);
-  
-};
-
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_ConsumesDef_Remote_Proxy_Broker : public virtual _TAO_ConsumesDef_Proxy_Broker
-{
-public: 
-  _TAO_ConsumesDef_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_ConsumesDef_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_ConsumesDef_Proxy_Impl &select_proxy (
-    ConsumesDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
-
-private:
-  _TAO_ConsumesDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
-
-public:
-  static _TAO_ConsumesDef_Remote_Proxy_Broker *the_TAO_ConsumesDef_Remote_Proxy_Broker (void);
-};
-
-
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
+              
+              // Forward Classes Declaration
+              class _TAO_ConsumesDef_Proxy_Impl;
+              class _TAO_ConsumesDef_Remote_Proxy_Impl;
+              class _TAO_ConsumesDef_Proxy_Broker;
+              class _TAO_ConsumesDef_Remote_Proxy_Broker;
+              
+              class TAO_IFR_Client_Export ConsumesDef
+                : public virtual EventDef
+              {
+              public:
+              #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+                typedef ConsumesDef_ptr _ptr_type;
+                typedef ConsumesDef_var _var_type;
+              #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+                // the static operations
+                static ConsumesDef_ptr _duplicate (ConsumesDef_ptr obj);
+                
+                static ConsumesDef_ptr _narrow (
+                    CORBA::Object_ptr obj,
+                    CORBA::Environment &ACE_TRY_ENV = 
+                      TAO_default_environment ()
+                  );
+                
+                static ConsumesDef_ptr _unchecked_narrow (
+                    CORBA::Object_ptr obj,
+                    CORBA::Environment &ACE_TRY_ENV = 
+                      TAO_default_environment ()
+                  );
+                
+                static ConsumesDef_ptr _nil (void)
+                  {
+                    return (ConsumesDef_ptr)0;
+                  }
+                
+                static void _tao_any_destructor (void*);
+                
+                virtual CORBA::Boolean _is_a (
+                    const CORBA::Char *type_id, 
+                    CORBA::Environment &ACE_TRY_ENV = 
+                      TAO_default_environment ()
+                  );
+                
+                virtual void *_tao_QueryInterface (ptr_arith_t type);
+                
+                virtual const char* _interface_repository_id (void) const;
+
+              private:
+                _TAO_ConsumesDef_Proxy_Broker *the_TAO_ConsumesDef_Proxy_Broker_;
+                
+              protected:
+                ConsumesDef (int collocated = 0);
+                
+                // This methods travese the inheritance tree and set the
+                // parents piece of the given class in the right mode
+                virtual void IR_ConsumesDef_setup_collocation (int collocated);
+                
+                ConsumesDef (
+                    TAO_Stub *objref, 
+                    CORBA::Boolean _tao_collocated = 0,
+                    TAO_Abstract_ServantBase *servant = 0
+                  );
+                
+                friend class _TAO_ConsumesDef_Remote_Proxy_Impl;
+                friend class _TAO_ConsumesDef_ThruPOA_Proxy_Impl;
+                friend class _TAO_ConsumesDef_Direct_Proxy_Impl;
+                
+                virtual ~ConsumesDef (void);
+              
+              private:
+                ConsumesDef (const ConsumesDef &);
+                void operator= (const ConsumesDef &);
+              };
+              
+              // The Proxy Implementations are used by each interface to
+              // perform a call. Each different implementation encapsulate
+              // an invocation logics.
+              
+              
+              ///////////////////////////////////////////////////////////////////////
+              //                    Base Proxy Impl. Declaration
+              //
+              
+              class TAO_IFR_Client_Export _TAO_ConsumesDef_Proxy_Impl
+                : public virtual IR::_TAO_EventDef_Proxy_Impl
+              {
+              public:
+                virtual ~_TAO_ConsumesDef_Proxy_Impl (void) { }
+                
+              protected:
+                _TAO_ConsumesDef_Proxy_Impl (void);
+              };
+              
+              //
+              //               End Base Proxy Impl. Declaration
+              ///////////////////////////////////////////////////////////////////////
+              
+              
+              ///////////////////////////////////////////////////////////////////////
+              //                Remote Proxy Impl. Declaration
+              //
+              
+              class TAO_IFR_Client_Export _TAO_ConsumesDef_Remote_Proxy_Impl
+                : public virtual _TAO_ConsumesDef_Proxy_Impl,
+                  public virtual TAO_Remote_Object_Proxy_Impl,
+                  public virtual IR::_TAO_EventDef_Remote_Proxy_Impl
+              {
+              public:
+                _TAO_ConsumesDef_Remote_Proxy_Impl (void);
+                
+                virtual ~_TAO_ConsumesDef_Remote_Proxy_Impl (void) { }
+                
+              };
+              
+              //
+              //             End Remote Proxy Impl. Declaration
+              ///////////////////////////////////////////////////////////////////////
+              
+              // The Proxy Brokers are used by each interface to get
+              // the right proxy for performing a call. In the new 
+              // collocation scheme, the proxy to be used can vary on
+              // a call by call basis.
+              
+              
+              ///////////////////////////////////////////////////////////////////////
+              //                 Base Proxy Broker Declaration 
+              //
+              
+                            class TAO_IFR_Client_Export _TAO_ConsumesDef_Proxy_Broker
+              {
+              public:
+                virtual ~_TAO_ConsumesDef_Proxy_Broker (void);
+                virtual _TAO_ConsumesDef_Proxy_Impl &select_proxy (
+                    ConsumesDef *object,
+                    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                  ) = 0;
+                
+              protected:
+                _TAO_ConsumesDef_Proxy_Broker (void);
+                
+              };
+              
+              //
+              //              End Base Proxy Broker Declaration 
+              ///////////////////////////////////////////////////////////////////////
+              
+                            
+              ///////////////////////////////////////////////////////////////////////
+              //                 Remote Proxy Broker Declaration 
+              //
+              
+              class TAO_IFR_Client_Export _TAO_ConsumesDef_Remote_Proxy_Broker
+                : public virtual _TAO_ConsumesDef_Proxy_Broker
+              {
+              public: 
+                _TAO_ConsumesDef_Remote_Proxy_Broker (void);
+                
+                virtual ~_TAO_ConsumesDef_Remote_Proxy_Broker (void);
+                
+                virtual _TAO_ConsumesDef_Proxy_Impl &select_proxy (
+                    ConsumesDef *object,
+                    CORBA_Environment &ACE_TRY_ENV
+                  );
+                
+                private:
+                  _TAO_ConsumesDef_Remote_Proxy_Impl remote_proxy_impl_;
+                
+                public:
+                  // This member function is used to get an handle to the unique instance
+                  // of the Remote Proxy Broker that is available for a given
+                  // interface.
+                  static _TAO_ConsumesDef_Remote_Proxy_Broker *the_TAO_ConsumesDef_Remote_Proxy_Broker (void);
+                };
+                
+                //
+                //              End Remote Proxy Broker Declaration 
+                ///////////////////////////////////////////////////////////////////////
+                
+                
 #endif /* end #if !defined */
-
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ConsumesDef;
-
-
+                
+                TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ConsumesDef;
+                
+                
 #if !defined (_IR_COMPONENTDEF_CH_)
 #define _IR_COMPONENTDEF_CH_
-
-// Forward Classes Declaration
-class _TAO_ComponentDef_Proxy_Impl;
-class _TAO_ComponentDef_Remote_Proxy_Impl;
-class _TAO_ComponentDef_Proxy_Broker;
-class _TAO_ComponentDef_Remote_Proxy_Broker;
-
-class TAO_IFR_Client_Export ComponentDef: public virtual CORBA_InterfaceDef
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef ComponentDef_ptr _ptr_type;
-  typedef ComponentDef_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static ComponentDef_ptr _duplicate (ComponentDef_ptr obj);
-  static ComponentDef_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static ComponentDef_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static ComponentDef_ptr _nil (void)
-    {
-      return (ComponentDef_ptr)0;
-    }
-
-  static void _tao_any_destructor (void*);
-
-  virtual CORBA_InterfaceDefSeq * supported_interfaces (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void supported_interfaces (
-      const CORBA_InterfaceDefSeq & supported_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::ComponentDef_ptr base_component (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::ProvidesDefSeq * provides_interfaces (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::UsesDefSeq * uses_interfaces (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::EmitsDefSeq * emits_events (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::PublishesDefSeq * publishes_events (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::ConsumesDefSeq * consumes_events (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean is_basic (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::ProvidesDef_ptr create_provides (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_InterfaceDef_ptr interface_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::UsesDef_ptr create_uses (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_InterfaceDef_ptr interface_type,
-      CORBA::Boolean is_multiple,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::EmitsDef_ptr create_emits (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_ValueDef_ptr value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::PublishesDef_ptr create_publishes (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_ValueDef_ptr value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::ConsumesDef_ptr create_consumes (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_ValueDef_ptr value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
-
-private:
-  _TAO_ComponentDef_Proxy_Broker *the_TAO_ComponentDef_Proxy_Broker_;
-  
-protected:
-  ComponentDef (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void IR_ComponentDef_setup_collocation (int collocated);
-    
-    ComponentDef (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_ComponentDef_Remote_Proxy_Impl;
-    friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ComponentDef_Direct_Proxy_Impl;
-  
-  virtual ~ComponentDef (void);
-private:
-  ComponentDef (const ComponentDef &);
-  void operator= (const ComponentDef &);
-};
-
-
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_ComponentDef_Proxy_Impl : 
-  public virtual _TAO_CORBA_InterfaceDef_Proxy_Impl
-{
-public:
-  virtual ~_TAO_ComponentDef_Proxy_Impl (void) { }
-  
-    virtual CORBA_InterfaceDefSeq * supported_interfaces (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void supported_interfaces (
-      CORBA_Object *_collocated_tao_target_,
-      const CORBA_InterfaceDefSeq & supported_interfaces,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual IR::ComponentDef_ptr base_component (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual IR::ProvidesDefSeq * provides_interfaces (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual IR::UsesDefSeq * uses_interfaces (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual IR::EmitsDefSeq * emits_events (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual IR::PublishesDefSeq * publishes_events (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual IR::ConsumesDefSeq * consumes_events (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA::Boolean is_basic (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual IR::ProvidesDef_ptr create_provides (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_InterfaceDef_ptr interface_type,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual IR::UsesDef_ptr create_uses (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_InterfaceDef_ptr interface_type,
-      CORBA::Boolean is_multiple,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual IR::EmitsDef_ptr create_emits (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_ValueDef_ptr value,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual IR::PublishesDef_ptr create_publishes (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_ValueDef_ptr value,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual IR::ConsumesDef_ptr create_consumes (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_ValueDef_ptr value,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-protected:
-  _TAO_ComponentDef_Proxy_Impl (void);
-
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_ComponentDef_Remote_Proxy_Impl : 
-  public virtual _TAO_ComponentDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_ComponentDef_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_ComponentDef_Remote_Proxy_Impl (void) { }
-  
-    virtual CORBA_InterfaceDefSeq * supported_interfaces (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void supported_interfaces (
-      CORBA_Object *_collocated_tao_target_,
-      const CORBA_InterfaceDefSeq & supported_interfaces,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::ComponentDef_ptr base_component (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::ProvidesDefSeq * provides_interfaces (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::UsesDefSeq * uses_interfaces (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::EmitsDefSeq * emits_events (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::PublishesDefSeq * publishes_events (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::ConsumesDefSeq * consumes_events (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean is_basic (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::ProvidesDef_ptr create_provides (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_InterfaceDef_ptr interface_type,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::UsesDef_ptr create_uses (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_InterfaceDef_ptr interface_type,
-      CORBA::Boolean is_multiple,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::EmitsDef_ptr create_emits (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_ValueDef_ptr value,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::PublishesDef_ptr create_publishes (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_ValueDef_ptr value,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::ConsumesDef_ptr create_consumes (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_ValueDef_ptr value,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-};
-
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
-
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_ComponentDef_Proxy_Broker
-{
-public:
-  virtual ~_TAO_ComponentDef_Proxy_Broker (void);
-  virtual _TAO_ComponentDef_Proxy_Impl &select_proxy (
-    ComponentDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
-
-protected:
-  _TAO_ComponentDef_Proxy_Broker (void);
-  
-};
-
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_ComponentDef_Remote_Proxy_Broker : public virtual _TAO_ComponentDef_Proxy_Broker
-{
-public: 
-  _TAO_ComponentDef_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_ComponentDef_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_ComponentDef_Proxy_Impl &select_proxy (
-    ComponentDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
-
-private:
-  _TAO_ComponentDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
-
-public:
-  static _TAO_ComponentDef_Remote_Proxy_Broker *the_TAO_ComponentDef_Remote_Proxy_Broker (void);
-};
-
-
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
+                
+                // Forward Classes Declaration
+                class _TAO_ComponentDef_Proxy_Impl;
+                class _TAO_ComponentDef_Remote_Proxy_Impl;
+                class _TAO_ComponentDef_Proxy_Broker;
+                class _TAO_ComponentDef_Remote_Proxy_Broker;
+                
+                class TAO_IFR_Client_Export ComponentDef
+                  : public virtual CORBA_InterfaceDef
+                {
+                public:
+                #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+                  typedef ComponentDef_ptr _ptr_type;
+                  typedef ComponentDef_var _var_type;
+                #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+                  // the static operations
+                  static ComponentDef_ptr _duplicate (ComponentDef_ptr obj);
+                  
+                  static ComponentDef_ptr _narrow (
+                      CORBA::Object_ptr obj,
+                      CORBA::Environment &ACE_TRY_ENV = 
+                        TAO_default_environment ()
+                    );
+                  
+                  static ComponentDef_ptr _unchecked_narrow (
+                      CORBA::Object_ptr obj,
+                      CORBA::Environment &ACE_TRY_ENV = 
+                        TAO_default_environment ()
+                    );
+                  
+                  static ComponentDef_ptr _nil (void)
+                    {
+                      return (ComponentDef_ptr)0;
+                    }
+                  
+                  static void _tao_any_destructor (void*);
+                  
+                  virtual CORBA_InterfaceDefSeq * supported_interfaces (
+                      CORBA::Environment &ACE_TRY_ENV = 
+                        TAO_default_environment ()
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    ));
+                  
+                  virtual void supported_interfaces (
+                      const CORBA_InterfaceDefSeq & supported_interfaces,
+                      CORBA::Environment &ACE_TRY_ENV = 
+                        TAO_default_environment ()
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    ));
+                  
+                  virtual IR::ComponentDef_ptr base_component (
+                      CORBA::Environment &ACE_TRY_ENV = 
+                        TAO_default_environment ()
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    ));
+                  
+                  virtual IR::ProvidesDefSeq * provides_interfaces (
+                      CORBA::Environment &ACE_TRY_ENV = 
+                        TAO_default_environment ()
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    ));
+                  
+                  virtual IR::UsesDefSeq * uses_interfaces (
+                      CORBA::Environment &ACE_TRY_ENV = 
+                        TAO_default_environment ()
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    ));
+                  
+                  virtual IR::EmitsDefSeq * emits_events (
+                      CORBA::Environment &ACE_TRY_ENV = 
+                        TAO_default_environment ()
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    ));
+                  
+                  virtual IR::PublishesDefSeq * publishes_events (
+                      CORBA::Environment &ACE_TRY_ENV = 
+                        TAO_default_environment ()
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    ));
+                  
+                  virtual IR::ConsumesDefSeq * consumes_events (
+                      CORBA::Environment &ACE_TRY_ENV = 
+                        TAO_default_environment ()
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    ));
+                  
+                  virtual CORBA::Boolean is_basic (
+                      CORBA::Environment &ACE_TRY_ENV = 
+                        TAO_default_environment ()
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    ));
+                  
+                  virtual IR::ProvidesDef_ptr create_provides (
+                      const char * id,
+                      const char * name,
+                      const char * version,
+                      CORBA_InterfaceDef_ptr interface_type,
+                      CORBA::Environment &ACE_TRY_ENV = 
+                        TAO_default_environment ()
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    ));
+                  
+                  virtual IR::UsesDef_ptr create_uses (
+                      const char * id,
+                      const char * name,
+                      const char * version,
+                      CORBA_InterfaceDef_ptr interface_type,
+                      CORBA::Boolean is_multiple,
+                      CORBA::Environment &ACE_TRY_ENV = 
+                        TAO_default_environment ()
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    ));
+                  
+                  virtual IR::EmitsDef_ptr create_emits (
+                      const char * id,
+                      const char * name,
+                      const char * version,
+                      CORBA_ValueDef_ptr value,
+                      CORBA::Environment &ACE_TRY_ENV = 
+                        TAO_default_environment ()
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    ));
+                  
+                  virtual IR::PublishesDef_ptr create_publishes (
+                      const char * id,
+                      const char * name,
+                      const char * version,
+                      CORBA_ValueDef_ptr value,
+                      CORBA::Environment &ACE_TRY_ENV = 
+                        TAO_default_environment ()
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    ));
+                  
+                  virtual IR::ConsumesDef_ptr create_consumes (
+                      const char * id,
+                      const char * name,
+                      const char * version,
+                      CORBA_ValueDef_ptr value,
+                      CORBA::Environment &ACE_TRY_ENV = 
+                        TAO_default_environment ()
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    ));
+                  
+                  virtual CORBA::Boolean _is_a (
+                      const CORBA::Char *type_id, 
+                      CORBA::Environment &ACE_TRY_ENV = 
+                        TAO_default_environment ()
+                    );
+                  
+                  virtual void *_tao_QueryInterface (ptr_arith_t type);
+                  
+                  virtual const char* _interface_repository_id (void) const;
+
+                private:
+                  _TAO_ComponentDef_Proxy_Broker *the_TAO_ComponentDef_Proxy_Broker_;
+                  
+                protected:
+                  ComponentDef (int collocated = 0);
+                  
+                  // This methods travese the inheritance tree and set the
+                  // parents piece of the given class in the right mode
+                  virtual void IR_ComponentDef_setup_collocation (int collocated);
+                  
+                  ComponentDef (
+                      TAO_Stub *objref, 
+                      CORBA::Boolean _tao_collocated = 0,
+                      TAO_Abstract_ServantBase *servant = 0
+                    );
+                  
+                  friend class _TAO_ComponentDef_Remote_Proxy_Impl;
+                  friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
+                  friend class _TAO_ComponentDef_Direct_Proxy_Impl;
+                  
+                  virtual ~ComponentDef (void);
+                
+                private:
+                  ComponentDef (const ComponentDef &);
+                  void operator= (const ComponentDef &);
+                };
+                
+                // The Proxy Implementations are used by each interface to
+                // perform a call. Each different implementation encapsulate
+                // an invocation logics.
+                
+                
+                ///////////////////////////////////////////////////////////////////////
+                //                    Base Proxy Impl. Declaration
+                //
+                
+                class TAO_IFR_Client_Export _TAO_ComponentDef_Proxy_Impl
+                  : public virtual _TAO_CORBA_InterfaceDef_Proxy_Impl
+                {
+                public:
+                  virtual ~_TAO_ComponentDef_Proxy_Impl (void) { }
+                  virtual CORBA_InterfaceDefSeq * supported_interfaces (
+                      CORBA_Object *_collocated_tao_target_,
+                      CORBA::Environment &ACE_TRY_ENV
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    )) = 0;
+                  
+                  virtual void supported_interfaces (
+                      CORBA_Object *_collocated_tao_target_,
+                      const CORBA_InterfaceDefSeq & supported_interfaces,
+                      CORBA::Environment &ACE_TRY_ENV
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    )) = 0;
+                  
+                  virtual IR::ComponentDef_ptr base_component (
+                      CORBA_Object *_collocated_tao_target_,
+                      CORBA::Environment &ACE_TRY_ENV
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    )) = 0;
+                  
+                  virtual IR::ProvidesDefSeq * provides_interfaces (
+                      CORBA_Object *_collocated_tao_target_,
+                      CORBA::Environment &ACE_TRY_ENV
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    )) = 0;
+                  
+                  virtual IR::UsesDefSeq * uses_interfaces (
+                      CORBA_Object *_collocated_tao_target_,
+                      CORBA::Environment &ACE_TRY_ENV
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    )) = 0;
+                  
+                  virtual IR::EmitsDefSeq * emits_events (
+                      CORBA_Object *_collocated_tao_target_,
+                      CORBA::Environment &ACE_TRY_ENV
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    )) = 0;
+                  
+                  virtual IR::PublishesDefSeq * publishes_events (
+                      CORBA_Object *_collocated_tao_target_,
+                      CORBA::Environment &ACE_TRY_ENV
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    )) = 0;
+                  
+                  virtual IR::ConsumesDefSeq * consumes_events (
+                      CORBA_Object *_collocated_tao_target_,
+                      CORBA::Environment &ACE_TRY_ENV
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    )) = 0;
+                  
+                  virtual CORBA::Boolean is_basic (
+                      CORBA_Object *_collocated_tao_target_,
+                      CORBA::Environment &ACE_TRY_ENV
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    )) = 0;
+                  
+                  virtual IR::ProvidesDef_ptr create_provides (
+                      CORBA_Object *_collocated_tao_target_,
+                      const char * id,
+                      const char * name,
+                      const char * version,
+                      CORBA_InterfaceDef_ptr interface_type,
+                      CORBA::Environment &ACE_TRY_ENV
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    )) = 0;
+                  
+                  virtual IR::UsesDef_ptr create_uses (
+                      CORBA_Object *_collocated_tao_target_,
+                      const char * id,
+                      const char * name,
+                      const char * version,
+                      CORBA_InterfaceDef_ptr interface_type,
+                      CORBA::Boolean is_multiple,
+                      CORBA::Environment &ACE_TRY_ENV
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    )) = 0;
+                  
+                  virtual IR::EmitsDef_ptr create_emits (
+                      CORBA_Object *_collocated_tao_target_,
+                      const char * id,
+                      const char * name,
+                      const char * version,
+                      CORBA_ValueDef_ptr value,
+                      CORBA::Environment &ACE_TRY_ENV
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    )) = 0;
+                  
+                  virtual IR::PublishesDef_ptr create_publishes (
+                      CORBA_Object *_collocated_tao_target_,
+                      const char * id,
+                      const char * name,
+                      const char * version,
+                      CORBA_ValueDef_ptr value,
+                      CORBA::Environment &ACE_TRY_ENV
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    )) = 0;
+                  
+                  virtual IR::ConsumesDef_ptr create_consumes (
+                      CORBA_Object *_collocated_tao_target_,
+                      const char * id,
+                      const char * name,
+                      const char * version,
+                      CORBA_ValueDef_ptr value,
+                      CORBA::Environment &ACE_TRY_ENV
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    )) = 0;
+                  
+                  
+                protected:
+                  _TAO_ComponentDef_Proxy_Impl (void);
+                };
+                
+                //
+                //               End Base Proxy Impl. Declaration
+                ///////////////////////////////////////////////////////////////////////
+                
+                
+                ///////////////////////////////////////////////////////////////////////
+                //                Remote Proxy Impl. Declaration
+                //
+                
+                class TAO_IFR_Client_Export _TAO_ComponentDef_Remote_Proxy_Impl
+                  : public virtual _TAO_ComponentDef_Proxy_Impl,
+                    public virtual TAO_Remote_Object_Proxy_Impl,
+                    public virtual _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl
+                {
+                public:
+                  _TAO_ComponentDef_Remote_Proxy_Impl (void);
+                  
+                  virtual ~_TAO_ComponentDef_Remote_Proxy_Impl (void) { }
+                  virtual CORBA_InterfaceDefSeq * supported_interfaces (
+                      CORBA_Object *_collocated_tao_target_,
+                      CORBA::Environment &ACE_TRY_ENV
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    ));
+                  
+                  virtual void supported_interfaces (
+                      CORBA_Object *_collocated_tao_target_,
+                      const CORBA_InterfaceDefSeq & supported_interfaces,
+                      CORBA::Environment &ACE_TRY_ENV
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    ));
+                  
+                  virtual IR::ComponentDef_ptr base_component (
+                      CORBA_Object *_collocated_tao_target_,
+                      CORBA::Environment &ACE_TRY_ENV
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    ));
+                  
+                  virtual IR::ProvidesDefSeq * provides_interfaces (
+                      CORBA_Object *_collocated_tao_target_,
+                      CORBA::Environment &ACE_TRY_ENV
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    ));
+                  
+                  virtual IR::UsesDefSeq * uses_interfaces (
+                      CORBA_Object *_collocated_tao_target_,
+                      CORBA::Environment &ACE_TRY_ENV
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    ));
+                  
+                  virtual IR::EmitsDefSeq * emits_events (
+                      CORBA_Object *_collocated_tao_target_,
+                      CORBA::Environment &ACE_TRY_ENV
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    ));
+                  
+                  virtual IR::PublishesDefSeq * publishes_events (
+                      CORBA_Object *_collocated_tao_target_,
+                      CORBA::Environment &ACE_TRY_ENV
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    ));
+                  
+                  virtual IR::ConsumesDefSeq * consumes_events (
+                      CORBA_Object *_collocated_tao_target_,
+                      CORBA::Environment &ACE_TRY_ENV
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    ));
+                  
+                  virtual CORBA::Boolean is_basic (
+                      CORBA_Object *_collocated_tao_target_,
+                      CORBA::Environment &ACE_TRY_ENV
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    ));
+                  
+                  virtual IR::ProvidesDef_ptr create_provides (
+                      CORBA_Object *_collocated_tao_target_,
+                      const char * id,
+                      const char * name,
+                      const char * version,
+                      CORBA_InterfaceDef_ptr interface_type,
+                      CORBA::Environment &ACE_TRY_ENV
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    ));
+                  
+                  virtual IR::UsesDef_ptr create_uses (
+                      CORBA_Object *_collocated_tao_target_,
+                      const char * id,
+                      const char * name,
+                      const char * version,
+                      CORBA_InterfaceDef_ptr interface_type,
+                      CORBA::Boolean is_multiple,
+                      CORBA::Environment &ACE_TRY_ENV
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    ));
+                  
+                  virtual IR::EmitsDef_ptr create_emits (
+                      CORBA_Object *_collocated_tao_target_,
+                      const char * id,
+                      const char * name,
+                      const char * version,
+                      CORBA_ValueDef_ptr value,
+                      CORBA::Environment &ACE_TRY_ENV
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    ));
+                  
+                  virtual IR::PublishesDef_ptr create_publishes (
+                      CORBA_Object *_collocated_tao_target_,
+                      const char * id,
+                      const char * name,
+                      const char * version,
+                      CORBA_ValueDef_ptr value,
+                      CORBA::Environment &ACE_TRY_ENV
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    ));
+                  
+                  virtual IR::ConsumesDef_ptr create_consumes (
+                      CORBA_Object *_collocated_tao_target_,
+                      const char * id,
+                      const char * name,
+                      const char * version,
+                      CORBA_ValueDef_ptr value,
+                      CORBA::Environment &ACE_TRY_ENV
+                    )
+                    ACE_THROW_SPEC ((
+                      CORBA::SystemException
+                    ));
+                  
+                  
+                };
+                
+                //
+                //             End Remote Proxy Impl. Declaration
+                ///////////////////////////////////////////////////////////////////////
+                
+                // The Proxy Brokers are used by each interface to get
+                // the right proxy for performing a call. In the new 
+                // collocation scheme, the proxy to be used can vary on
+                // a call by call basis.
+                
+                
+                ///////////////////////////////////////////////////////////////////////
+                //                 Base Proxy Broker Declaration 
+                //
+                
+                                class TAO_IFR_Client_Export _TAO_ComponentDef_Proxy_Broker
+                {
+                public:
+                  virtual ~_TAO_ComponentDef_Proxy_Broker (void);
+                  virtual _TAO_ComponentDef_Proxy_Impl &select_proxy (
+                      ComponentDef *object,
+                      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                    ) = 0;
+                  
+                protected:
+                  _TAO_ComponentDef_Proxy_Broker (void);
+                  
+                };
+                
+                //
+                //              End Base Proxy Broker Declaration 
+                ///////////////////////////////////////////////////////////////////////
+                
+                                
+                ///////////////////////////////////////////////////////////////////////
+                //                 Remote Proxy Broker Declaration 
+                //
+                
+                class TAO_IFR_Client_Export _TAO_ComponentDef_Remote_Proxy_Broker
+                  : public virtual _TAO_ComponentDef_Proxy_Broker
+                {
+                public: 
+                  _TAO_ComponentDef_Remote_Proxy_Broker (void);
+                  
+                  virtual ~_TAO_ComponentDef_Remote_Proxy_Broker (void);
+                  
+                  virtual _TAO_ComponentDef_Proxy_Impl &select_proxy (
+                      ComponentDef *object,
+                      CORBA_Environment &ACE_TRY_ENV
+                    );
+                  
+                  private:
+                    _TAO_ComponentDef_Remote_Proxy_Impl remote_proxy_impl_;
+                  
+                  public:
+                    // This member function is used to get an handle to the unique instance
+                    // of the Remote Proxy Broker that is available for a given
+                    // interface.
+                    static _TAO_ComponentDef_Remote_Proxy_Broker *the_TAO_ComponentDef_Remote_Proxy_Broker (void);
+                  };
+                  
+                  //
+                  //              End Remote Proxy Broker Declaration 
+                  ///////////////////////////////////////////////////////////////////////
+                  
+                  
 #endif /* end #if !defined */
-
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ComponentDef;
-
-struct ComponentDescription;
-class ComponentDescription_var;
-
-struct TAO_IFR_Client_Export ComponentDescription
-{
-
+                  
+                  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ComponentDef;
+                  
+                  struct ComponentDescription;
+                  class ComponentDescription_var;
+                  
+                  struct TAO_IFR_Client_Export ComponentDescription
+                  {
+                    
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef ComponentDescription_var _var_type;
+                    typedef ComponentDescription_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-  static void _tao_any_destructor (void*);
-
-  TAO_String_Manager name;
-  TAO_String_Manager id;
-  TAO_String_Manager defined_in;
-  TAO_String_Manager version;
-  TAO_String_Manager base_component;
-  ACE_NESTED_CLASS (IR, RepositoryIdSeq) supports_interfaces;
-  ACE_NESTED_CLASS (IR, ProvidesDefSeq) provides_interfaces;
-  ACE_NESTED_CLASS (IR, UsesDefSeq) uses_interfaces;
-  CORBA_AttrDescriptionSeq attributes;
-  ACE_NESTED_CLASS (IR, EmitsDefSeq) emits_events;
-  ACE_NESTED_CLASS (IR, PublishesDefSeq) publishes_events;
-  ACE_NESTED_CLASS (IR, ConsumesDefSeq) consumes_events;
-  CORBA::Boolean is_basic;
-};
-
-class TAO_IFR_Client_Export ComponentDescription_var
-{
-public:
-  ComponentDescription_var (void); // default constructor
-  ComponentDescription_var (ComponentDescription *);
-  ComponentDescription_var (const ComponentDescription_var &); // copy constructor
-  ~ComponentDescription_var (void); // destructor
-  
-  ComponentDescription_var &operator= (ComponentDescription *);
-  ComponentDescription_var &operator= (const ComponentDescription_var &);
-  ComponentDescription *operator-> (void);
-  const ComponentDescription *operator-> (void) const;
-  
-  operator const ComponentDescription &() const;
-  operator ComponentDescription &();
-  operator ComponentDescription &() const;
-  operator ComponentDescription *&(); // variable-size types only
-  
-  // in, inout, out, _retn 
-  const ComponentDescription &in (void) const;
-  ComponentDescription &inout (void);
-  ComponentDescription *&out (void);
-  ComponentDescription *_retn (void);
-  ComponentDescription *ptr (void) const;
-
-private:
-  ComponentDescription *ptr_;
-};
-
-class TAO_IFR_Client_Export ComponentDescription_out
-{
-public:
-  ComponentDescription_out (ComponentDescription *&);
-  ComponentDescription_out (ComponentDescription_var &);
-  ComponentDescription_out (const ComponentDescription_out &);
-  ComponentDescription_out &operator= (const ComponentDescription_out &);
-  ComponentDescription_out &operator= (ComponentDescription *);
-  operator ComponentDescription *&();
-  ComponentDescription *&ptr (void);
-  ComponentDescription *operator-> (void);
-  
-private:
-  ComponentDescription *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const ComponentDescription_var &);
-};
-
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ComponentDescription;
-
-
+                    static void _tao_any_destructor (void*);
+                    
+                    TAO_String_Manager name;
+                    TAO_String_Manager id;
+                    TAO_String_Manager defined_in;
+                    TAO_String_Manager version;
+                    TAO_String_Manager base_component;
+                    ACE_NESTED_CLASS (IR, RepositoryIdSeq) supports_interfaces;
+                    ACE_NESTED_CLASS (IR, ProvidesDefSeq) provides_interfaces;
+                    ACE_NESTED_CLASS (IR, UsesDefSeq) uses_interfaces;
+                    CORBA_AttrDescriptionSeq attributes;
+                    ACE_NESTED_CLASS (IR, EmitsDefSeq) emits_events;
+                    ACE_NESTED_CLASS (IR, PublishesDefSeq) publishes_events;
+                    ACE_NESTED_CLASS (IR, ConsumesDefSeq) consumes_events;
+                    CORBA::Boolean is_basic;
+                    
+                  };
+                  
+                  class TAO_IFR_Client_Export ComponentDescription_var
+                  {
+                  public:
+                    ComponentDescription_var (void);
+                    ComponentDescription_var (ComponentDescription *);
+                    ComponentDescription_var (const ComponentDescription_var &);
+                    ~ComponentDescription_var (void);
+                    
+                    ComponentDescription_var &operator= (ComponentDescription *);
+                    ComponentDescription_var &operator= (const ComponentDescription_var &);
+                    ComponentDescription *operator-> (void);
+                    const ComponentDescription *operator-> (void) const;
+                    
+                    operator const ComponentDescription &() const;
+                    operator ComponentDescription &();
+                    operator ComponentDescription &() const;
+                    // Variable-size types only.
+                    operator ComponentDescription *&();
+                    
+                    // in, inout, out, _retn 
+                    const ComponentDescription &in (void) const;
+                    ComponentDescription &inout (void);
+                    ComponentDescription *&out (void);
+                    ComponentDescription *_retn (void);
+                    ComponentDescription *ptr (void) const;
+                  
+                  private:
+                    ComponentDescription *ptr_;
+                  };
+                  
+                  class TAO_IFR_Client_Export ComponentDescription_out
+                  {
+                  public:
+                    ComponentDescription_out (ComponentDescription *&);
+                    ComponentDescription_out (ComponentDescription_var &);
+                    ComponentDescription_out (const ComponentDescription_out &);
+                    ComponentDescription_out &operator= (const ComponentDescription_out &);
+                    ComponentDescription_out &operator= (ComponentDescription *);
+                    operator ComponentDescription *&();
+                    ComponentDescription *&ptr (void);
+                    ComponentDescription *operator-> (void);
+                    
+                  private:
+                    ComponentDescription *&ptr_;
+                    // Assignment from T_var not allowed.
+                    void operator= (const ComponentDescription_var &);
+                  };
+                  
+                  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ComponentDescription;
+                  
+                  
 #if !defined (_IR_PRIMARYKEYDEF_CH_)
 #define _IR_PRIMARYKEYDEF_CH_
-
-// Forward Classes Declaration
-class _TAO_PrimaryKeyDef_Proxy_Impl;
-class _TAO_PrimaryKeyDef_Remote_Proxy_Impl;
-class _TAO_PrimaryKeyDef_Proxy_Broker;
-class _TAO_PrimaryKeyDef_Remote_Proxy_Broker;
-
-class TAO_IFR_Client_Export PrimaryKeyDef: public virtual CORBA_Contained
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef PrimaryKeyDef_ptr _ptr_type;
-  typedef PrimaryKeyDef_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static PrimaryKeyDef_ptr _duplicate (PrimaryKeyDef_ptr obj);
-  static PrimaryKeyDef_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static PrimaryKeyDef_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static PrimaryKeyDef_ptr _nil (void)
-    {
-      return (PrimaryKeyDef_ptr)0;
-    }
-
-  static void _tao_any_destructor (void*);
-
-  virtual CORBA::Boolean is_a (
-      const char * primary_key_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_ValueDef_ptr primary_key (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
-
-private:
-  _TAO_PrimaryKeyDef_Proxy_Broker *the_TAO_PrimaryKeyDef_Proxy_Broker_;
-  
-protected:
-  PrimaryKeyDef (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void IR_PrimaryKeyDef_setup_collocation (int collocated);
-    
-    PrimaryKeyDef (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_PrimaryKeyDef_Remote_Proxy_Impl;
-    friend class _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_PrimaryKeyDef_Direct_Proxy_Impl;
-  
-  virtual ~PrimaryKeyDef (void);
-private:
-  PrimaryKeyDef (const PrimaryKeyDef &);
-  void operator= (const PrimaryKeyDef &);
-};
-
-
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_PrimaryKeyDef_Proxy_Impl : 
-  public virtual _TAO_CORBA_Contained_Proxy_Impl
-{
-public:
-  virtual ~_TAO_PrimaryKeyDef_Proxy_Impl (void) { }
-  
-    virtual CORBA::Boolean is_a (
-      CORBA_Object *_collocated_tao_target_,
-      const char * primary_key_id,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_ValueDef_ptr primary_key (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-protected:
-  _TAO_PrimaryKeyDef_Proxy_Impl (void);
-
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_PrimaryKeyDef_Remote_Proxy_Impl : 
-  public virtual _TAO_PrimaryKeyDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_PrimaryKeyDef_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_PrimaryKeyDef_Remote_Proxy_Impl (void) { }
-  
-    virtual CORBA::Boolean is_a (
-      CORBA_Object *_collocated_tao_target_,
-      const char * primary_key_id,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_ValueDef_ptr primary_key (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-};
-
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
-
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_PrimaryKeyDef_Proxy_Broker
-{
-public:
-  virtual ~_TAO_PrimaryKeyDef_Proxy_Broker (void);
-  virtual _TAO_PrimaryKeyDef_Proxy_Impl &select_proxy (
-    PrimaryKeyDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
-
-protected:
-  _TAO_PrimaryKeyDef_Proxy_Broker (void);
-  
-};
-
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_PrimaryKeyDef_Remote_Proxy_Broker : public virtual _TAO_PrimaryKeyDef_Proxy_Broker
-{
-public: 
-  _TAO_PrimaryKeyDef_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_PrimaryKeyDef_Proxy_Impl &select_proxy (
-    PrimaryKeyDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
-
-private:
-  _TAO_PrimaryKeyDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
-
-public:
-  static _TAO_PrimaryKeyDef_Remote_Proxy_Broker *the_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void);
-};
-
-
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
+                  
+                  // Forward Classes Declaration
+                  class _TAO_PrimaryKeyDef_Proxy_Impl;
+                  class _TAO_PrimaryKeyDef_Remote_Proxy_Impl;
+                  class _TAO_PrimaryKeyDef_Proxy_Broker;
+                  class _TAO_PrimaryKeyDef_Remote_Proxy_Broker;
+                  
+                  class TAO_IFR_Client_Export PrimaryKeyDef
+                    : public virtual CORBA_Contained
+                  {
+                  public:
+                  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+                    typedef PrimaryKeyDef_ptr _ptr_type;
+                    typedef PrimaryKeyDef_var _var_type;
+                  #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+                    // the static operations
+                    static PrimaryKeyDef_ptr _duplicate (PrimaryKeyDef_ptr obj);
+                    
+                    static PrimaryKeyDef_ptr _narrow (
+                        CORBA::Object_ptr obj,
+                        CORBA::Environment &ACE_TRY_ENV = 
+                          TAO_default_environment ()
+                      );
+                    
+                    static PrimaryKeyDef_ptr _unchecked_narrow (
+                        CORBA::Object_ptr obj,
+                        CORBA::Environment &ACE_TRY_ENV = 
+                          TAO_default_environment ()
+                      );
+                    
+                    static PrimaryKeyDef_ptr _nil (void)
+                      {
+                        return (PrimaryKeyDef_ptr)0;
+                      }
+                    
+                    static void _tao_any_destructor (void*);
+                    
+                    virtual CORBA::Boolean is_a (
+                        const char * primary_key_id,
+                        CORBA::Environment &ACE_TRY_ENV = 
+                          TAO_default_environment ()
+                      )
+                      ACE_THROW_SPEC ((
+                        CORBA::SystemException
+                      ));
+                    
+                    virtual CORBA_ValueDef_ptr primary_key (
+                        CORBA::Environment &ACE_TRY_ENV = 
+                          TAO_default_environment ()
+                      )
+                      ACE_THROW_SPEC ((
+                        CORBA::SystemException
+                      ));
+                    
+                    virtual CORBA::Boolean _is_a (
+                        const CORBA::Char *type_id, 
+                        CORBA::Environment &ACE_TRY_ENV = 
+                          TAO_default_environment ()
+                      );
+                    
+                    virtual void *_tao_QueryInterface (ptr_arith_t type);
+                    
+                    virtual const char* _interface_repository_id (void) const;
+
+                  private:
+                    _TAO_PrimaryKeyDef_Proxy_Broker *the_TAO_PrimaryKeyDef_Proxy_Broker_;
+                    
+                  protected:
+                    PrimaryKeyDef (int collocated = 0);
+                    
+                    // This methods travese the inheritance tree and set the
+                    // parents piece of the given class in the right mode
+                    virtual void IR_PrimaryKeyDef_setup_collocation (int collocated);
+                    
+                    PrimaryKeyDef (
+                        TAO_Stub *objref, 
+                        CORBA::Boolean _tao_collocated = 0,
+                        TAO_Abstract_ServantBase *servant = 0
+                      );
+                    
+                    friend class _TAO_PrimaryKeyDef_Remote_Proxy_Impl;
+                    friend class _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl;
+                    friend class _TAO_PrimaryKeyDef_Direct_Proxy_Impl;
+                    
+                    virtual ~PrimaryKeyDef (void);
+                  
+                  private:
+                    PrimaryKeyDef (const PrimaryKeyDef &);
+                    void operator= (const PrimaryKeyDef &);
+                  };
+                  
+                  // The Proxy Implementations are used by each interface to
+                  // perform a call. Each different implementation encapsulate
+                  // an invocation logics.
+                  
+                  
+                  ///////////////////////////////////////////////////////////////////////
+                  //                    Base Proxy Impl. Declaration
+                  //
+                  
+                  class TAO_IFR_Client_Export _TAO_PrimaryKeyDef_Proxy_Impl
+                    : public virtual _TAO_CORBA_Contained_Proxy_Impl
+                  {
+                  public:
+                    virtual ~_TAO_PrimaryKeyDef_Proxy_Impl (void) { }
+                    virtual CORBA::Boolean is_a (
+                        CORBA_Object *_collocated_tao_target_,
+                        const char * primary_key_id,
+                        CORBA::Environment &ACE_TRY_ENV
+                      )
+                      ACE_THROW_SPEC ((
+                        CORBA::SystemException
+                      )) = 0;
+                    
+                    virtual CORBA_ValueDef_ptr primary_key (
+                        CORBA_Object *_collocated_tao_target_,
+                        CORBA::Environment &ACE_TRY_ENV
+                      )
+                      ACE_THROW_SPEC ((
+                        CORBA::SystemException
+                      )) = 0;
+                    
+                    
+                  protected:
+                    _TAO_PrimaryKeyDef_Proxy_Impl (void);
+                  };
+                  
+                  //
+                  //               End Base Proxy Impl. Declaration
+                  ///////////////////////////////////////////////////////////////////////
+                  
+                  
+                  ///////////////////////////////////////////////////////////////////////
+                  //                Remote Proxy Impl. Declaration
+                  //
+                  
+                  class TAO_IFR_Client_Export _TAO_PrimaryKeyDef_Remote_Proxy_Impl
+                    : public virtual _TAO_PrimaryKeyDef_Proxy_Impl,
+                      public virtual TAO_Remote_Object_Proxy_Impl,
+                      public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl
+                  {
+                  public:
+                    _TAO_PrimaryKeyDef_Remote_Proxy_Impl (void);
+                    
+                    virtual ~_TAO_PrimaryKeyDef_Remote_Proxy_Impl (void) { }
+                    virtual CORBA::Boolean is_a (
+                        CORBA_Object *_collocated_tao_target_,
+                        const char * primary_key_id,
+                        CORBA::Environment &ACE_TRY_ENV
+                      )
+                      ACE_THROW_SPEC ((
+                        CORBA::SystemException
+                      ));
+                    
+                    virtual CORBA_ValueDef_ptr primary_key (
+                        CORBA_Object *_collocated_tao_target_,
+                        CORBA::Environment &ACE_TRY_ENV
+                      )
+                      ACE_THROW_SPEC ((
+                        CORBA::SystemException
+                      ));
+                    
+                    
+                  };
+                  
+                  //
+                  //             End Remote Proxy Impl. Declaration
+                  ///////////////////////////////////////////////////////////////////////
+                  
+                  // The Proxy Brokers are used by each interface to get
+                  // the right proxy for performing a call. In the new 
+                  // collocation scheme, the proxy to be used can vary on
+                  // a call by call basis.
+                  
+                  
+                  ///////////////////////////////////////////////////////////////////////
+                  //                 Base Proxy Broker Declaration 
+                  //
+                  
+                                    class TAO_IFR_Client_Export _TAO_PrimaryKeyDef_Proxy_Broker
+                  {
+                  public:
+                    virtual ~_TAO_PrimaryKeyDef_Proxy_Broker (void);
+                    virtual _TAO_PrimaryKeyDef_Proxy_Impl &select_proxy (
+                        PrimaryKeyDef *object,
+                        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                      ) = 0;
+                    
+                  protected:
+                    _TAO_PrimaryKeyDef_Proxy_Broker (void);
+                    
+                  };
+                  
+                  //
+                  //              End Base Proxy Broker Declaration 
+                  ///////////////////////////////////////////////////////////////////////
+                  
+                                    
+                  ///////////////////////////////////////////////////////////////////////
+                  //                 Remote Proxy Broker Declaration 
+                  //
+                  
+                  class TAO_IFR_Client_Export _TAO_PrimaryKeyDef_Remote_Proxy_Broker
+                    : public virtual _TAO_PrimaryKeyDef_Proxy_Broker
+                  {
+                  public: 
+                    _TAO_PrimaryKeyDef_Remote_Proxy_Broker (void);
+                    
+                    virtual ~_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void);
+                    
+                    virtual _TAO_PrimaryKeyDef_Proxy_Impl &select_proxy (
+                        PrimaryKeyDef *object,
+                        CORBA_Environment &ACE_TRY_ENV
+                      );
+                    
+                    private:
+                      _TAO_PrimaryKeyDef_Remote_Proxy_Impl remote_proxy_impl_;
+                    
+                    public:
+                      // This member function is used to get an handle to the unique instance
+                      // of the Remote Proxy Broker that is available for a given
+                      // interface.
+                      static _TAO_PrimaryKeyDef_Remote_Proxy_Broker *the_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void);
+                    };
+                    
+                    //
+                    //              End Remote Proxy Broker Declaration 
+                    ///////////////////////////////////////////////////////////////////////
+                    
+                    
 #endif /* end #if !defined */
-
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PrimaryKeyDef;
-
-struct PrimaryKeyDescription;
-class PrimaryKeyDescription_var;
-
-struct TAO_IFR_Client_Export PrimaryKeyDescription
-{
-
+                    
+                    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PrimaryKeyDef;
+                    
+                    struct PrimaryKeyDescription;
+                    class PrimaryKeyDescription_var;
+                    
+                    struct TAO_IFR_Client_Export PrimaryKeyDescription
+                    {
+                      
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef PrimaryKeyDescription_var _var_type;
+                      typedef PrimaryKeyDescription_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-  static void _tao_any_destructor (void*);
-
-  TAO_String_Manager name;
-  TAO_String_Manager id;
-  TAO_String_Manager defined_in;
-  TAO_String_Manager version;
-  CORBA_ValueDef_var primary_key;
-};
-
-class TAO_IFR_Client_Export PrimaryKeyDescription_var
-{
-public:
-  PrimaryKeyDescription_var (void); // default constructor
-  PrimaryKeyDescription_var (PrimaryKeyDescription *);
-  PrimaryKeyDescription_var (const PrimaryKeyDescription_var &); // copy constructor
-  ~PrimaryKeyDescription_var (void); // destructor
-  
-  PrimaryKeyDescription_var &operator= (PrimaryKeyDescription *);
-  PrimaryKeyDescription_var &operator= (const PrimaryKeyDescription_var &);
-  PrimaryKeyDescription *operator-> (void);
-  const PrimaryKeyDescription *operator-> (void) const;
-  
-  operator const PrimaryKeyDescription &() const;
-  operator PrimaryKeyDescription &();
-  operator PrimaryKeyDescription &() const;
-  operator PrimaryKeyDescription *&(); // variable-size types only
-  
-  // in, inout, out, _retn 
-  const PrimaryKeyDescription &in (void) const;
-  PrimaryKeyDescription &inout (void);
-  PrimaryKeyDescription *&out (void);
-  PrimaryKeyDescription *_retn (void);
-  PrimaryKeyDescription *ptr (void) const;
-
-private:
-  PrimaryKeyDescription *ptr_;
-};
-
-class TAO_IFR_Client_Export PrimaryKeyDescription_out
-{
-public:
-  PrimaryKeyDescription_out (PrimaryKeyDescription *&);
-  PrimaryKeyDescription_out (PrimaryKeyDescription_var &);
-  PrimaryKeyDescription_out (const PrimaryKeyDescription_out &);
-  PrimaryKeyDescription_out &operator= (const PrimaryKeyDescription_out &);
-  PrimaryKeyDescription_out &operator= (PrimaryKeyDescription *);
-  operator PrimaryKeyDescription *&();
-  PrimaryKeyDescription *&ptr (void);
-  PrimaryKeyDescription *operator-> (void);
-  
-private:
-  PrimaryKeyDescription *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const PrimaryKeyDescription_var &);
-};
-
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PrimaryKeyDescription;
-
-
+                      static void _tao_any_destructor (void*);
+                      
+                      TAO_String_Manager name;
+                      TAO_String_Manager id;
+                      TAO_String_Manager defined_in;
+                      TAO_String_Manager version;
+                      CORBA_ValueDef_var primary_key;
+                      
+                    };
+                    
+                    class TAO_IFR_Client_Export PrimaryKeyDescription_var
+                    {
+                    public:
+                      PrimaryKeyDescription_var (void);
+                      PrimaryKeyDescription_var (PrimaryKeyDescription *);
+                      PrimaryKeyDescription_var (const PrimaryKeyDescription_var &);
+                      ~PrimaryKeyDescription_var (void);
+                      
+                      PrimaryKeyDescription_var &operator= (PrimaryKeyDescription *);
+                      PrimaryKeyDescription_var &operator= (const PrimaryKeyDescription_var &);
+                      PrimaryKeyDescription *operator-> (void);
+                      const PrimaryKeyDescription *operator-> (void) const;
+                      
+                      operator const PrimaryKeyDescription &() const;
+                      operator PrimaryKeyDescription &();
+                      operator PrimaryKeyDescription &() const;
+                      // Variable-size types only.
+                      operator PrimaryKeyDescription *&();
+                      
+                      // in, inout, out, _retn 
+                      const PrimaryKeyDescription &in (void) const;
+                      PrimaryKeyDescription &inout (void);
+                      PrimaryKeyDescription *&out (void);
+                      PrimaryKeyDescription *_retn (void);
+                      PrimaryKeyDescription *ptr (void) const;
+                    
+                    private:
+                      PrimaryKeyDescription *ptr_;
+                    };
+                    
+                    class TAO_IFR_Client_Export PrimaryKeyDescription_out
+                    {
+                    public:
+                      PrimaryKeyDescription_out (PrimaryKeyDescription *&);
+                      PrimaryKeyDescription_out (PrimaryKeyDescription_var &);
+                      PrimaryKeyDescription_out (const PrimaryKeyDescription_out &);
+                      PrimaryKeyDescription_out &operator= (const PrimaryKeyDescription_out &);
+                      PrimaryKeyDescription_out &operator= (PrimaryKeyDescription *);
+                      operator PrimaryKeyDescription *&();
+                      PrimaryKeyDescription *&ptr (void);
+                      PrimaryKeyDescription *operator-> (void);
+                      
+                    private:
+                      PrimaryKeyDescription *&ptr_;
+                      // Assignment from T_var not allowed.
+                      void operator= (const PrimaryKeyDescription_var &);
+                    };
+                    
+                    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PrimaryKeyDescription;
+                    
+                    
 #if !defined (_IR_FACTORYDEF_CH_)
 #define _IR_FACTORYDEF_CH_
-
-// Forward Classes Declaration
-class _TAO_FactoryDef_Proxy_Impl;
-class _TAO_FactoryDef_Remote_Proxy_Impl;
-class _TAO_FactoryDef_Proxy_Broker;
-class _TAO_FactoryDef_Remote_Proxy_Broker;
-
-class TAO_IFR_Client_Export FactoryDef: public virtual CORBA_OperationDef
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef FactoryDef_ptr _ptr_type;
-  typedef FactoryDef_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static FactoryDef_ptr _duplicate (FactoryDef_ptr obj);
-  static FactoryDef_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static FactoryDef_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static FactoryDef_ptr _nil (void)
-    {
-      return (FactoryDef_ptr)0;
-    }
-
-  static void _tao_any_destructor (void*);
-
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
-
-private:
-  _TAO_FactoryDef_Proxy_Broker *the_TAO_FactoryDef_Proxy_Broker_;
-  
-protected:
-  FactoryDef (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void IR_FactoryDef_setup_collocation (int collocated);
-    
-    FactoryDef (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_FactoryDef_Remote_Proxy_Impl;
-    friend class _TAO_FactoryDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_FactoryDef_Direct_Proxy_Impl;
-  
-  virtual ~FactoryDef (void);
-private:
-  FactoryDef (const FactoryDef &);
-  void operator= (const FactoryDef &);
-};
-
-
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_FactoryDef_Proxy_Impl : 
-  public virtual _TAO_CORBA_OperationDef_Proxy_Impl
-{
-public:
-  virtual ~_TAO_FactoryDef_Proxy_Impl (void) { }
-  
-  protected:
-  _TAO_FactoryDef_Proxy_Impl (void);
-
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_FactoryDef_Remote_Proxy_Impl : 
-  public virtual _TAO_FactoryDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_OperationDef_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_FactoryDef_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_FactoryDef_Remote_Proxy_Impl (void) { }
-  
-  };
-
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
-
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_FactoryDef_Proxy_Broker
-{
-public:
-  virtual ~_TAO_FactoryDef_Proxy_Broker (void);
-  virtual _TAO_FactoryDef_Proxy_Impl &select_proxy (
-    FactoryDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
-
-protected:
-  _TAO_FactoryDef_Proxy_Broker (void);
-  
-};
-
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_FactoryDef_Remote_Proxy_Broker : public virtual _TAO_FactoryDef_Proxy_Broker
-{
-public: 
-  _TAO_FactoryDef_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_FactoryDef_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_FactoryDef_Proxy_Impl &select_proxy (
-    FactoryDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
-
-private:
-  _TAO_FactoryDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
-
-public:
-  static _TAO_FactoryDef_Remote_Proxy_Broker *the_TAO_FactoryDef_Remote_Proxy_Broker (void);
-};
-
-
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
+                    
+                    // Forward Classes Declaration
+                    class _TAO_FactoryDef_Proxy_Impl;
+                    class _TAO_FactoryDef_Remote_Proxy_Impl;
+                    class _TAO_FactoryDef_Proxy_Broker;
+                    class _TAO_FactoryDef_Remote_Proxy_Broker;
+                    
+                    class TAO_IFR_Client_Export FactoryDef
+                      : public virtual CORBA_OperationDef
+                    {
+                    public:
+                    #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+                      typedef FactoryDef_ptr _ptr_type;
+                      typedef FactoryDef_var _var_type;
+                    #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+                      // the static operations
+                      static FactoryDef_ptr _duplicate (FactoryDef_ptr obj);
+                      
+                      static FactoryDef_ptr _narrow (
+                          CORBA::Object_ptr obj,
+                          CORBA::Environment &ACE_TRY_ENV = 
+                            TAO_default_environment ()
+                        );
+                      
+                      static FactoryDef_ptr _unchecked_narrow (
+                          CORBA::Object_ptr obj,
+                          CORBA::Environment &ACE_TRY_ENV = 
+                            TAO_default_environment ()
+                        );
+                      
+                      static FactoryDef_ptr _nil (void)
+                        {
+                          return (FactoryDef_ptr)0;
+                        }
+                      
+                      static void _tao_any_destructor (void*);
+                      
+                      virtual CORBA::Boolean _is_a (
+                          const CORBA::Char *type_id, 
+                          CORBA::Environment &ACE_TRY_ENV = 
+                            TAO_default_environment ()
+                        );
+                      
+                      virtual void *_tao_QueryInterface (ptr_arith_t type);
+                      
+                      virtual const char* _interface_repository_id (void) const;
+
+                    private:
+                      _TAO_FactoryDef_Proxy_Broker *the_TAO_FactoryDef_Proxy_Broker_;
+                      
+                    protected:
+                      FactoryDef (int collocated = 0);
+                      
+                      // This methods travese the inheritance tree and set the
+                      // parents piece of the given class in the right mode
+                      virtual void IR_FactoryDef_setup_collocation (int collocated);
+                      
+                      FactoryDef (
+                          TAO_Stub *objref, 
+                          CORBA::Boolean _tao_collocated = 0,
+                          TAO_Abstract_ServantBase *servant = 0
+                        );
+                      
+                      friend class _TAO_FactoryDef_Remote_Proxy_Impl;
+                      friend class _TAO_FactoryDef_ThruPOA_Proxy_Impl;
+                      friend class _TAO_FactoryDef_Direct_Proxy_Impl;
+                      
+                      virtual ~FactoryDef (void);
+                    
+                    private:
+                      FactoryDef (const FactoryDef &);
+                      void operator= (const FactoryDef &);
+                    };
+                    
+                    // The Proxy Implementations are used by each interface to
+                    // perform a call. Each different implementation encapsulate
+                    // an invocation logics.
+                    
+                    
+                    ///////////////////////////////////////////////////////////////////////
+                    //                    Base Proxy Impl. Declaration
+                    //
+                    
+                    class TAO_IFR_Client_Export _TAO_FactoryDef_Proxy_Impl
+                      : public virtual _TAO_CORBA_OperationDef_Proxy_Impl
+                    {
+                    public:
+                      virtual ~_TAO_FactoryDef_Proxy_Impl (void) { }
+                      
+                    protected:
+                      _TAO_FactoryDef_Proxy_Impl (void);
+                    };
+                    
+                    //
+                    //               End Base Proxy Impl. Declaration
+                    ///////////////////////////////////////////////////////////////////////
+                    
+                    
+                    ///////////////////////////////////////////////////////////////////////
+                    //                Remote Proxy Impl. Declaration
+                    //
+                    
+                    class TAO_IFR_Client_Export _TAO_FactoryDef_Remote_Proxy_Impl
+                      : public virtual _TAO_FactoryDef_Proxy_Impl,
+                        public virtual TAO_Remote_Object_Proxy_Impl,
+                        public virtual _TAO_CORBA_OperationDef_Remote_Proxy_Impl
+                    {
+                    public:
+                      _TAO_FactoryDef_Remote_Proxy_Impl (void);
+                      
+                      virtual ~_TAO_FactoryDef_Remote_Proxy_Impl (void) { }
+                      
+                    };
+                    
+                    //
+                    //             End Remote Proxy Impl. Declaration
+                    ///////////////////////////////////////////////////////////////////////
+                    
+                    // The Proxy Brokers are used by each interface to get
+                    // the right proxy for performing a call. In the new 
+                    // collocation scheme, the proxy to be used can vary on
+                    // a call by call basis.
+                    
+                    
+                    ///////////////////////////////////////////////////////////////////////
+                    //                 Base Proxy Broker Declaration 
+                    //
+                    
+                                        class TAO_IFR_Client_Export _TAO_FactoryDef_Proxy_Broker
+                    {
+                    public:
+                      virtual ~_TAO_FactoryDef_Proxy_Broker (void);
+                      virtual _TAO_FactoryDef_Proxy_Impl &select_proxy (
+                          FactoryDef *object,
+                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                        ) = 0;
+                      
+                    protected:
+                      _TAO_FactoryDef_Proxy_Broker (void);
+                      
+                    };
+                    
+                    //
+                    //              End Base Proxy Broker Declaration 
+                    ///////////////////////////////////////////////////////////////////////
+                    
+                                        
+                    ///////////////////////////////////////////////////////////////////////
+                    //                 Remote Proxy Broker Declaration 
+                    //
+                    
+                    class TAO_IFR_Client_Export _TAO_FactoryDef_Remote_Proxy_Broker
+                      : public virtual _TAO_FactoryDef_Proxy_Broker
+                    {
+                    public: 
+                      _TAO_FactoryDef_Remote_Proxy_Broker (void);
+                      
+                      virtual ~_TAO_FactoryDef_Remote_Proxy_Broker (void);
+                      
+                      virtual _TAO_FactoryDef_Proxy_Impl &select_proxy (
+                          FactoryDef *object,
+                          CORBA_Environment &ACE_TRY_ENV
+                        );
+                      
+                      private:
+                        _TAO_FactoryDef_Remote_Proxy_Impl remote_proxy_impl_;
+                      
+                      public:
+                        // This member function is used to get an handle to the unique instance
+                        // of the Remote Proxy Broker that is available for a given
+                        // interface.
+                        static _TAO_FactoryDef_Remote_Proxy_Broker *the_TAO_FactoryDef_Remote_Proxy_Broker (void);
+                      };
+                      
+                      //
+                      //              End Remote Proxy Broker Declaration 
+                      ///////////////////////////////////////////////////////////////////////
+                      
+                      
 #endif /* end #if !defined */
-
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_FactoryDef;
-
-
+                      
+                      TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_FactoryDef;
+                      
+                      
 #if !defined (_IR_FINDERDEF_CH_)
 #define _IR_FINDERDEF_CH_
-
-// Forward Classes Declaration
-class _TAO_FinderDef_Proxy_Impl;
-class _TAO_FinderDef_Remote_Proxy_Impl;
-class _TAO_FinderDef_Proxy_Broker;
-class _TAO_FinderDef_Remote_Proxy_Broker;
-
-class TAO_IFR_Client_Export FinderDef: public virtual CORBA_OperationDef
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef FinderDef_ptr _ptr_type;
-  typedef FinderDef_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static FinderDef_ptr _duplicate (FinderDef_ptr obj);
-  static FinderDef_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static FinderDef_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static FinderDef_ptr _nil (void)
-    {
-      return (FinderDef_ptr)0;
-    }
-
-  static void _tao_any_destructor (void*);
-
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
-
-private:
-  _TAO_FinderDef_Proxy_Broker *the_TAO_FinderDef_Proxy_Broker_;
-  
-protected:
-  FinderDef (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void IR_FinderDef_setup_collocation (int collocated);
-    
-    FinderDef (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_FinderDef_Remote_Proxy_Impl;
-    friend class _TAO_FinderDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_FinderDef_Direct_Proxy_Impl;
-  
-  virtual ~FinderDef (void);
-private:
-  FinderDef (const FinderDef &);
-  void operator= (const FinderDef &);
-};
-
-
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_FinderDef_Proxy_Impl : 
-  public virtual _TAO_CORBA_OperationDef_Proxy_Impl
-{
-public:
-  virtual ~_TAO_FinderDef_Proxy_Impl (void) { }
-  
-  protected:
-  _TAO_FinderDef_Proxy_Impl (void);
-
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_FinderDef_Remote_Proxy_Impl : 
-  public virtual _TAO_FinderDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_OperationDef_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_FinderDef_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_FinderDef_Remote_Proxy_Impl (void) { }
-  
-  };
-
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
-
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_FinderDef_Proxy_Broker
-{
-public:
-  virtual ~_TAO_FinderDef_Proxy_Broker (void);
-  virtual _TAO_FinderDef_Proxy_Impl &select_proxy (
-    FinderDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
-
-protected:
-  _TAO_FinderDef_Proxy_Broker (void);
-  
-};
-
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_FinderDef_Remote_Proxy_Broker : public virtual _TAO_FinderDef_Proxy_Broker
-{
-public: 
-  _TAO_FinderDef_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_FinderDef_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_FinderDef_Proxy_Impl &select_proxy (
-    FinderDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
-
-private:
-  _TAO_FinderDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
-
-public:
-  static _TAO_FinderDef_Remote_Proxy_Broker *the_TAO_FinderDef_Remote_Proxy_Broker (void);
-};
-
-
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
+                      
+                      // Forward Classes Declaration
+                      class _TAO_FinderDef_Proxy_Impl;
+                      class _TAO_FinderDef_Remote_Proxy_Impl;
+                      class _TAO_FinderDef_Proxy_Broker;
+                      class _TAO_FinderDef_Remote_Proxy_Broker;
+                      
+                      class TAO_IFR_Client_Export FinderDef
+                        : public virtual CORBA_OperationDef
+                      {
+                      public:
+                      #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+                        typedef FinderDef_ptr _ptr_type;
+                        typedef FinderDef_var _var_type;
+                      #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+                        // the static operations
+                        static FinderDef_ptr _duplicate (FinderDef_ptr obj);
+                        
+                        static FinderDef_ptr _narrow (
+                            CORBA::Object_ptr obj,
+                            CORBA::Environment &ACE_TRY_ENV = 
+                              TAO_default_environment ()
+                          );
+                        
+                        static FinderDef_ptr _unchecked_narrow (
+                            CORBA::Object_ptr obj,
+                            CORBA::Environment &ACE_TRY_ENV = 
+                              TAO_default_environment ()
+                          );
+                        
+                        static FinderDef_ptr _nil (void)
+                          {
+                            return (FinderDef_ptr)0;
+                          }
+                        
+                        static void _tao_any_destructor (void*);
+                        
+                        virtual CORBA::Boolean _is_a (
+                            const CORBA::Char *type_id, 
+                            CORBA::Environment &ACE_TRY_ENV = 
+                              TAO_default_environment ()
+                          );
+                        
+                        virtual void *_tao_QueryInterface (ptr_arith_t type);
+                        
+                        virtual const char* _interface_repository_id (void) const;
+
+                      private:
+                        _TAO_FinderDef_Proxy_Broker *the_TAO_FinderDef_Proxy_Broker_;
+                        
+                      protected:
+                        FinderDef (int collocated = 0);
+                        
+                        // This methods travese the inheritance tree and set the
+                        // parents piece of the given class in the right mode
+                        virtual void IR_FinderDef_setup_collocation (int collocated);
+                        
+                        FinderDef (
+                            TAO_Stub *objref, 
+                            CORBA::Boolean _tao_collocated = 0,
+                            TAO_Abstract_ServantBase *servant = 0
+                          );
+                        
+                        friend class _TAO_FinderDef_Remote_Proxy_Impl;
+                        friend class _TAO_FinderDef_ThruPOA_Proxy_Impl;
+                        friend class _TAO_FinderDef_Direct_Proxy_Impl;
+                        
+                        virtual ~FinderDef (void);
+                      
+                      private:
+                        FinderDef (const FinderDef &);
+                        void operator= (const FinderDef &);
+                      };
+                      
+                      // The Proxy Implementations are used by each interface to
+                      // perform a call. Each different implementation encapsulate
+                      // an invocation logics.
+                      
+                      
+                      ///////////////////////////////////////////////////////////////////////
+                      //                    Base Proxy Impl. Declaration
+                      //
+                      
+                      class TAO_IFR_Client_Export _TAO_FinderDef_Proxy_Impl
+                        : public virtual _TAO_CORBA_OperationDef_Proxy_Impl
+                      {
+                      public:
+                        virtual ~_TAO_FinderDef_Proxy_Impl (void) { }
+                        
+                      protected:
+                        _TAO_FinderDef_Proxy_Impl (void);
+                      };
+                      
+                      //
+                      //               End Base Proxy Impl. Declaration
+                      ///////////////////////////////////////////////////////////////////////
+                      
+                      
+                      ///////////////////////////////////////////////////////////////////////
+                      //                Remote Proxy Impl. Declaration
+                      //
+                      
+                      class TAO_IFR_Client_Export _TAO_FinderDef_Remote_Proxy_Impl
+                        : public virtual _TAO_FinderDef_Proxy_Impl,
+                          public virtual TAO_Remote_Object_Proxy_Impl,
+                          public virtual _TAO_CORBA_OperationDef_Remote_Proxy_Impl
+                      {
+                      public:
+                        _TAO_FinderDef_Remote_Proxy_Impl (void);
+                        
+                        virtual ~_TAO_FinderDef_Remote_Proxy_Impl (void) { }
+                        
+                      };
+                      
+                      //
+                      //             End Remote Proxy Impl. Declaration
+                      ///////////////////////////////////////////////////////////////////////
+                      
+                      // The Proxy Brokers are used by each interface to get
+                      // the right proxy for performing a call. In the new 
+                      // collocation scheme, the proxy to be used can vary on
+                      // a call by call basis.
+                      
+                      
+                      ///////////////////////////////////////////////////////////////////////
+                      //                 Base Proxy Broker Declaration 
+                      //
+                      
+                                            class TAO_IFR_Client_Export _TAO_FinderDef_Proxy_Broker
+                      {
+                      public:
+                        virtual ~_TAO_FinderDef_Proxy_Broker (void);
+                        virtual _TAO_FinderDef_Proxy_Impl &select_proxy (
+                            FinderDef *object,
+                            CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                          ) = 0;
+                        
+                      protected:
+                        _TAO_FinderDef_Proxy_Broker (void);
+                        
+                      };
+                      
+                      //
+                      //              End Base Proxy Broker Declaration 
+                      ///////////////////////////////////////////////////////////////////////
+                      
+                                            
+                      ///////////////////////////////////////////////////////////////////////
+                      //                 Remote Proxy Broker Declaration 
+                      //
+                      
+                      class TAO_IFR_Client_Export _TAO_FinderDef_Remote_Proxy_Broker
+                        : public virtual _TAO_FinderDef_Proxy_Broker
+                      {
+                      public: 
+                        _TAO_FinderDef_Remote_Proxy_Broker (void);
+                        
+                        virtual ~_TAO_FinderDef_Remote_Proxy_Broker (void);
+                        
+                        virtual _TAO_FinderDef_Proxy_Impl &select_proxy (
+                            FinderDef *object,
+                            CORBA_Environment &ACE_TRY_ENV
+                          );
+                        
+                        private:
+                          _TAO_FinderDef_Remote_Proxy_Impl remote_proxy_impl_;
+                        
+                        public:
+                          // This member function is used to get an handle to the unique instance
+                          // of the Remote Proxy Broker that is available for a given
+                          // interface.
+                          static _TAO_FinderDef_Remote_Proxy_Broker *the_TAO_FinderDef_Remote_Proxy_Broker (void);
+                        };
+                        
+                        //
+                        //              End Remote Proxy Broker Declaration 
+                        ///////////////////////////////////////////////////////////////////////
+                        
+                        
 #endif /* end #if !defined */
-
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_FinderDef;
-
-
+                        
+                        TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_FinderDef;
+                        
+                        
 #if !defined (_IR_HOMEDEF_CH_)
 #define _IR_HOMEDEF_CH_
-
-// Forward Classes Declaration
-class _TAO_HomeDef_Proxy_Impl;
-class _TAO_HomeDef_Remote_Proxy_Impl;
-class _TAO_HomeDef_Proxy_Broker;
-class _TAO_HomeDef_Remote_Proxy_Broker;
-
-class TAO_IFR_Client_Export HomeDef: public virtual CORBA_InterfaceDef
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef HomeDef_ptr _ptr_type;
-  typedef HomeDef_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static HomeDef_ptr _duplicate (HomeDef_ptr obj);
-  static HomeDef_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static HomeDef_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static HomeDef_ptr _nil (void)
-    {
-      return (HomeDef_ptr)0;
-    }
-
-  static void _tao_any_destructor (void*);
-
-  virtual IR::HomeDef_ptr base_home (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::ComponentDef_ptr managed_component (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::PrimaryKeyDef_ptr primary_key (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::FactoryDefSeq * factories (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::FinderDefSeq * finders (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean is_basic (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::PrimaryKeyDef_ptr create_primary_key (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_ValueDef_ptr primary_key,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::FactoryDef_ptr create_factory (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_ParDescriptionSeq & params,
-      const CORBA_ExceptionDefSeq & exceptions,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::FinderDef_ptr create_finder (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_ParDescriptionSeq & params,
-      const CORBA_ExceptionDefSeq & exceptions,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
-
-private:
-  _TAO_HomeDef_Proxy_Broker *the_TAO_HomeDef_Proxy_Broker_;
-  
-protected:
-  HomeDef (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void IR_HomeDef_setup_collocation (int collocated);
-    
-    HomeDef (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_HomeDef_Remote_Proxy_Impl;
-    friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_HomeDef_Direct_Proxy_Impl;
-  
-  virtual ~HomeDef (void);
-private:
-  HomeDef (const HomeDef &);
-  void operator= (const HomeDef &);
-};
-
-
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_HomeDef_Proxy_Impl : 
-  public virtual _TAO_CORBA_InterfaceDef_Proxy_Impl
-{
-public:
-  virtual ~_TAO_HomeDef_Proxy_Impl (void) { }
-  
-    virtual IR::HomeDef_ptr base_home (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual IR::ComponentDef_ptr managed_component (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual IR::PrimaryKeyDef_ptr primary_key (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual IR::FactoryDefSeq * factories (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual IR::FinderDefSeq * finders (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA::Boolean is_basic (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual IR::PrimaryKeyDef_ptr create_primary_key (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_ValueDef_ptr primary_key,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual IR::FactoryDef_ptr create_factory (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_ParDescriptionSeq & params,
-      const CORBA_ExceptionDefSeq & exceptions,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual IR::FinderDef_ptr create_finder (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_ParDescriptionSeq & params,
-      const CORBA_ExceptionDefSeq & exceptions,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-protected:
-  _TAO_HomeDef_Proxy_Impl (void);
-
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_HomeDef_Remote_Proxy_Impl : 
-  public virtual _TAO_HomeDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_HomeDef_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_HomeDef_Remote_Proxy_Impl (void) { }
-  
-    virtual IR::HomeDef_ptr base_home (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::ComponentDef_ptr managed_component (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::PrimaryKeyDef_ptr primary_key (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::FactoryDefSeq * factories (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::FinderDefSeq * finders (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean is_basic (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::PrimaryKeyDef_ptr create_primary_key (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_ValueDef_ptr primary_key,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::FactoryDef_ptr create_factory (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_ParDescriptionSeq & params,
-      const CORBA_ExceptionDefSeq & exceptions,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual IR::FinderDef_ptr create_finder (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_ParDescriptionSeq & params,
-      const CORBA_ExceptionDefSeq & exceptions,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-};
-
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
-
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_HomeDef_Proxy_Broker
-{
-public:
-  virtual ~_TAO_HomeDef_Proxy_Broker (void);
-  virtual _TAO_HomeDef_Proxy_Impl &select_proxy (
-    HomeDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
-
-protected:
-  _TAO_HomeDef_Proxy_Broker (void);
-  
-};
-
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_HomeDef_Remote_Proxy_Broker : public virtual _TAO_HomeDef_Proxy_Broker
-{
-public: 
-  _TAO_HomeDef_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_HomeDef_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_HomeDef_Proxy_Impl &select_proxy (
-    HomeDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
-
-private:
-  _TAO_HomeDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
-
-public:
-  static _TAO_HomeDef_Remote_Proxy_Broker *the_TAO_HomeDef_Remote_Proxy_Broker (void);
-};
-
-
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
+                        
+                        // Forward Classes Declaration
+                        class _TAO_HomeDef_Proxy_Impl;
+                        class _TAO_HomeDef_Remote_Proxy_Impl;
+                        class _TAO_HomeDef_Proxy_Broker;
+                        class _TAO_HomeDef_Remote_Proxy_Broker;
+                        
+                        class TAO_IFR_Client_Export HomeDef
+                          : public virtual CORBA_InterfaceDef
+                        {
+                        public:
+                        #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+                          typedef HomeDef_ptr _ptr_type;
+                          typedef HomeDef_var _var_type;
+                        #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+                          // the static operations
+                          static HomeDef_ptr _duplicate (HomeDef_ptr obj);
+                          
+                          static HomeDef_ptr _narrow (
+                              CORBA::Object_ptr obj,
+                              CORBA::Environment &ACE_TRY_ENV = 
+                                TAO_default_environment ()
+                            );
+                          
+                          static HomeDef_ptr _unchecked_narrow (
+                              CORBA::Object_ptr obj,
+                              CORBA::Environment &ACE_TRY_ENV = 
+                                TAO_default_environment ()
+                            );
+                          
+                          static HomeDef_ptr _nil (void)
+                            {
+                              return (HomeDef_ptr)0;
+                            }
+                          
+                          static void _tao_any_destructor (void*);
+                          
+                          virtual IR::HomeDef_ptr base_home (
+                              CORBA::Environment &ACE_TRY_ENV = 
+                                TAO_default_environment ()
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            ));
+                          
+                          virtual IR::ComponentDef_ptr managed_component (
+                              CORBA::Environment &ACE_TRY_ENV = 
+                                TAO_default_environment ()
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            ));
+                          
+                          virtual IR::PrimaryKeyDef_ptr primary_key (
+                              CORBA::Environment &ACE_TRY_ENV = 
+                                TAO_default_environment ()
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            ));
+                          
+                          virtual IR::FactoryDefSeq * factories (
+                              CORBA::Environment &ACE_TRY_ENV = 
+                                TAO_default_environment ()
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            ));
+                          
+                          virtual IR::FinderDefSeq * finders (
+                              CORBA::Environment &ACE_TRY_ENV = 
+                                TAO_default_environment ()
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            ));
+                          
+                          virtual CORBA::Boolean is_basic (
+                              CORBA::Environment &ACE_TRY_ENV = 
+                                TAO_default_environment ()
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            ));
+                          
+                          virtual IR::PrimaryKeyDef_ptr create_primary_key (
+                              const char * id,
+                              const char * name,
+                              const char * version,
+                              CORBA_ValueDef_ptr primary_key,
+                              CORBA::Environment &ACE_TRY_ENV = 
+                                TAO_default_environment ()
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            ));
+                          
+                          virtual IR::FactoryDef_ptr create_factory (
+                              const char * id,
+                              const char * name,
+                              const char * version,
+                              const CORBA_ParDescriptionSeq & params,
+                              const CORBA_ExceptionDefSeq & exceptions,
+                              CORBA::Environment &ACE_TRY_ENV = 
+                                TAO_default_environment ()
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            ));
+                          
+                          virtual IR::FinderDef_ptr create_finder (
+                              const char * id,
+                              const char * name,
+                              const char * version,
+                              const CORBA_ParDescriptionSeq & params,
+                              const CORBA_ExceptionDefSeq & exceptions,
+                              CORBA::Environment &ACE_TRY_ENV = 
+                                TAO_default_environment ()
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            ));
+                          
+                          virtual CORBA::Boolean _is_a (
+                              const CORBA::Char *type_id, 
+                              CORBA::Environment &ACE_TRY_ENV = 
+                                TAO_default_environment ()
+                            );
+                          
+                          virtual void *_tao_QueryInterface (ptr_arith_t type);
+                          
+                          virtual const char* _interface_repository_id (void) const;
+
+                        private:
+                          _TAO_HomeDef_Proxy_Broker *the_TAO_HomeDef_Proxy_Broker_;
+                          
+                        protected:
+                          HomeDef (int collocated = 0);
+                          
+                          // This methods travese the inheritance tree and set the
+                          // parents piece of the given class in the right mode
+                          virtual void IR_HomeDef_setup_collocation (int collocated);
+                          
+                          HomeDef (
+                              TAO_Stub *objref, 
+                              CORBA::Boolean _tao_collocated = 0,
+                              TAO_Abstract_ServantBase *servant = 0
+                            );
+                          
+                          friend class _TAO_HomeDef_Remote_Proxy_Impl;
+                          friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
+                          friend class _TAO_HomeDef_Direct_Proxy_Impl;
+                          
+                          virtual ~HomeDef (void);
+                        
+                        private:
+                          HomeDef (const HomeDef &);
+                          void operator= (const HomeDef &);
+                        };
+                        
+                        // The Proxy Implementations are used by each interface to
+                        // perform a call. Each different implementation encapsulate
+                        // an invocation logics.
+                        
+                        
+                        ///////////////////////////////////////////////////////////////////////
+                        //                    Base Proxy Impl. Declaration
+                        //
+                        
+                        class TAO_IFR_Client_Export _TAO_HomeDef_Proxy_Impl
+                          : public virtual _TAO_CORBA_InterfaceDef_Proxy_Impl
+                        {
+                        public:
+                          virtual ~_TAO_HomeDef_Proxy_Impl (void) { }
+                          virtual IR::HomeDef_ptr base_home (
+                              CORBA_Object *_collocated_tao_target_,
+                              CORBA::Environment &ACE_TRY_ENV
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            )) = 0;
+                          
+                          virtual IR::ComponentDef_ptr managed_component (
+                              CORBA_Object *_collocated_tao_target_,
+                              CORBA::Environment &ACE_TRY_ENV
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            )) = 0;
+                          
+                          virtual IR::PrimaryKeyDef_ptr primary_key (
+                              CORBA_Object *_collocated_tao_target_,
+                              CORBA::Environment &ACE_TRY_ENV
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            )) = 0;
+                          
+                          virtual IR::FactoryDefSeq * factories (
+                              CORBA_Object *_collocated_tao_target_,
+                              CORBA::Environment &ACE_TRY_ENV
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            )) = 0;
+                          
+                          virtual IR::FinderDefSeq * finders (
+                              CORBA_Object *_collocated_tao_target_,
+                              CORBA::Environment &ACE_TRY_ENV
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            )) = 0;
+                          
+                          virtual CORBA::Boolean is_basic (
+                              CORBA_Object *_collocated_tao_target_,
+                              CORBA::Environment &ACE_TRY_ENV
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            )) = 0;
+                          
+                          virtual IR::PrimaryKeyDef_ptr create_primary_key (
+                              CORBA_Object *_collocated_tao_target_,
+                              const char * id,
+                              const char * name,
+                              const char * version,
+                              CORBA_ValueDef_ptr primary_key,
+                              CORBA::Environment &ACE_TRY_ENV
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            )) = 0;
+                          
+                          virtual IR::FactoryDef_ptr create_factory (
+                              CORBA_Object *_collocated_tao_target_,
+                              const char * id,
+                              const char * name,
+                              const char * version,
+                              const CORBA_ParDescriptionSeq & params,
+                              const CORBA_ExceptionDefSeq & exceptions,
+                              CORBA::Environment &ACE_TRY_ENV
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            )) = 0;
+                          
+                          virtual IR::FinderDef_ptr create_finder (
+                              CORBA_Object *_collocated_tao_target_,
+                              const char * id,
+                              const char * name,
+                              const char * version,
+                              const CORBA_ParDescriptionSeq & params,
+                              const CORBA_ExceptionDefSeq & exceptions,
+                              CORBA::Environment &ACE_TRY_ENV
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            )) = 0;
+                          
+                          
+                        protected:
+                          _TAO_HomeDef_Proxy_Impl (void);
+                        };
+                        
+                        //
+                        //               End Base Proxy Impl. Declaration
+                        ///////////////////////////////////////////////////////////////////////
+                        
+                        
+                        ///////////////////////////////////////////////////////////////////////
+                        //                Remote Proxy Impl. Declaration
+                        //
+                        
+                        class TAO_IFR_Client_Export _TAO_HomeDef_Remote_Proxy_Impl
+                          : public virtual _TAO_HomeDef_Proxy_Impl,
+                            public virtual TAO_Remote_Object_Proxy_Impl,
+                            public virtual _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl
+                        {
+                        public:
+                          _TAO_HomeDef_Remote_Proxy_Impl (void);
+                          
+                          virtual ~_TAO_HomeDef_Remote_Proxy_Impl (void) { }
+                          virtual IR::HomeDef_ptr base_home (
+                              CORBA_Object *_collocated_tao_target_,
+                              CORBA::Environment &ACE_TRY_ENV
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            ));
+                          
+                          virtual IR::ComponentDef_ptr managed_component (
+                              CORBA_Object *_collocated_tao_target_,
+                              CORBA::Environment &ACE_TRY_ENV
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            ));
+                          
+                          virtual IR::PrimaryKeyDef_ptr primary_key (
+                              CORBA_Object *_collocated_tao_target_,
+                              CORBA::Environment &ACE_TRY_ENV
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            ));
+                          
+                          virtual IR::FactoryDefSeq * factories (
+                              CORBA_Object *_collocated_tao_target_,
+                              CORBA::Environment &ACE_TRY_ENV
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            ));
+                          
+                          virtual IR::FinderDefSeq * finders (
+                              CORBA_Object *_collocated_tao_target_,
+                              CORBA::Environment &ACE_TRY_ENV
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            ));
+                          
+                          virtual CORBA::Boolean is_basic (
+                              CORBA_Object *_collocated_tao_target_,
+                              CORBA::Environment &ACE_TRY_ENV
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            ));
+                          
+                          virtual IR::PrimaryKeyDef_ptr create_primary_key (
+                              CORBA_Object *_collocated_tao_target_,
+                              const char * id,
+                              const char * name,
+                              const char * version,
+                              CORBA_ValueDef_ptr primary_key,
+                              CORBA::Environment &ACE_TRY_ENV
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            ));
+                          
+                          virtual IR::FactoryDef_ptr create_factory (
+                              CORBA_Object *_collocated_tao_target_,
+                              const char * id,
+                              const char * name,
+                              const char * version,
+                              const CORBA_ParDescriptionSeq & params,
+                              const CORBA_ExceptionDefSeq & exceptions,
+                              CORBA::Environment &ACE_TRY_ENV
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            ));
+                          
+                          virtual IR::FinderDef_ptr create_finder (
+                              CORBA_Object *_collocated_tao_target_,
+                              const char * id,
+                              const char * name,
+                              const char * version,
+                              const CORBA_ParDescriptionSeq & params,
+                              const CORBA_ExceptionDefSeq & exceptions,
+                              CORBA::Environment &ACE_TRY_ENV
+                            )
+                            ACE_THROW_SPEC ((
+                              CORBA::SystemException
+                            ));
+                          
+                          
+                        };
+                        
+                        //
+                        //             End Remote Proxy Impl. Declaration
+                        ///////////////////////////////////////////////////////////////////////
+                        
+                        // The Proxy Brokers are used by each interface to get
+                        // the right proxy for performing a call. In the new 
+                        // collocation scheme, the proxy to be used can vary on
+                        // a call by call basis.
+                        
+                        
+                        ///////////////////////////////////////////////////////////////////////
+                        //                 Base Proxy Broker Declaration 
+                        //
+                        
+                                                class TAO_IFR_Client_Export _TAO_HomeDef_Proxy_Broker
+                        {
+                        public:
+                          virtual ~_TAO_HomeDef_Proxy_Broker (void);
+                          virtual _TAO_HomeDef_Proxy_Impl &select_proxy (
+                              HomeDef *object,
+                              CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                            ) = 0;
+                          
+                        protected:
+                          _TAO_HomeDef_Proxy_Broker (void);
+                          
+                        };
+                        
+                        //
+                        //              End Base Proxy Broker Declaration 
+                        ///////////////////////////////////////////////////////////////////////
+                        
+                                                
+                        ///////////////////////////////////////////////////////////////////////
+                        //                 Remote Proxy Broker Declaration 
+                        //
+                        
+                        class TAO_IFR_Client_Export _TAO_HomeDef_Remote_Proxy_Broker
+                          : public virtual _TAO_HomeDef_Proxy_Broker
+                        {
+                        public: 
+                          _TAO_HomeDef_Remote_Proxy_Broker (void);
+                          
+                          virtual ~_TAO_HomeDef_Remote_Proxy_Broker (void);
+                          
+                          virtual _TAO_HomeDef_Proxy_Impl &select_proxy (
+                              HomeDef *object,
+                              CORBA_Environment &ACE_TRY_ENV
+                            );
+                          
+                          private:
+                            _TAO_HomeDef_Remote_Proxy_Impl remote_proxy_impl_;
+                          
+                          public:
+                            // This member function is used to get an handle to the unique instance
+                            // of the Remote Proxy Broker that is available for a given
+                            // interface.
+                            static _TAO_HomeDef_Remote_Proxy_Broker *the_TAO_HomeDef_Remote_Proxy_Broker (void);
+                          };
+                          
+                          //
+                          //              End Remote Proxy Broker Declaration 
+                          ///////////////////////////////////////////////////////////////////////
+                          
+                          
 #endif /* end #if !defined */
-
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_HomeDef;
-
-struct HomeDescription;
-class HomeDescription_var;
-
-struct TAO_IFR_Client_Export HomeDescription
-{
-
+                          
+                          TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_HomeDef;
+                          
+                          struct HomeDescription;
+                          class HomeDescription_var;
+                          
+                          struct TAO_IFR_Client_Export HomeDescription
+                          {
+                            
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef HomeDescription_var _var_type;
+                            typedef HomeDescription_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-  static void _tao_any_destructor (void*);
-
-  TAO_String_Manager name;
-  TAO_String_Manager id;
-  TAO_String_Manager defined_in;
-  TAO_String_Manager version;
-  TAO_String_Manager base_home;
-  TAO_String_Manager managed_component;
-  ACE_NESTED_CLASS (IR, PrimaryKeyDef_var) primary_key_def;
-  ACE_NESTED_CLASS (IR, FactoryDefSeq) factories;
-  ACE_NESTED_CLASS (IR, FinderDefSeq) finders;
-  CORBA_OpDescriptionSeq operations;
-  CORBA_AttrDescriptionSeq attributes;
-  CORBA::Boolean is_basic;
-};
-
-class TAO_IFR_Client_Export HomeDescription_var
-{
-public:
-  HomeDescription_var (void); // default constructor
-  HomeDescription_var (HomeDescription *);
-  HomeDescription_var (const HomeDescription_var &); // copy constructor
-  ~HomeDescription_var (void); // destructor
-  
-  HomeDescription_var &operator= (HomeDescription *);
-  HomeDescription_var &operator= (const HomeDescription_var &);
-  HomeDescription *operator-> (void);
-  const HomeDescription *operator-> (void) const;
-  
-  operator const HomeDescription &() const;
-  operator HomeDescription &();
-  operator HomeDescription &() const;
-  operator HomeDescription *&(); // variable-size types only
-  
-  // in, inout, out, _retn 
-  const HomeDescription &in (void) const;
-  HomeDescription &inout (void);
-  HomeDescription *&out (void);
-  HomeDescription *_retn (void);
-  HomeDescription *ptr (void) const;
-
-private:
-  HomeDescription *ptr_;
-};
-
-class TAO_IFR_Client_Export HomeDescription_out
-{
-public:
-  HomeDescription_out (HomeDescription *&);
-  HomeDescription_out (HomeDescription_var &);
-  HomeDescription_out (const HomeDescription_out &);
-  HomeDescription_out &operator= (const HomeDescription_out &);
-  HomeDescription_out &operator= (HomeDescription *);
-  operator HomeDescription *&();
-  HomeDescription *&ptr (void);
-  HomeDescription *operator-> (void);
-  
-private:
-  HomeDescription *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const HomeDescription_var &);
-};
-
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_HomeDescription;
-
-
-}
+                            static void _tao_any_destructor (void*);
+                            
+                            TAO_String_Manager name;
+                            TAO_String_Manager id;
+                            TAO_String_Manager defined_in;
+                            TAO_String_Manager version;
+                            TAO_String_Manager base_home;
+                            TAO_String_Manager managed_component;
+                            ACE_NESTED_CLASS (IR, PrimaryKeyDef_var) primary_key_def;
+                            ACE_NESTED_CLASS (IR, FactoryDefSeq) factories;
+                            ACE_NESTED_CLASS (IR, FinderDefSeq) finders;
+                            CORBA_OpDescriptionSeq operations;
+                            CORBA_AttrDescriptionSeq attributes;
+                            CORBA::Boolean is_basic;
+                            
+                          };
+                          
+                          class TAO_IFR_Client_Export HomeDescription_var
+                          {
+                          public:
+                            HomeDescription_var (void);
+                            HomeDescription_var (HomeDescription *);
+                            HomeDescription_var (const HomeDescription_var &);
+                            ~HomeDescription_var (void);
+                            
+                            HomeDescription_var &operator= (HomeDescription *);
+                            HomeDescription_var &operator= (const HomeDescription_var &);
+                            HomeDescription *operator-> (void);
+                            const HomeDescription *operator-> (void) const;
+                            
+                            operator const HomeDescription &() const;
+                            operator HomeDescription &();
+                            operator HomeDescription &() const;
+                            // Variable-size types only.
+                            operator HomeDescription *&();
+                            
+                            // in, inout, out, _retn 
+                            const HomeDescription &in (void) const;
+                            HomeDescription &inout (void);
+                            HomeDescription *&out (void);
+                            HomeDescription *_retn (void);
+                            HomeDescription *ptr (void) const;
+                          
+                          private:
+                            HomeDescription *ptr_;
+                          };
+                          
+                          class TAO_IFR_Client_Export HomeDescription_out
+                          {
+                          public:
+                            HomeDescription_out (HomeDescription *&);
+                            HomeDescription_out (HomeDescription_var &);
+                            HomeDescription_out (const HomeDescription_out &);
+                            HomeDescription_out &operator= (const HomeDescription_out &);
+                            HomeDescription_out &operator= (HomeDescription *);
+                            operator HomeDescription *&();
+                            HomeDescription *&ptr (void);
+                            HomeDescription *operator-> (void);
+                            
+                          private:
+                            HomeDescription *&ptr_;
+                            // Assignment from T_var not allowed.
+                            void operator= (const HomeDescription_var &);
+                          };
+                          
+                          TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_HomeDescription;
+                          
+                          
+                        }
 TAO_NAMESPACE_CLOSE // module IR
 
 // Proxy Broker Factory function pointer declarations.
-
-extern TAO_IFR_Client_Export
-IR::_TAO_ComponentRepository_Proxy_Broker *
-(*IR__TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-IR::_TAO_ProvidesDef_Proxy_Broker *
-(*IR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-IR::_TAO_UsesDef_Proxy_Broker *
-(*IR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-IR::_TAO_EventDef_Proxy_Broker *
-(*IR__TAO_EventDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-IR::_TAO_EmitsDef_Proxy_Broker *
-(*IR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-IR::_TAO_PublishesDef_Proxy_Broker *
-(*IR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-IR::_TAO_ConsumesDef_Proxy_Broker *
-(*IR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-IR::_TAO_ComponentDef_Proxy_Broker *
-(*IR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-IR::_TAO_PrimaryKeyDef_Proxy_Broker *
-(*IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-IR::_TAO_FactoryDef_Proxy_Broker *
-(*IR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-IR::_TAO_FinderDef_Proxy_Broker *
-(*IR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-IR::_TAO_HomeDef_Proxy_Broker *
-(*IR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::RepositoryIdSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::RepositoryIdSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::RepositoryIdSeq *&); // deprecated
+                        
+                        extern TAO_IFR_Client_Export
+                        IR::_TAO_ComponentRepository_Proxy_Broker *
+                        (*IR__TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer) (
+                            CORBA::Object_ptr obj
+                          );
+                        
+                        extern TAO_IFR_Client_Export
+                        IR::_TAO_ProvidesDef_Proxy_Broker *
+                        (*IR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer) (
+                            CORBA::Object_ptr obj
+                          );
+                        
+                        extern TAO_IFR_Client_Export
+                        IR::_TAO_UsesDef_Proxy_Broker *
+                        (*IR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer) (
+                            CORBA::Object_ptr obj
+                          );
+                        
+                        extern TAO_IFR_Client_Export
+                        IR::_TAO_EventDef_Proxy_Broker *
+                        (*IR__TAO_EventDef_Proxy_Broker_Factory_function_pointer) (
+                            CORBA::Object_ptr obj
+                          );
+                        
+                        extern TAO_IFR_Client_Export
+                        IR::_TAO_EmitsDef_Proxy_Broker *
+                        (*IR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer) (
+                            CORBA::Object_ptr obj
+                          );
+                        
+                        extern TAO_IFR_Client_Export
+                        IR::_TAO_PublishesDef_Proxy_Broker *
+                        (*IR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer) (
+                            CORBA::Object_ptr obj
+                          );
+                        
+                        extern TAO_IFR_Client_Export
+                        IR::_TAO_ConsumesDef_Proxy_Broker *
+                        (*IR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer) (
+                            CORBA::Object_ptr obj
+                          );
+                        
+                        extern TAO_IFR_Client_Export
+                        IR::_TAO_ComponentDef_Proxy_Broker *
+                        (*IR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer) (
+                            CORBA::Object_ptr obj
+                          );
+                        
+                        extern TAO_IFR_Client_Export
+                        IR::_TAO_PrimaryKeyDef_Proxy_Broker *
+                        (*IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer) (
+                            CORBA::Object_ptr obj
+                          );
+                        
+                        extern TAO_IFR_Client_Export
+                        IR::_TAO_FactoryDef_Proxy_Broker *
+                        (*IR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer) (
+                            CORBA::Object_ptr obj
+                          );
+                        
+                        extern TAO_IFR_Client_Export
+                        IR::_TAO_FinderDef_Proxy_Broker *
+                        (*IR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer) (
+                            CORBA::Object_ptr obj
+                          );
+                        
+                        extern TAO_IFR_Client_Export
+                        IR::_TAO_HomeDef_Proxy_Broker *
+                        (*IR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer) (
+                            CORBA::Object_ptr obj
+                          );
+                        
+                                                                                                                                                TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::RepositoryIdSeq &); // copying version
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::RepositoryIdSeq*); // noncopying version
+                        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::RepositoryIdSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::RepositoryIdSeq *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ComponentDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ComponentDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ComponentDefSeq *&); // deprecated
+                                                                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ComponentDefSeq &); // copying version
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ComponentDefSeq*); // noncopying version
+                        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ComponentDefSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ComponentDefSeq *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ProvidesDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ProvidesDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ProvidesDefSeq *&); // deprecated
+                                                TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ProvidesDefSeq &); // copying version
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ProvidesDefSeq*); // noncopying version
+                        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ProvidesDefSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ProvidesDefSeq *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::UsesDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::UsesDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::UsesDefSeq *&); // deprecated
+                                                TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::UsesDefSeq &); // copying version
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::UsesDefSeq*); // noncopying version
+                        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::UsesDefSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::UsesDefSeq *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::HomeDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::HomeDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::HomeDefSeq *&); // deprecated
+                                                TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::HomeDefSeq &); // copying version
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::HomeDefSeq*); // noncopying version
+                        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::HomeDefSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::HomeDefSeq *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::EmitsDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::EmitsDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::EmitsDefSeq *&); // deprecated
+                                                TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::EmitsDefSeq &); // copying version
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::EmitsDefSeq*); // noncopying version
+                        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::EmitsDefSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::EmitsDefSeq *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::PublishesDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::PublishesDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PublishesDefSeq *&); // deprecated
+                                                TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::PublishesDefSeq &); // copying version
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::PublishesDefSeq*); // noncopying version
+                        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PublishesDefSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::PublishesDefSeq *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ConsumesDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ConsumesDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ConsumesDefSeq *&); // deprecated
+                                                TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ConsumesDefSeq &); // copying version
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ConsumesDefSeq*); // noncopying version
+                        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ConsumesDefSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ConsumesDefSeq *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::FactoryDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::FactoryDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::FactoryDefSeq *&); // deprecated
+                                                TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::FactoryDefSeq &); // copying version
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::FactoryDefSeq*); // noncopying version
+                        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::FactoryDefSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::FactoryDefSeq *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::FinderDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::FinderDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::FinderDefSeq *&); // deprecated
+                                                TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::FinderDefSeq &); // copying version
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::FinderDefSeq*); // noncopying version
+                        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::FinderDefSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::FinderDefSeq *&);
-// Any operators for interface IR::ComponentRepository
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ComponentRepository_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ComponentRepository *&);
-// Any operators for interface IR::ProvidesDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ProvidesDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ProvidesDef *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ProvidesDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ProvidesDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ProvidesDescription *&); // deprecated
+                        // Any operators for interface IR::ComponentRepository
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ComponentRepository_ptr);
+                        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ComponentRepository *&);
+                        // Any operators for interface IR::ProvidesDef
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ProvidesDef_ptr);
+                        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ProvidesDef *&);
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ProvidesDescription &); // copying version
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ProvidesDescription*); // noncopying version
+                        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ProvidesDescription *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ProvidesDescription *&);
-// Any operators for interface IR::UsesDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::UsesDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::UsesDef *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::UsesDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::UsesDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::UsesDescription *&); // deprecated
+                        // Any operators for interface IR::UsesDef
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::UsesDef_ptr);
+                        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::UsesDef *&);
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::UsesDescription &); // copying version
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::UsesDescription*); // noncopying version
+                        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::UsesDescription *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::UsesDescription *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ProvidesDescSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ProvidesDescSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ProvidesDescSeq *&); // deprecated
+                                                TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ProvidesDescSeq &); // copying version
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ProvidesDescSeq*); // noncopying version
+                        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ProvidesDescSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ProvidesDescSeq *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::UsesDescSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::UsesDescSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::UsesDescSeq *&); // deprecated
+                                                TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::UsesDescSeq &); // copying version
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::UsesDescSeq*); // noncopying version
+                        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::UsesDescSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::UsesDescSeq *&);
-// Any operators for interface IR::EventDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::EventDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::EventDef *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::EventDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::EventDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::EventDescription *&); // deprecated
+                        // Any operators for interface IR::EventDef
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::EventDef_ptr);
+                        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::EventDef *&);
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::EventDescription &); // copying version
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::EventDescription*); // noncopying version
+                        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::EventDescription *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::EventDescription *&);
-// Any operators for interface IR::EmitsDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::EmitsDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::EmitsDef *&);
-// Any operators for interface IR::PublishesDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::PublishesDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PublishesDef *&);
-// Any operators for interface IR::ConsumesDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ConsumesDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ConsumesDef *&);
-// Any operators for interface IR::ComponentDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ComponentDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ComponentDef *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ComponentDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ComponentDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ComponentDescription *&); // deprecated
+                        // Any operators for interface IR::EmitsDef
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::EmitsDef_ptr);
+                        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::EmitsDef *&);
+                        // Any operators for interface IR::PublishesDef
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::PublishesDef_ptr);
+                        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PublishesDef *&);
+                        // Any operators for interface IR::ConsumesDef
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ConsumesDef_ptr);
+                        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ConsumesDef *&);
+                        // Any operators for interface IR::ComponentDef
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ComponentDef_ptr);
+                        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ComponentDef *&);
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ComponentDescription &); // copying version
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ComponentDescription*); // noncopying version
+                        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ComponentDescription *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ComponentDescription *&);
-// Any operators for interface IR::PrimaryKeyDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::PrimaryKeyDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PrimaryKeyDef *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::PrimaryKeyDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::PrimaryKeyDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PrimaryKeyDescription *&); // deprecated
+                        // Any operators for interface IR::PrimaryKeyDef
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::PrimaryKeyDef_ptr);
+                        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PrimaryKeyDef *&);
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::PrimaryKeyDescription &); // copying version
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::PrimaryKeyDescription*); // noncopying version
+                        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PrimaryKeyDescription *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::PrimaryKeyDescription *&);
-// Any operators for interface IR::FactoryDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::FactoryDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::FactoryDef *&);
-// Any operators for interface IR::FinderDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::FinderDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::FinderDef *&);
-// Any operators for interface IR::HomeDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::HomeDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::HomeDef *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::HomeDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::HomeDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::HomeDescription *&); // deprecated
+                        // Any operators for interface IR::FactoryDef
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::FactoryDef_ptr);
+                        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::FactoryDef *&);
+                        // Any operators for interface IR::FinderDef
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::FinderDef_ptr);
+                        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::FinderDef *&);
+                        // Any operators for interface IR::HomeDef
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::HomeDef_ptr);
+                        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::HomeDef *&);
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::HomeDescription &); // copying version
+                        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::HomeDescription*); // noncopying version
+                        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::HomeDescription *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::HomeDescription *&);
 
-#ifndef __ACE_INLINE__
-
+                        #ifndef __ACE_INLINE__
 
+                                                                                                
 #if !defined _TAO_CDR_OP_IR_RepositoryIdSeq_H_
-#define _TAO_CDR_OP_IR_RepositoryIdSeq_H_
+                        #define _TAO_CDR_OP_IR_RepositoryIdSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const IR::RepositoryIdSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IR::RepositoryIdSeq &
-  );
+                            TAO_OutputCDR &,
+                            const IR::RepositoryIdSeq &
+                          );
+                        TAO_IFR_Client_Export CORBA::Boolean operator>> (
+                            TAO_InputCDR &,
+                            IR::RepositoryIdSeq &
+                          );
 
 #endif /* _TAO_CDR_OP_IR_RepositoryIdSeq_H_ */
 
-
+                                                
 #if !defined _TAO_CDR_OP_IR_ComponentDefSeq_H_
-#define _TAO_CDR_OP_IR_ComponentDefSeq_H_
+                        #define _TAO_CDR_OP_IR_ComponentDefSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const IR::ComponentDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IR::ComponentDefSeq &
-  );
+                            TAO_OutputCDR &,
+                            const IR::ComponentDefSeq &
+                          );
+                        TAO_IFR_Client_Export CORBA::Boolean operator>> (
+                            TAO_InputCDR &,
+                            IR::ComponentDefSeq &
+                          );
 
 #endif /* _TAO_CDR_OP_IR_ComponentDefSeq_H_ */
 
-
+                        
 #if !defined _TAO_CDR_OP_IR_ProvidesDefSeq_H_
-#define _TAO_CDR_OP_IR_ProvidesDefSeq_H_
+                        #define _TAO_CDR_OP_IR_ProvidesDefSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const IR::ProvidesDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IR::ProvidesDefSeq &
-  );
+                            TAO_OutputCDR &,
+                            const IR::ProvidesDefSeq &
+                          );
+                        TAO_IFR_Client_Export CORBA::Boolean operator>> (
+                            TAO_InputCDR &,
+                            IR::ProvidesDefSeq &
+                          );
 
 #endif /* _TAO_CDR_OP_IR_ProvidesDefSeq_H_ */
 
-
+                        
 #if !defined _TAO_CDR_OP_IR_UsesDefSeq_H_
-#define _TAO_CDR_OP_IR_UsesDefSeq_H_
+                        #define _TAO_CDR_OP_IR_UsesDefSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const IR::UsesDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IR::UsesDefSeq &
-  );
+                            TAO_OutputCDR &,
+                            const IR::UsesDefSeq &
+                          );
+                        TAO_IFR_Client_Export CORBA::Boolean operator>> (
+                            TAO_InputCDR &,
+                            IR::UsesDefSeq &
+                          );
 
 #endif /* _TAO_CDR_OP_IR_UsesDefSeq_H_ */
 
-
+                        
 #if !defined _TAO_CDR_OP_IR_HomeDefSeq_H_
-#define _TAO_CDR_OP_IR_HomeDefSeq_H_
+                        #define _TAO_CDR_OP_IR_HomeDefSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const IR::HomeDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IR::HomeDefSeq &
-  );
+                            TAO_OutputCDR &,
+                            const IR::HomeDefSeq &
+                          );
+                        TAO_IFR_Client_Export CORBA::Boolean operator>> (
+                            TAO_InputCDR &,
+                            IR::HomeDefSeq &
+                          );
 
 #endif /* _TAO_CDR_OP_IR_HomeDefSeq_H_ */
 
-
+                        
 #if !defined _TAO_CDR_OP_IR_EmitsDefSeq_H_
-#define _TAO_CDR_OP_IR_EmitsDefSeq_H_
+                        #define _TAO_CDR_OP_IR_EmitsDefSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const IR::EmitsDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IR::EmitsDefSeq &
-  );
+                            TAO_OutputCDR &,
+                            const IR::EmitsDefSeq &
+                          );
+                        TAO_IFR_Client_Export CORBA::Boolean operator>> (
+                            TAO_InputCDR &,
+                            IR::EmitsDefSeq &
+                          );
 
 #endif /* _TAO_CDR_OP_IR_EmitsDefSeq_H_ */
 
-
+                        
 #if !defined _TAO_CDR_OP_IR_PublishesDefSeq_H_
-#define _TAO_CDR_OP_IR_PublishesDefSeq_H_
+                        #define _TAO_CDR_OP_IR_PublishesDefSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const IR::PublishesDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IR::PublishesDefSeq &
-  );
+                            TAO_OutputCDR &,
+                            const IR::PublishesDefSeq &
+                          );
+                        TAO_IFR_Client_Export CORBA::Boolean operator>> (
+                            TAO_InputCDR &,
+                            IR::PublishesDefSeq &
+                          );
 
 #endif /* _TAO_CDR_OP_IR_PublishesDefSeq_H_ */
 
-
+                        
 #if !defined _TAO_CDR_OP_IR_ConsumesDefSeq_H_
-#define _TAO_CDR_OP_IR_ConsumesDefSeq_H_
+                        #define _TAO_CDR_OP_IR_ConsumesDefSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const IR::ConsumesDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IR::ConsumesDefSeq &
-  );
+                            TAO_OutputCDR &,
+                            const IR::ConsumesDefSeq &
+                          );
+                        TAO_IFR_Client_Export CORBA::Boolean operator>> (
+                            TAO_InputCDR &,
+                            IR::ConsumesDefSeq &
+                          );
 
 #endif /* _TAO_CDR_OP_IR_ConsumesDefSeq_H_ */
 
-
+                        
 #if !defined _TAO_CDR_OP_IR_FactoryDefSeq_H_
-#define _TAO_CDR_OP_IR_FactoryDefSeq_H_
+                        #define _TAO_CDR_OP_IR_FactoryDefSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const IR::FactoryDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IR::FactoryDefSeq &
-  );
+                            TAO_OutputCDR &,
+                            const IR::FactoryDefSeq &
+                          );
+                        TAO_IFR_Client_Export CORBA::Boolean operator>> (
+                            TAO_InputCDR &,
+                            IR::FactoryDefSeq &
+                          );
 
 #endif /* _TAO_CDR_OP_IR_FactoryDefSeq_H_ */
 
-
+                        
 #if !defined _TAO_CDR_OP_IR_FinderDefSeq_H_
-#define _TAO_CDR_OP_IR_FinderDefSeq_H_
+                        #define _TAO_CDR_OP_IR_FinderDefSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const IR::FinderDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IR::FinderDefSeq &
-  );
+                            TAO_OutputCDR &,
+                            const IR::FinderDefSeq &
+                          );
+                        TAO_IFR_Client_Export CORBA::Boolean operator>> (
+                            TAO_InputCDR &,
+                            IR::FinderDefSeq &
+                          );
 
 #endif /* _TAO_CDR_OP_IR_FinderDefSeq_H_ */
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ComponentRepository_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ComponentRepository_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ProvidesDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ProvidesDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ProvidesDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ProvidesDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::UsesDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::UsesDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::UsesDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::UsesDescription &);
-
+                        TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ComponentRepository_ptr );
+                        TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ComponentRepository_ptr &);
+                        TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ProvidesDef_ptr );
+                        TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ProvidesDef_ptr &);
+                        TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ProvidesDescription &);
+                        TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ProvidesDescription &);
+                        TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::UsesDef_ptr );
+                        TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::UsesDef_ptr &);
+                        TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::UsesDescription &);
+                        TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::UsesDescription &);
+                        
 #if !defined _TAO_CDR_OP_IR_ProvidesDescSeq_H_
-#define _TAO_CDR_OP_IR_ProvidesDescSeq_H_
+                        #define _TAO_CDR_OP_IR_ProvidesDescSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const IR::ProvidesDescSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IR::ProvidesDescSeq &
-  );
+                            TAO_OutputCDR &,
+                            const IR::ProvidesDescSeq &
+                          );
+                        TAO_IFR_Client_Export CORBA::Boolean operator>> (
+                            TAO_InputCDR &,
+                            IR::ProvidesDescSeq &
+                          );
 
 #endif /* _TAO_CDR_OP_IR_ProvidesDescSeq_H_ */
 
-
+                        
 #if !defined _TAO_CDR_OP_IR_UsesDescSeq_H_
-#define _TAO_CDR_OP_IR_UsesDescSeq_H_
+                        #define _TAO_CDR_OP_IR_UsesDescSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const IR::UsesDescSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IR::UsesDescSeq &
-  );
+                            TAO_OutputCDR &,
+                            const IR::UsesDescSeq &
+                          );
+                        TAO_IFR_Client_Export CORBA::Boolean operator>> (
+                            TAO_InputCDR &,
+                            IR::UsesDescSeq &
+                          );
 
 #endif /* _TAO_CDR_OP_IR_UsesDescSeq_H_ */
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::EventDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::EventDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::EventDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::EventDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::EmitsDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::EmitsDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::PublishesDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::PublishesDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ConsumesDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ConsumesDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ComponentDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ComponentDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ComponentDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ComponentDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::PrimaryKeyDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::PrimaryKeyDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::PrimaryKeyDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::PrimaryKeyDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::FactoryDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::FactoryDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::FinderDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::FinderDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::HomeDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::HomeDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::HomeDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::HomeDescription &);
-
-#endif /* __ACE_INLINE__ */
+                        TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::EventDef_ptr );
+                        TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::EventDef_ptr &);
+                        TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::EventDescription &);
+                        TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::EventDescription &);
+                        TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::EmitsDef_ptr );
+                        TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::EmitsDef_ptr &);
+                        TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::PublishesDef_ptr );
+                        TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::PublishesDef_ptr &);
+                        TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ConsumesDef_ptr );
+                        TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ConsumesDef_ptr &);
+                        TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ComponentDef_ptr );
+                        TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ComponentDef_ptr &);
+                        TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ComponentDescription &);
+                        TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ComponentDescription &);
+                        TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::PrimaryKeyDef_ptr );
+                        TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::PrimaryKeyDef_ptr &);
+                        TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::PrimaryKeyDescription &);
+                        TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::PrimaryKeyDescription &);
+                        TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::FactoryDef_ptr );
+                        TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::FactoryDef_ptr &);
+                        TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::FinderDef_ptr );
+                        TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::FinderDef_ptr &);
+                        TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::HomeDef_ptr );
+                        TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::HomeDef_ptr &);
+                        TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::HomeDescription &);
+                        TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::HomeDescription &);
+
+                        #endif /* __ACE_INLINE__ */
 
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.i b/TAO/tao/IFR_Client/IFR_ComponentsC.i
index bec30d9b1e2..c4d7f2fea1a 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.i
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.i
@@ -233,162 +233,162 @@ IR::RepositoryIdSeq_out::operator[] (CORBA::ULong index)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CI_
 
-  ACE_INLINE IR::ComponentDef **
-  IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (CORBA::ULong nelems)
+ACE_INLINE IR::ComponentDef **
+IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (CORBA::ULong nelems)
+{
+  IR::ComponentDef **buf = 0;
+  
+  ACE_NEW_RETURN (buf, IR::ComponentDef*[nelems], 0);
+  
+  for (CORBA::ULong i = 0; i < nelems; i++)
+    {
+      buf[i] = IR::ComponentDef::_nil ();
+    }
+  
+  return buf;
+}
+
+ACE_INLINE void 
+IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::freebuf (IR::ComponentDef **buffer)
+{
+  if (buffer == 0)
+    return;
+  delete[] buffer;
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (void)
+{
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (CORBA::ULong maximum)
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (CORBA::ULong maximum,
+  CORBA::ULong length,
+  IR::ComponentDef* *value,
+  CORBA::Boolean release)
+: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+{
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &rhs)
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
   {
-    IR::ComponentDef **buf = 0;
-    
-    ACE_NEW_RETURN (buf, IR::ComponentDef*[nelems], 0);
+    IR::ComponentDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (this->maximum_);
+    IR::ComponentDef ** const tmp2 = ACE_reinterpret_cast (IR::ComponentDef ** ACE_CAST_CONST, rhs.buffer_);
     
-    for (CORBA::ULong i = 0; i < nelems; i++)
+    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
       {
-        buf[i] = IR::ComponentDef::_nil ();
+        tmp1[i] = IR::ComponentDef::_duplicate (tmp2[i]);
       }
     
-    return buf;
+    this->buffer_ = tmp1;
   }
-  
-  ACE_INLINE void 
-  IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::freebuf (IR::ComponentDef **buffer)
-  {
-    if (buffer == 0)
-      return;
-    delete[] buffer;
-  }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (void)
-  {
-  }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (CORBA::ULong maximum)
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    IR::ComponentDef* *value,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+  else
   {
+    this->buffer_ = 0;
   }
+}
+
+ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &
+IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &rhs)
+{
+  if (this == &rhs)
+    return *this;
   
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &rhs)
-    : TAO_Unbounded_Base_Sequence (rhs)
+  if (this->release_)
   {
-    if (rhs.buffer_ != 0)
+    IR::ComponentDef **tmp = ACE_reinterpret_cast (IR::ComponentDef **, this->buffer_);
+    
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      IR::ComponentDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (this->maximum_);
-      IR::ComponentDef ** const tmp2 = ACE_reinterpret_cast (IR::ComponentDef ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = IR::ComponentDef::_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
+      CORBA::release (tmp[i]);
+      tmp[i] = IR::ComponentDef::_nil ();
     }
-    else
+    if (this->maximum_ < rhs.maximum_)
     {
-      this->buffer_ = 0;
+      _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::freebuf (tmp);
+      this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (rhs.maximum_);
     }
   }
+  else
+    this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (rhs.maximum_);
   
-  ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &
-  IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &rhs)
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  IR::ComponentDef **tmp1 = ACE_reinterpret_cast (IR::ComponentDef **, this->buffer_);
+  IR::ComponentDef ** const tmp2 = ACE_reinterpret_cast (IR::ComponentDef ** ACE_CAST_CONST, rhs.buffer_);
+  
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
-      IR::ComponentDef **tmp = ACE_reinterpret_cast (IR::ComponentDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-      {
-        CORBA::release (tmp[i]);
-        tmp[i] = IR::ComponentDef::_nil ();
-      }
-      if (this->maximum_ < rhs.maximum_)
-      {
-        _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (rhs.maximum_);
-      }
+      tmp1[i] = IR::ComponentDef::_duplicate (tmp2[i]);
     }
-    else
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    IR::ComponentDef **tmp1 = ACE_reinterpret_cast (IR::ComponentDef **, this->buffer_);
-    IR::ComponentDef ** const tmp2 = ACE_reinterpret_cast (IR::ComponentDef ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      {
-        tmp1[i] = IR::ComponentDef::_duplicate (tmp2[i]);
-      }
-    
-    return *this;
-  }
-  
-  ACE_INLINE TAO_Object_Manager<IR::ComponentDef,IR::ComponentDef_var>
-  IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::operator[] (CORBA::ULong index) const
-  // read-write accessor
-  {
-    ACE_ASSERT (index < this->maximum_);
-    IR::ComponentDef ** const tmp = ACE_reinterpret_cast (IR::ComponentDef ** ACE_CAST_CONST, this->buffer_);
-    return TAO_Object_Manager<IR::ComponentDef,IR::ComponentDef_var> (tmp + index, this->release_);
-  }
   
-  ACE_INLINE IR::ComponentDef* *
-  IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::get_buffer (CORBA::Boolean orphan)
+  return *this;
+}
+
+ACE_INLINE TAO_Object_Manager<IR::ComponentDef,IR::ComponentDef_var>
+IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::operator[] (CORBA::ULong index) const
+// read-write accessor
+{
+  ACE_ASSERT (index < this->maximum_);
+  IR::ComponentDef ** const tmp = ACE_reinterpret_cast (IR::ComponentDef ** ACE_CAST_CONST, this->buffer_);
+  return TAO_Object_Manager<IR::ComponentDef,IR::ComponentDef_var> (tmp + index, this->release_);
+}
+
+ACE_INLINE IR::ComponentDef* *
+IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::get_buffer (CORBA::Boolean orphan)
+{
+  IR::ComponentDef **result = 0;
+  if (orphan == 0)
   {
-    IR::ComponentDef **result = 0;
-    if (orphan == 0)
+    // We retain ownership.
+    if (this->buffer_ == 0)
     {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (this->maximum_);
-        this->buffer_ = result;
-        this->release_ = 1;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (IR::ComponentDef**, this->buffer_);
-      }
+      result = _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (this->maximum_);
+      this->buffer_ = result;
+      this->release_ = 1;
     }
-    else // if (orphan == 1)
+    else
     {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(IR::ComponentDef**,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
+      result = ACE_reinterpret_cast (IR::ComponentDef**, this->buffer_);
     }
-    return result;
   }
-  
-  ACE_INLINE const IR::ComponentDef* *
-  IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::get_buffer (void) const
+  else // if (orphan == 1)
   {
-    return ACE_reinterpret_cast(const IR::ComponentDef ** ACE_CAST_CONST, this->buffer_);
+    if (this->release_ != 0)
+    {
+      // We set the state back to default and relinquish
+      // ownership.
+      result = ACE_reinterpret_cast(IR::ComponentDef**,this->buffer_);
+      this->maximum_ = 0;
+      this->length_ = 0;
+      this->buffer_ = 0;
+      this->release_ = 0;
+    }
   }
-  
-  
+  return result;
+}
+
+ACE_INLINE const IR::ComponentDef* *
+IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::get_buffer (void) const
+{
+  return ACE_reinterpret_cast(const IR::ComponentDef ** ACE_CAST_CONST, this->buffer_);
+}
+
+
 #endif /* end #if !defined */
 
 
@@ -607,162 +607,162 @@ IR::ComponentDefSeq_out::operator[] (CORBA::ULong index)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CI_
 
-  ACE_INLINE IR::ProvidesDef **
-  IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (CORBA::ULong nelems)
+ACE_INLINE IR::ProvidesDef **
+IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (CORBA::ULong nelems)
+{
+  IR::ProvidesDef **buf = 0;
+  
+  ACE_NEW_RETURN (buf, IR::ProvidesDef*[nelems], 0);
+  
+  for (CORBA::ULong i = 0; i < nelems; i++)
+    {
+      buf[i] = IR::ProvidesDef::_nil ();
+    }
+  
+  return buf;
+}
+
+ACE_INLINE void 
+IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::freebuf (IR::ProvidesDef **buffer)
+{
+  if (buffer == 0)
+    return;
+  delete[] buffer;
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (void)
+{
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (CORBA::ULong maximum)
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (CORBA::ULong maximum,
+  CORBA::ULong length,
+  IR::ProvidesDef* *value,
+  CORBA::Boolean release)
+: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+{
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &rhs)
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
   {
-    IR::ProvidesDef **buf = 0;
-    
-    ACE_NEW_RETURN (buf, IR::ProvidesDef*[nelems], 0);
+    IR::ProvidesDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (this->maximum_);
+    IR::ProvidesDef ** const tmp2 = ACE_reinterpret_cast (IR::ProvidesDef ** ACE_CAST_CONST, rhs.buffer_);
     
-    for (CORBA::ULong i = 0; i < nelems; i++)
+    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
       {
-        buf[i] = IR::ProvidesDef::_nil ();
+        tmp1[i] = IR::ProvidesDef::_duplicate (tmp2[i]);
       }
     
-    return buf;
-  }
-  
-  ACE_INLINE void 
-  IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::freebuf (IR::ProvidesDef **buffer)
-  {
-    if (buffer == 0)
-      return;
-    delete[] buffer;
-  }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (void)
-  {
-  }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (CORBA::ULong maximum)
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (maximum))
-  {
+    this->buffer_ = tmp1;
   }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    IR::ProvidesDef* *value,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+  else
   {
+    this->buffer_ = 0;
   }
+}
+
+ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &
+IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &rhs)
+{
+  if (this == &rhs)
+    return *this;
   
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &rhs)
-    : TAO_Unbounded_Base_Sequence (rhs)
+  if (this->release_)
   {
-    if (rhs.buffer_ != 0)
+    IR::ProvidesDef **tmp = ACE_reinterpret_cast (IR::ProvidesDef **, this->buffer_);
+    
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      IR::ProvidesDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (this->maximum_);
-      IR::ProvidesDef ** const tmp2 = ACE_reinterpret_cast (IR::ProvidesDef ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = IR::ProvidesDef::_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
+      CORBA::release (tmp[i]);
+      tmp[i] = IR::ProvidesDef::_nil ();
     }
-    else
+    if (this->maximum_ < rhs.maximum_)
     {
-      this->buffer_ = 0;
+      _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::freebuf (tmp);
+      this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (rhs.maximum_);
     }
   }
+  else
+    this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (rhs.maximum_);
   
-  ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &
-  IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &rhs)
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  IR::ProvidesDef **tmp1 = ACE_reinterpret_cast (IR::ProvidesDef **, this->buffer_);
+  IR::ProvidesDef ** const tmp2 = ACE_reinterpret_cast (IR::ProvidesDef ** ACE_CAST_CONST, rhs.buffer_);
+  
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
-      IR::ProvidesDef **tmp = ACE_reinterpret_cast (IR::ProvidesDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-      {
-        CORBA::release (tmp[i]);
-        tmp[i] = IR::ProvidesDef::_nil ();
-      }
-      if (this->maximum_ < rhs.maximum_)
-      {
-        _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (rhs.maximum_);
-      }
+      tmp1[i] = IR::ProvidesDef::_duplicate (tmp2[i]);
     }
-    else
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    IR::ProvidesDef **tmp1 = ACE_reinterpret_cast (IR::ProvidesDef **, this->buffer_);
-    IR::ProvidesDef ** const tmp2 = ACE_reinterpret_cast (IR::ProvidesDef ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      {
-        tmp1[i] = IR::ProvidesDef::_duplicate (tmp2[i]);
-      }
-    
-    return *this;
-  }
-  
-  ACE_INLINE TAO_Object_Manager<IR::ProvidesDef,IR::ProvidesDef_var>
-  IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::operator[] (CORBA::ULong index) const
-  // read-write accessor
-  {
-    ACE_ASSERT (index < this->maximum_);
-    IR::ProvidesDef ** const tmp = ACE_reinterpret_cast (IR::ProvidesDef ** ACE_CAST_CONST, this->buffer_);
-    return TAO_Object_Manager<IR::ProvidesDef,IR::ProvidesDef_var> (tmp + index, this->release_);
-  }
   
-  ACE_INLINE IR::ProvidesDef* *
-  IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::get_buffer (CORBA::Boolean orphan)
+  return *this;
+}
+
+ACE_INLINE TAO_Object_Manager<IR::ProvidesDef,IR::ProvidesDef_var>
+IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::operator[] (CORBA::ULong index) const
+// read-write accessor
+{
+  ACE_ASSERT (index < this->maximum_);
+  IR::ProvidesDef ** const tmp = ACE_reinterpret_cast (IR::ProvidesDef ** ACE_CAST_CONST, this->buffer_);
+  return TAO_Object_Manager<IR::ProvidesDef,IR::ProvidesDef_var> (tmp + index, this->release_);
+}
+
+ACE_INLINE IR::ProvidesDef* *
+IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::get_buffer (CORBA::Boolean orphan)
+{
+  IR::ProvidesDef **result = 0;
+  if (orphan == 0)
   {
-    IR::ProvidesDef **result = 0;
-    if (orphan == 0)
+    // We retain ownership.
+    if (this->buffer_ == 0)
     {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (this->maximum_);
-        this->buffer_ = result;
-        this->release_ = 1;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (IR::ProvidesDef**, this->buffer_);
-      }
+      result = _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (this->maximum_);
+      this->buffer_ = result;
+      this->release_ = 1;
     }
-    else // if (orphan == 1)
+    else
     {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(IR::ProvidesDef**,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
+      result = ACE_reinterpret_cast (IR::ProvidesDef**, this->buffer_);
     }
-    return result;
   }
-  
-  ACE_INLINE const IR::ProvidesDef* *
-  IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::get_buffer (void) const
+  else // if (orphan == 1)
   {
-    return ACE_reinterpret_cast(const IR::ProvidesDef ** ACE_CAST_CONST, this->buffer_);
+    if (this->release_ != 0)
+    {
+      // We set the state back to default and relinquish
+      // ownership.
+      result = ACE_reinterpret_cast(IR::ProvidesDef**,this->buffer_);
+      this->maximum_ = 0;
+      this->length_ = 0;
+      this->buffer_ = 0;
+      this->release_ = 0;
+    }
   }
-  
-  
+  return result;
+}
+
+ACE_INLINE const IR::ProvidesDef* *
+IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::get_buffer (void) const
+{
+  return ACE_reinterpret_cast(const IR::ProvidesDef ** ACE_CAST_CONST, this->buffer_);
+}
+
+
 #endif /* end #if !defined */
 
 
@@ -981,162 +981,162 @@ IR::ProvidesDefSeq_out::operator[] (CORBA::ULong index)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CI_
 
-  ACE_INLINE IR::UsesDef **
-  IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (CORBA::ULong nelems)
+ACE_INLINE IR::UsesDef **
+IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (CORBA::ULong nelems)
+{
+  IR::UsesDef **buf = 0;
+  
+  ACE_NEW_RETURN (buf, IR::UsesDef*[nelems], 0);
+  
+  for (CORBA::ULong i = 0; i < nelems; i++)
+    {
+      buf[i] = IR::UsesDef::_nil ();
+    }
+  
+  return buf;
+}
+
+ACE_INLINE void 
+IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::freebuf (IR::UsesDef **buffer)
+{
+  if (buffer == 0)
+    return;
+  delete[] buffer;
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (void)
+{
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (CORBA::ULong maximum)
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (CORBA::ULong maximum,
+  CORBA::ULong length,
+  IR::UsesDef* *value,
+  CORBA::Boolean release)
+: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+{
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &rhs)
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
   {
-    IR::UsesDef **buf = 0;
-    
-    ACE_NEW_RETURN (buf, IR::UsesDef*[nelems], 0);
+    IR::UsesDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (this->maximum_);
+    IR::UsesDef ** const tmp2 = ACE_reinterpret_cast (IR::UsesDef ** ACE_CAST_CONST, rhs.buffer_);
     
-    for (CORBA::ULong i = 0; i < nelems; i++)
+    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
       {
-        buf[i] = IR::UsesDef::_nil ();
+        tmp1[i] = IR::UsesDef::_duplicate (tmp2[i]);
       }
     
-    return buf;
-  }
-  
-  ACE_INLINE void 
-  IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::freebuf (IR::UsesDef **buffer)
-  {
-    if (buffer == 0)
-      return;
-    delete[] buffer;
-  }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (void)
-  {
+    this->buffer_ = tmp1;
   }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (CORBA::ULong maximum)
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    IR::UsesDef* *value,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+  else
   {
+    this->buffer_ = 0;
   }
+}
+
+ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &
+IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &rhs)
+{
+  if (this == &rhs)
+    return *this;
   
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &rhs)
-    : TAO_Unbounded_Base_Sequence (rhs)
+  if (this->release_)
   {
-    if (rhs.buffer_ != 0)
+    IR::UsesDef **tmp = ACE_reinterpret_cast (IR::UsesDef **, this->buffer_);
+    
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      IR::UsesDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (this->maximum_);
-      IR::UsesDef ** const tmp2 = ACE_reinterpret_cast (IR::UsesDef ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = IR::UsesDef::_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
+      CORBA::release (tmp[i]);
+      tmp[i] = IR::UsesDef::_nil ();
     }
-    else
+    if (this->maximum_ < rhs.maximum_)
     {
-      this->buffer_ = 0;
+      _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::freebuf (tmp);
+      this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (rhs.maximum_);
     }
   }
+  else
+    this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (rhs.maximum_);
   
-  ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &
-  IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &rhs)
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  IR::UsesDef **tmp1 = ACE_reinterpret_cast (IR::UsesDef **, this->buffer_);
+  IR::UsesDef ** const tmp2 = ACE_reinterpret_cast (IR::UsesDef ** ACE_CAST_CONST, rhs.buffer_);
+  
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
-      IR::UsesDef **tmp = ACE_reinterpret_cast (IR::UsesDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-      {
-        CORBA::release (tmp[i]);
-        tmp[i] = IR::UsesDef::_nil ();
-      }
-      if (this->maximum_ < rhs.maximum_)
-      {
-        _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (rhs.maximum_);
-      }
+      tmp1[i] = IR::UsesDef::_duplicate (tmp2[i]);
     }
-    else
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    IR::UsesDef **tmp1 = ACE_reinterpret_cast (IR::UsesDef **, this->buffer_);
-    IR::UsesDef ** const tmp2 = ACE_reinterpret_cast (IR::UsesDef ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      {
-        tmp1[i] = IR::UsesDef::_duplicate (tmp2[i]);
-      }
-    
-    return *this;
-  }
-  
-  ACE_INLINE TAO_Object_Manager<IR::UsesDef,IR::UsesDef_var>
-  IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::operator[] (CORBA::ULong index) const
-  // read-write accessor
-  {
-    ACE_ASSERT (index < this->maximum_);
-    IR::UsesDef ** const tmp = ACE_reinterpret_cast (IR::UsesDef ** ACE_CAST_CONST, this->buffer_);
-    return TAO_Object_Manager<IR::UsesDef,IR::UsesDef_var> (tmp + index, this->release_);
-  }
   
-  ACE_INLINE IR::UsesDef* *
-  IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::get_buffer (CORBA::Boolean orphan)
+  return *this;
+}
+
+ACE_INLINE TAO_Object_Manager<IR::UsesDef,IR::UsesDef_var>
+IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::operator[] (CORBA::ULong index) const
+// read-write accessor
+{
+  ACE_ASSERT (index < this->maximum_);
+  IR::UsesDef ** const tmp = ACE_reinterpret_cast (IR::UsesDef ** ACE_CAST_CONST, this->buffer_);
+  return TAO_Object_Manager<IR::UsesDef,IR::UsesDef_var> (tmp + index, this->release_);
+}
+
+ACE_INLINE IR::UsesDef* *
+IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::get_buffer (CORBA::Boolean orphan)
+{
+  IR::UsesDef **result = 0;
+  if (orphan == 0)
   {
-    IR::UsesDef **result = 0;
-    if (orphan == 0)
+    // We retain ownership.
+    if (this->buffer_ == 0)
     {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (this->maximum_);
-        this->buffer_ = result;
-        this->release_ = 1;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (IR::UsesDef**, this->buffer_);
-      }
+      result = _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (this->maximum_);
+      this->buffer_ = result;
+      this->release_ = 1;
     }
-    else // if (orphan == 1)
+    else
     {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(IR::UsesDef**,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
+      result = ACE_reinterpret_cast (IR::UsesDef**, this->buffer_);
     }
-    return result;
   }
-  
-  ACE_INLINE const IR::UsesDef* *
-  IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::get_buffer (void) const
+  else // if (orphan == 1)
   {
-    return ACE_reinterpret_cast(const IR::UsesDef ** ACE_CAST_CONST, this->buffer_);
+    if (this->release_ != 0)
+    {
+      // We set the state back to default and relinquish
+      // ownership.
+      result = ACE_reinterpret_cast(IR::UsesDef**,this->buffer_);
+      this->maximum_ = 0;
+      this->length_ = 0;
+      this->buffer_ = 0;
+      this->release_ = 0;
+    }
   }
-  
-  
+  return result;
+}
+
+ACE_INLINE const IR::UsesDef* *
+IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::get_buffer (void) const
+{
+  return ACE_reinterpret_cast(const IR::UsesDef ** ACE_CAST_CONST, this->buffer_);
+}
+
+
 #endif /* end #if !defined */
 
 
@@ -1355,162 +1355,162 @@ IR::UsesDefSeq_out::operator[] (CORBA::ULong index)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CI_
 
-  ACE_INLINE IR::HomeDef **
-  IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (CORBA::ULong nelems)
+ACE_INLINE IR::HomeDef **
+IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (CORBA::ULong nelems)
+{
+  IR::HomeDef **buf = 0;
+  
+  ACE_NEW_RETURN (buf, IR::HomeDef*[nelems], 0);
+  
+  for (CORBA::ULong i = 0; i < nelems; i++)
+    {
+      buf[i] = IR::HomeDef::_nil ();
+    }
+  
+  return buf;
+}
+
+ACE_INLINE void 
+IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::freebuf (IR::HomeDef **buffer)
+{
+  if (buffer == 0)
+    return;
+  delete[] buffer;
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (void)
+{
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (CORBA::ULong maximum)
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (CORBA::ULong maximum,
+  CORBA::ULong length,
+  IR::HomeDef* *value,
+  CORBA::Boolean release)
+: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+{
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq(const _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &rhs)
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
   {
-    IR::HomeDef **buf = 0;
-    
-    ACE_NEW_RETURN (buf, IR::HomeDef*[nelems], 0);
+    IR::HomeDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (this->maximum_);
+    IR::HomeDef ** const tmp2 = ACE_reinterpret_cast (IR::HomeDef ** ACE_CAST_CONST, rhs.buffer_);
     
-    for (CORBA::ULong i = 0; i < nelems; i++)
+    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
       {
-        buf[i] = IR::HomeDef::_nil ();
+        tmp1[i] = IR::HomeDef::_duplicate (tmp2[i]);
       }
     
-    return buf;
+    this->buffer_ = tmp1;
   }
-  
-  ACE_INLINE void 
-  IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::freebuf (IR::HomeDef **buffer)
-  {
-    if (buffer == 0)
-      return;
-    delete[] buffer;
-  }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (void)
-  {
-  }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (CORBA::ULong maximum)
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    IR::HomeDef* *value,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+  else
   {
+    this->buffer_ = 0;
   }
+}
+
+ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &
+IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &rhs)
+{
+  if (this == &rhs)
+    return *this;
   
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq(const _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &rhs)
-    : TAO_Unbounded_Base_Sequence (rhs)
+  if (this->release_)
   {
-    if (rhs.buffer_ != 0)
+    IR::HomeDef **tmp = ACE_reinterpret_cast (IR::HomeDef **, this->buffer_);
+    
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      IR::HomeDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (this->maximum_);
-      IR::HomeDef ** const tmp2 = ACE_reinterpret_cast (IR::HomeDef ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = IR::HomeDef::_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
+      CORBA::release (tmp[i]);
+      tmp[i] = IR::HomeDef::_nil ();
     }
-    else
+    if (this->maximum_ < rhs.maximum_)
     {
-      this->buffer_ = 0;
+      _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::freebuf (tmp);
+      this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (rhs.maximum_);
     }
   }
+  else
+    this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (rhs.maximum_);
   
-  ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &
-  IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &rhs)
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  IR::HomeDef **tmp1 = ACE_reinterpret_cast (IR::HomeDef **, this->buffer_);
+  IR::HomeDef ** const tmp2 = ACE_reinterpret_cast (IR::HomeDef ** ACE_CAST_CONST, rhs.buffer_);
+  
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
-      IR::HomeDef **tmp = ACE_reinterpret_cast (IR::HomeDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-      {
-        CORBA::release (tmp[i]);
-        tmp[i] = IR::HomeDef::_nil ();
-      }
-      if (this->maximum_ < rhs.maximum_)
-      {
-        _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (rhs.maximum_);
-      }
+      tmp1[i] = IR::HomeDef::_duplicate (tmp2[i]);
     }
-    else
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    IR::HomeDef **tmp1 = ACE_reinterpret_cast (IR::HomeDef **, this->buffer_);
-    IR::HomeDef ** const tmp2 = ACE_reinterpret_cast (IR::HomeDef ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      {
-        tmp1[i] = IR::HomeDef::_duplicate (tmp2[i]);
-      }
-    
-    return *this;
-  }
-  
-  ACE_INLINE TAO_Object_Manager<IR::HomeDef,IR::HomeDef_var>
-  IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::operator[] (CORBA::ULong index) const
-  // read-write accessor
-  {
-    ACE_ASSERT (index < this->maximum_);
-    IR::HomeDef ** const tmp = ACE_reinterpret_cast (IR::HomeDef ** ACE_CAST_CONST, this->buffer_);
-    return TAO_Object_Manager<IR::HomeDef,IR::HomeDef_var> (tmp + index, this->release_);
-  }
   
-  ACE_INLINE IR::HomeDef* *
-  IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::get_buffer (CORBA::Boolean orphan)
+  return *this;
+}
+
+ACE_INLINE TAO_Object_Manager<IR::HomeDef,IR::HomeDef_var>
+IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::operator[] (CORBA::ULong index) const
+// read-write accessor
+{
+  ACE_ASSERT (index < this->maximum_);
+  IR::HomeDef ** const tmp = ACE_reinterpret_cast (IR::HomeDef ** ACE_CAST_CONST, this->buffer_);
+  return TAO_Object_Manager<IR::HomeDef,IR::HomeDef_var> (tmp + index, this->release_);
+}
+
+ACE_INLINE IR::HomeDef* *
+IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::get_buffer (CORBA::Boolean orphan)
+{
+  IR::HomeDef **result = 0;
+  if (orphan == 0)
   {
-    IR::HomeDef **result = 0;
-    if (orphan == 0)
+    // We retain ownership.
+    if (this->buffer_ == 0)
     {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (this->maximum_);
-        this->buffer_ = result;
-        this->release_ = 1;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (IR::HomeDef**, this->buffer_);
-      }
+      result = _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (this->maximum_);
+      this->buffer_ = result;
+      this->release_ = 1;
     }
-    else // if (orphan == 1)
+    else
     {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(IR::HomeDef**,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
+      result = ACE_reinterpret_cast (IR::HomeDef**, this->buffer_);
     }
-    return result;
   }
-  
-  ACE_INLINE const IR::HomeDef* *
-  IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::get_buffer (void) const
+  else // if (orphan == 1)
   {
-    return ACE_reinterpret_cast(const IR::HomeDef ** ACE_CAST_CONST, this->buffer_);
+    if (this->release_ != 0)
+    {
+      // We set the state back to default and relinquish
+      // ownership.
+      result = ACE_reinterpret_cast(IR::HomeDef**,this->buffer_);
+      this->maximum_ = 0;
+      this->length_ = 0;
+      this->buffer_ = 0;
+      this->release_ = 0;
+    }
   }
-  
-  
+  return result;
+}
+
+ACE_INLINE const IR::HomeDef* *
+IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::get_buffer (void) const
+{
+  return ACE_reinterpret_cast(const IR::HomeDef ** ACE_CAST_CONST, this->buffer_);
+}
+
+
 #endif /* end #if !defined */
 
 
@@ -1729,162 +1729,162 @@ IR::HomeDefSeq_out::operator[] (CORBA::ULong index)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CI_
 
-  ACE_INLINE IR::EmitsDef **
-  IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (CORBA::ULong nelems)
+ACE_INLINE IR::EmitsDef **
+IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (CORBA::ULong nelems)
+{
+  IR::EmitsDef **buf = 0;
+  
+  ACE_NEW_RETURN (buf, IR::EmitsDef*[nelems], 0);
+  
+  for (CORBA::ULong i = 0; i < nelems; i++)
+    {
+      buf[i] = IR::EmitsDef::_nil ();
+    }
+  
+  return buf;
+}
+
+ACE_INLINE void 
+IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::freebuf (IR::EmitsDef **buffer)
+{
+  if (buffer == 0)
+    return;
+  delete[] buffer;
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (void)
+{
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (CORBA::ULong maximum)
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (CORBA::ULong maximum,
+  CORBA::ULong length,
+  IR::EmitsDef* *value,
+  CORBA::Boolean release)
+: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+{
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq(const _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &rhs)
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
   {
-    IR::EmitsDef **buf = 0;
-    
-    ACE_NEW_RETURN (buf, IR::EmitsDef*[nelems], 0);
+    IR::EmitsDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (this->maximum_);
+    IR::EmitsDef ** const tmp2 = ACE_reinterpret_cast (IR::EmitsDef ** ACE_CAST_CONST, rhs.buffer_);
     
-    for (CORBA::ULong i = 0; i < nelems; i++)
+    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
       {
-        buf[i] = IR::EmitsDef::_nil ();
+        tmp1[i] = IR::EmitsDef::_duplicate (tmp2[i]);
       }
     
-    return buf;
+    this->buffer_ = tmp1;
   }
-  
-  ACE_INLINE void 
-  IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::freebuf (IR::EmitsDef **buffer)
-  {
-    if (buffer == 0)
-      return;
-    delete[] buffer;
-  }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (void)
-  {
-  }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (CORBA::ULong maximum)
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    IR::EmitsDef* *value,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+  else
   {
+    this->buffer_ = 0;
   }
+}
+
+ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &
+IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &rhs)
+{
+  if (this == &rhs)
+    return *this;
   
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq(const _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &rhs)
-    : TAO_Unbounded_Base_Sequence (rhs)
+  if (this->release_)
   {
-    if (rhs.buffer_ != 0)
+    IR::EmitsDef **tmp = ACE_reinterpret_cast (IR::EmitsDef **, this->buffer_);
+    
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      IR::EmitsDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (this->maximum_);
-      IR::EmitsDef ** const tmp2 = ACE_reinterpret_cast (IR::EmitsDef ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = IR::EmitsDef::_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
+      CORBA::release (tmp[i]);
+      tmp[i] = IR::EmitsDef::_nil ();
     }
-    else
+    if (this->maximum_ < rhs.maximum_)
     {
-      this->buffer_ = 0;
+      _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::freebuf (tmp);
+      this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (rhs.maximum_);
     }
   }
+  else
+    this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (rhs.maximum_);
   
-  ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &
-  IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &rhs)
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  IR::EmitsDef **tmp1 = ACE_reinterpret_cast (IR::EmitsDef **, this->buffer_);
+  IR::EmitsDef ** const tmp2 = ACE_reinterpret_cast (IR::EmitsDef ** ACE_CAST_CONST, rhs.buffer_);
+  
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
-      IR::EmitsDef **tmp = ACE_reinterpret_cast (IR::EmitsDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-      {
-        CORBA::release (tmp[i]);
-        tmp[i] = IR::EmitsDef::_nil ();
-      }
-      if (this->maximum_ < rhs.maximum_)
-      {
-        _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (rhs.maximum_);
-      }
+      tmp1[i] = IR::EmitsDef::_duplicate (tmp2[i]);
     }
-    else
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    IR::EmitsDef **tmp1 = ACE_reinterpret_cast (IR::EmitsDef **, this->buffer_);
-    IR::EmitsDef ** const tmp2 = ACE_reinterpret_cast (IR::EmitsDef ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      {
-        tmp1[i] = IR::EmitsDef::_duplicate (tmp2[i]);
-      }
-    
-    return *this;
-  }
-  
-  ACE_INLINE TAO_Object_Manager<IR::EmitsDef,IR::EmitsDef_var>
-  IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::operator[] (CORBA::ULong index) const
-  // read-write accessor
-  {
-    ACE_ASSERT (index < this->maximum_);
-    IR::EmitsDef ** const tmp = ACE_reinterpret_cast (IR::EmitsDef ** ACE_CAST_CONST, this->buffer_);
-    return TAO_Object_Manager<IR::EmitsDef,IR::EmitsDef_var> (tmp + index, this->release_);
-  }
   
-  ACE_INLINE IR::EmitsDef* *
-  IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::get_buffer (CORBA::Boolean orphan)
+  return *this;
+}
+
+ACE_INLINE TAO_Object_Manager<IR::EmitsDef,IR::EmitsDef_var>
+IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::operator[] (CORBA::ULong index) const
+// read-write accessor
+{
+  ACE_ASSERT (index < this->maximum_);
+  IR::EmitsDef ** const tmp = ACE_reinterpret_cast (IR::EmitsDef ** ACE_CAST_CONST, this->buffer_);
+  return TAO_Object_Manager<IR::EmitsDef,IR::EmitsDef_var> (tmp + index, this->release_);
+}
+
+ACE_INLINE IR::EmitsDef* *
+IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::get_buffer (CORBA::Boolean orphan)
+{
+  IR::EmitsDef **result = 0;
+  if (orphan == 0)
   {
-    IR::EmitsDef **result = 0;
-    if (orphan == 0)
+    // We retain ownership.
+    if (this->buffer_ == 0)
     {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (this->maximum_);
-        this->buffer_ = result;
-        this->release_ = 1;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (IR::EmitsDef**, this->buffer_);
-      }
+      result = _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (this->maximum_);
+      this->buffer_ = result;
+      this->release_ = 1;
     }
-    else // if (orphan == 1)
+    else
     {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(IR::EmitsDef**,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
+      result = ACE_reinterpret_cast (IR::EmitsDef**, this->buffer_);
     }
-    return result;
   }
-  
-  ACE_INLINE const IR::EmitsDef* *
-  IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::get_buffer (void) const
+  else // if (orphan == 1)
   {
-    return ACE_reinterpret_cast(const IR::EmitsDef ** ACE_CAST_CONST, this->buffer_);
+    if (this->release_ != 0)
+    {
+      // We set the state back to default and relinquish
+      // ownership.
+      result = ACE_reinterpret_cast(IR::EmitsDef**,this->buffer_);
+      this->maximum_ = 0;
+      this->length_ = 0;
+      this->buffer_ = 0;
+      this->release_ = 0;
+    }
   }
-  
-  
+  return result;
+}
+
+ACE_INLINE const IR::EmitsDef* *
+IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::get_buffer (void) const
+{
+  return ACE_reinterpret_cast(const IR::EmitsDef ** ACE_CAST_CONST, this->buffer_);
+}
+
+
 #endif /* end #if !defined */
 
 
@@ -2103,162 +2103,162 @@ IR::EmitsDefSeq_out::operator[] (CORBA::ULong index)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CI_
 
-  ACE_INLINE IR::PublishesDef **
-  IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (CORBA::ULong nelems)
+ACE_INLINE IR::PublishesDef **
+IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (CORBA::ULong nelems)
+{
+  IR::PublishesDef **buf = 0;
+  
+  ACE_NEW_RETURN (buf, IR::PublishesDef*[nelems], 0);
+  
+  for (CORBA::ULong i = 0; i < nelems; i++)
+    {
+      buf[i] = IR::PublishesDef::_nil ();
+    }
+  
+  return buf;
+}
+
+ACE_INLINE void 
+IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::freebuf (IR::PublishesDef **buffer)
+{
+  if (buffer == 0)
+    return;
+  delete[] buffer;
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (void)
+{
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (CORBA::ULong maximum)
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (CORBA::ULong maximum,
+  CORBA::ULong length,
+  IR::PublishesDef* *value,
+  CORBA::Boolean release)
+: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+{
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &rhs)
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
   {
-    IR::PublishesDef **buf = 0;
-    
-    ACE_NEW_RETURN (buf, IR::PublishesDef*[nelems], 0);
+    IR::PublishesDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (this->maximum_);
+    IR::PublishesDef ** const tmp2 = ACE_reinterpret_cast (IR::PublishesDef ** ACE_CAST_CONST, rhs.buffer_);
     
-    for (CORBA::ULong i = 0; i < nelems; i++)
+    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
       {
-        buf[i] = IR::PublishesDef::_nil ();
+        tmp1[i] = IR::PublishesDef::_duplicate (tmp2[i]);
       }
     
-    return buf;
-  }
-  
-  ACE_INLINE void 
-  IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::freebuf (IR::PublishesDef **buffer)
-  {
-    if (buffer == 0)
-      return;
-    delete[] buffer;
-  }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (void)
-  {
-  }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (CORBA::ULong maximum)
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (maximum))
-  {
+    this->buffer_ = tmp1;
   }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    IR::PublishesDef* *value,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+  else
   {
+    this->buffer_ = 0;
   }
+}
+
+ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &
+IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &rhs)
+{
+  if (this == &rhs)
+    return *this;
   
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &rhs)
-    : TAO_Unbounded_Base_Sequence (rhs)
+  if (this->release_)
   {
-    if (rhs.buffer_ != 0)
+    IR::PublishesDef **tmp = ACE_reinterpret_cast (IR::PublishesDef **, this->buffer_);
+    
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      IR::PublishesDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (this->maximum_);
-      IR::PublishesDef ** const tmp2 = ACE_reinterpret_cast (IR::PublishesDef ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = IR::PublishesDef::_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
+      CORBA::release (tmp[i]);
+      tmp[i] = IR::PublishesDef::_nil ();
     }
-    else
+    if (this->maximum_ < rhs.maximum_)
     {
-      this->buffer_ = 0;
+      _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::freebuf (tmp);
+      this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (rhs.maximum_);
     }
   }
+  else
+    this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (rhs.maximum_);
   
-  ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &
-  IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &rhs)
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  IR::PublishesDef **tmp1 = ACE_reinterpret_cast (IR::PublishesDef **, this->buffer_);
+  IR::PublishesDef ** const tmp2 = ACE_reinterpret_cast (IR::PublishesDef ** ACE_CAST_CONST, rhs.buffer_);
+  
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
-      IR::PublishesDef **tmp = ACE_reinterpret_cast (IR::PublishesDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-      {
-        CORBA::release (tmp[i]);
-        tmp[i] = IR::PublishesDef::_nil ();
-      }
-      if (this->maximum_ < rhs.maximum_)
-      {
-        _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (rhs.maximum_);
-      }
+      tmp1[i] = IR::PublishesDef::_duplicate (tmp2[i]);
     }
-    else
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    IR::PublishesDef **tmp1 = ACE_reinterpret_cast (IR::PublishesDef **, this->buffer_);
-    IR::PublishesDef ** const tmp2 = ACE_reinterpret_cast (IR::PublishesDef ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      {
-        tmp1[i] = IR::PublishesDef::_duplicate (tmp2[i]);
-      }
-    
-    return *this;
-  }
-  
-  ACE_INLINE TAO_Object_Manager<IR::PublishesDef,IR::PublishesDef_var>
-  IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::operator[] (CORBA::ULong index) const
-  // read-write accessor
-  {
-    ACE_ASSERT (index < this->maximum_);
-    IR::PublishesDef ** const tmp = ACE_reinterpret_cast (IR::PublishesDef ** ACE_CAST_CONST, this->buffer_);
-    return TAO_Object_Manager<IR::PublishesDef,IR::PublishesDef_var> (tmp + index, this->release_);
-  }
   
-  ACE_INLINE IR::PublishesDef* *
-  IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::get_buffer (CORBA::Boolean orphan)
+  return *this;
+}
+
+ACE_INLINE TAO_Object_Manager<IR::PublishesDef,IR::PublishesDef_var>
+IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::operator[] (CORBA::ULong index) const
+// read-write accessor
+{
+  ACE_ASSERT (index < this->maximum_);
+  IR::PublishesDef ** const tmp = ACE_reinterpret_cast (IR::PublishesDef ** ACE_CAST_CONST, this->buffer_);
+  return TAO_Object_Manager<IR::PublishesDef,IR::PublishesDef_var> (tmp + index, this->release_);
+}
+
+ACE_INLINE IR::PublishesDef* *
+IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::get_buffer (CORBA::Boolean orphan)
+{
+  IR::PublishesDef **result = 0;
+  if (orphan == 0)
   {
-    IR::PublishesDef **result = 0;
-    if (orphan == 0)
+    // We retain ownership.
+    if (this->buffer_ == 0)
     {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (this->maximum_);
-        this->buffer_ = result;
-        this->release_ = 1;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (IR::PublishesDef**, this->buffer_);
-      }
+      result = _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (this->maximum_);
+      this->buffer_ = result;
+      this->release_ = 1;
     }
-    else // if (orphan == 1)
+    else
     {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(IR::PublishesDef**,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
+      result = ACE_reinterpret_cast (IR::PublishesDef**, this->buffer_);
     }
-    return result;
   }
-  
-  ACE_INLINE const IR::PublishesDef* *
-  IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::get_buffer (void) const
+  else // if (orphan == 1)
   {
-    return ACE_reinterpret_cast(const IR::PublishesDef ** ACE_CAST_CONST, this->buffer_);
+    if (this->release_ != 0)
+    {
+      // We set the state back to default and relinquish
+      // ownership.
+      result = ACE_reinterpret_cast(IR::PublishesDef**,this->buffer_);
+      this->maximum_ = 0;
+      this->length_ = 0;
+      this->buffer_ = 0;
+      this->release_ = 0;
+    }
   }
-  
-  
+  return result;
+}
+
+ACE_INLINE const IR::PublishesDef* *
+IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::get_buffer (void) const
+{
+  return ACE_reinterpret_cast(const IR::PublishesDef ** ACE_CAST_CONST, this->buffer_);
+}
+
+
 #endif /* end #if !defined */
 
 
@@ -2477,162 +2477,162 @@ IR::PublishesDefSeq_out::operator[] (CORBA::ULong index)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CI_
 
-  ACE_INLINE IR::ConsumesDef **
-  IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (CORBA::ULong nelems)
+ACE_INLINE IR::ConsumesDef **
+IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (CORBA::ULong nelems)
+{
+  IR::ConsumesDef **buf = 0;
+  
+  ACE_NEW_RETURN (buf, IR::ConsumesDef*[nelems], 0);
+  
+  for (CORBA::ULong i = 0; i < nelems; i++)
+    {
+      buf[i] = IR::ConsumesDef::_nil ();
+    }
+  
+  return buf;
+}
+
+ACE_INLINE void 
+IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::freebuf (IR::ConsumesDef **buffer)
+{
+  if (buffer == 0)
+    return;
+  delete[] buffer;
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (void)
+{
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (CORBA::ULong maximum)
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (CORBA::ULong maximum,
+  CORBA::ULong length,
+  IR::ConsumesDef* *value,
+  CORBA::Boolean release)
+: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+{
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &rhs)
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
   {
-    IR::ConsumesDef **buf = 0;
-    
-    ACE_NEW_RETURN (buf, IR::ConsumesDef*[nelems], 0);
+    IR::ConsumesDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (this->maximum_);
+    IR::ConsumesDef ** const tmp2 = ACE_reinterpret_cast (IR::ConsumesDef ** ACE_CAST_CONST, rhs.buffer_);
     
-    for (CORBA::ULong i = 0; i < nelems; i++)
+    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
       {
-        buf[i] = IR::ConsumesDef::_nil ();
+        tmp1[i] = IR::ConsumesDef::_duplicate (tmp2[i]);
       }
     
-    return buf;
+    this->buffer_ = tmp1;
   }
-  
-  ACE_INLINE void 
-  IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::freebuf (IR::ConsumesDef **buffer)
-  {
-    if (buffer == 0)
-      return;
-    delete[] buffer;
-  }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (void)
-  {
-  }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (CORBA::ULong maximum)
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    IR::ConsumesDef* *value,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+  else
   {
+    this->buffer_ = 0;
   }
+}
+
+ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &
+IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &rhs)
+{
+  if (this == &rhs)
+    return *this;
   
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &rhs)
-    : TAO_Unbounded_Base_Sequence (rhs)
+  if (this->release_)
   {
-    if (rhs.buffer_ != 0)
+    IR::ConsumesDef **tmp = ACE_reinterpret_cast (IR::ConsumesDef **, this->buffer_);
+    
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      IR::ConsumesDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (this->maximum_);
-      IR::ConsumesDef ** const tmp2 = ACE_reinterpret_cast (IR::ConsumesDef ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = IR::ConsumesDef::_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
+      CORBA::release (tmp[i]);
+      tmp[i] = IR::ConsumesDef::_nil ();
     }
-    else
+    if (this->maximum_ < rhs.maximum_)
     {
-      this->buffer_ = 0;
+      _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::freebuf (tmp);
+      this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (rhs.maximum_);
     }
   }
+  else
+    this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (rhs.maximum_);
   
-  ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &
-  IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &rhs)
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  IR::ConsumesDef **tmp1 = ACE_reinterpret_cast (IR::ConsumesDef **, this->buffer_);
+  IR::ConsumesDef ** const tmp2 = ACE_reinterpret_cast (IR::ConsumesDef ** ACE_CAST_CONST, rhs.buffer_);
+  
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
-      IR::ConsumesDef **tmp = ACE_reinterpret_cast (IR::ConsumesDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-      {
-        CORBA::release (tmp[i]);
-        tmp[i] = IR::ConsumesDef::_nil ();
-      }
-      if (this->maximum_ < rhs.maximum_)
-      {
-        _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (rhs.maximum_);
-      }
+      tmp1[i] = IR::ConsumesDef::_duplicate (tmp2[i]);
     }
-    else
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    IR::ConsumesDef **tmp1 = ACE_reinterpret_cast (IR::ConsumesDef **, this->buffer_);
-    IR::ConsumesDef ** const tmp2 = ACE_reinterpret_cast (IR::ConsumesDef ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      {
-        tmp1[i] = IR::ConsumesDef::_duplicate (tmp2[i]);
-      }
-    
-    return *this;
-  }
-  
-  ACE_INLINE TAO_Object_Manager<IR::ConsumesDef,IR::ConsumesDef_var>
-  IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::operator[] (CORBA::ULong index) const
-  // read-write accessor
-  {
-    ACE_ASSERT (index < this->maximum_);
-    IR::ConsumesDef ** const tmp = ACE_reinterpret_cast (IR::ConsumesDef ** ACE_CAST_CONST, this->buffer_);
-    return TAO_Object_Manager<IR::ConsumesDef,IR::ConsumesDef_var> (tmp + index, this->release_);
-  }
   
-  ACE_INLINE IR::ConsumesDef* *
-  IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::get_buffer (CORBA::Boolean orphan)
+  return *this;
+}
+
+ACE_INLINE TAO_Object_Manager<IR::ConsumesDef,IR::ConsumesDef_var>
+IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::operator[] (CORBA::ULong index) const
+// read-write accessor
+{
+  ACE_ASSERT (index < this->maximum_);
+  IR::ConsumesDef ** const tmp = ACE_reinterpret_cast (IR::ConsumesDef ** ACE_CAST_CONST, this->buffer_);
+  return TAO_Object_Manager<IR::ConsumesDef,IR::ConsumesDef_var> (tmp + index, this->release_);
+}
+
+ACE_INLINE IR::ConsumesDef* *
+IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::get_buffer (CORBA::Boolean orphan)
+{
+  IR::ConsumesDef **result = 0;
+  if (orphan == 0)
   {
-    IR::ConsumesDef **result = 0;
-    if (orphan == 0)
+    // We retain ownership.
+    if (this->buffer_ == 0)
     {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (this->maximum_);
-        this->buffer_ = result;
-        this->release_ = 1;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (IR::ConsumesDef**, this->buffer_);
-      }
+      result = _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (this->maximum_);
+      this->buffer_ = result;
+      this->release_ = 1;
     }
-    else // if (orphan == 1)
+    else
     {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(IR::ConsumesDef**,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
+      result = ACE_reinterpret_cast (IR::ConsumesDef**, this->buffer_);
     }
-    return result;
   }
-  
-  ACE_INLINE const IR::ConsumesDef* *
-  IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::get_buffer (void) const
+  else // if (orphan == 1)
   {
-    return ACE_reinterpret_cast(const IR::ConsumesDef ** ACE_CAST_CONST, this->buffer_);
+    if (this->release_ != 0)
+    {
+      // We set the state back to default and relinquish
+      // ownership.
+      result = ACE_reinterpret_cast(IR::ConsumesDef**,this->buffer_);
+      this->maximum_ = 0;
+      this->length_ = 0;
+      this->buffer_ = 0;
+      this->release_ = 0;
+    }
   }
-  
-  
+  return result;
+}
+
+ACE_INLINE const IR::ConsumesDef* *
+IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::get_buffer (void) const
+{
+  return ACE_reinterpret_cast(const IR::ConsumesDef ** ACE_CAST_CONST, this->buffer_);
+}
+
+
 #endif /* end #if !defined */
 
 
@@ -2851,162 +2851,162 @@ IR::ConsumesDefSeq_out::operator[] (CORBA::ULong index)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CI_
 
-  ACE_INLINE IR::FactoryDef **
-  IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (CORBA::ULong nelems)
+ACE_INLINE IR::FactoryDef **
+IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (CORBA::ULong nelems)
+{
+  IR::FactoryDef **buf = 0;
+  
+  ACE_NEW_RETURN (buf, IR::FactoryDef*[nelems], 0);
+  
+  for (CORBA::ULong i = 0; i < nelems; i++)
+    {
+      buf[i] = IR::FactoryDef::_nil ();
+    }
+  
+  return buf;
+}
+
+ACE_INLINE void 
+IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::freebuf (IR::FactoryDef **buffer)
+{
+  if (buffer == 0)
+    return;
+  delete[] buffer;
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (void)
+{
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (CORBA::ULong maximum)
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (CORBA::ULong maximum,
+  CORBA::ULong length,
+  IR::FactoryDef* *value,
+  CORBA::Boolean release)
+: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+{
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq(const _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &rhs)
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
   {
-    IR::FactoryDef **buf = 0;
-    
-    ACE_NEW_RETURN (buf, IR::FactoryDef*[nelems], 0);
+    IR::FactoryDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (this->maximum_);
+    IR::FactoryDef ** const tmp2 = ACE_reinterpret_cast (IR::FactoryDef ** ACE_CAST_CONST, rhs.buffer_);
     
-    for (CORBA::ULong i = 0; i < nelems; i++)
+    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
       {
-        buf[i] = IR::FactoryDef::_nil ();
+        tmp1[i] = IR::FactoryDef::_duplicate (tmp2[i]);
       }
     
-    return buf;
-  }
-  
-  ACE_INLINE void 
-  IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::freebuf (IR::FactoryDef **buffer)
-  {
-    if (buffer == 0)
-      return;
-    delete[] buffer;
-  }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (void)
-  {
-  }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (CORBA::ULong maximum)
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (maximum))
-  {
+    this->buffer_ = tmp1;
   }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    IR::FactoryDef* *value,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+  else
   {
+    this->buffer_ = 0;
   }
+}
+
+ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &
+IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &rhs)
+{
+  if (this == &rhs)
+    return *this;
   
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq(const _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &rhs)
-    : TAO_Unbounded_Base_Sequence (rhs)
+  if (this->release_)
   {
-    if (rhs.buffer_ != 0)
+    IR::FactoryDef **tmp = ACE_reinterpret_cast (IR::FactoryDef **, this->buffer_);
+    
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      IR::FactoryDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (this->maximum_);
-      IR::FactoryDef ** const tmp2 = ACE_reinterpret_cast (IR::FactoryDef ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = IR::FactoryDef::_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
+      CORBA::release (tmp[i]);
+      tmp[i] = IR::FactoryDef::_nil ();
     }
-    else
+    if (this->maximum_ < rhs.maximum_)
     {
-      this->buffer_ = 0;
+      _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::freebuf (tmp);
+      this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (rhs.maximum_);
     }
   }
+  else
+    this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (rhs.maximum_);
   
-  ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &
-  IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &rhs)
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  IR::FactoryDef **tmp1 = ACE_reinterpret_cast (IR::FactoryDef **, this->buffer_);
+  IR::FactoryDef ** const tmp2 = ACE_reinterpret_cast (IR::FactoryDef ** ACE_CAST_CONST, rhs.buffer_);
+  
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
-      IR::FactoryDef **tmp = ACE_reinterpret_cast (IR::FactoryDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-      {
-        CORBA::release (tmp[i]);
-        tmp[i] = IR::FactoryDef::_nil ();
-      }
-      if (this->maximum_ < rhs.maximum_)
-      {
-        _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (rhs.maximum_);
-      }
+      tmp1[i] = IR::FactoryDef::_duplicate (tmp2[i]);
     }
-    else
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    IR::FactoryDef **tmp1 = ACE_reinterpret_cast (IR::FactoryDef **, this->buffer_);
-    IR::FactoryDef ** const tmp2 = ACE_reinterpret_cast (IR::FactoryDef ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      {
-        tmp1[i] = IR::FactoryDef::_duplicate (tmp2[i]);
-      }
-    
-    return *this;
-  }
   
-  ACE_INLINE TAO_Object_Manager<IR::FactoryDef,IR::FactoryDef_var>
-  IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::operator[] (CORBA::ULong index) const
-  // read-write accessor
-  {
-    ACE_ASSERT (index < this->maximum_);
-    IR::FactoryDef ** const tmp = ACE_reinterpret_cast (IR::FactoryDef ** ACE_CAST_CONST, this->buffer_);
-    return TAO_Object_Manager<IR::FactoryDef,IR::FactoryDef_var> (tmp + index, this->release_);
-  }
-  
-  ACE_INLINE IR::FactoryDef* *
-  IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::get_buffer (CORBA::Boolean orphan)
+  return *this;
+}
+
+ACE_INLINE TAO_Object_Manager<IR::FactoryDef,IR::FactoryDef_var>
+IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::operator[] (CORBA::ULong index) const
+// read-write accessor
+{
+  ACE_ASSERT (index < this->maximum_);
+  IR::FactoryDef ** const tmp = ACE_reinterpret_cast (IR::FactoryDef ** ACE_CAST_CONST, this->buffer_);
+  return TAO_Object_Manager<IR::FactoryDef,IR::FactoryDef_var> (tmp + index, this->release_);
+}
+
+ACE_INLINE IR::FactoryDef* *
+IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::get_buffer (CORBA::Boolean orphan)
+{
+  IR::FactoryDef **result = 0;
+  if (orphan == 0)
   {
-    IR::FactoryDef **result = 0;
-    if (orphan == 0)
+    // We retain ownership.
+    if (this->buffer_ == 0)
     {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (this->maximum_);
-        this->buffer_ = result;
-        this->release_ = 1;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (IR::FactoryDef**, this->buffer_);
-      }
+      result = _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (this->maximum_);
+      this->buffer_ = result;
+      this->release_ = 1;
     }
-    else // if (orphan == 1)
+    else
     {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(IR::FactoryDef**,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
+      result = ACE_reinterpret_cast (IR::FactoryDef**, this->buffer_);
     }
-    return result;
   }
-  
-  ACE_INLINE const IR::FactoryDef* *
-  IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::get_buffer (void) const
+  else // if (orphan == 1)
   {
-    return ACE_reinterpret_cast(const IR::FactoryDef ** ACE_CAST_CONST, this->buffer_);
+    if (this->release_ != 0)
+    {
+      // We set the state back to default and relinquish
+      // ownership.
+      result = ACE_reinterpret_cast(IR::FactoryDef**,this->buffer_);
+      this->maximum_ = 0;
+      this->length_ = 0;
+      this->buffer_ = 0;
+      this->release_ = 0;
+    }
   }
-  
-  
+  return result;
+}
+
+ACE_INLINE const IR::FactoryDef* *
+IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::get_buffer (void) const
+{
+  return ACE_reinterpret_cast(const IR::FactoryDef ** ACE_CAST_CONST, this->buffer_);
+}
+
+
 #endif /* end #if !defined */
 
 
@@ -3225,162 +3225,162 @@ IR::FactoryDefSeq_out::operator[] (CORBA::ULong index)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CI_
 
-  ACE_INLINE IR::FinderDef **
-  IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (CORBA::ULong nelems)
+ACE_INLINE IR::FinderDef **
+IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (CORBA::ULong nelems)
+{
+  IR::FinderDef **buf = 0;
+  
+  ACE_NEW_RETURN (buf, IR::FinderDef*[nelems], 0);
+  
+  for (CORBA::ULong i = 0; i < nelems; i++)
+    {
+      buf[i] = IR::FinderDef::_nil ();
+    }
+  
+  return buf;
+}
+
+ACE_INLINE void 
+IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::freebuf (IR::FinderDef **buffer)
+{
+  if (buffer == 0)
+    return;
+  delete[] buffer;
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (void)
+{
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (CORBA::ULong maximum)
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (CORBA::ULong maximum,
+  CORBA::ULong length,
+  IR::FinderDef* *value,
+  CORBA::Boolean release)
+: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+{
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq(const _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &rhs)
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
   {
-    IR::FinderDef **buf = 0;
-    
-    ACE_NEW_RETURN (buf, IR::FinderDef*[nelems], 0);
+    IR::FinderDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (this->maximum_);
+    IR::FinderDef ** const tmp2 = ACE_reinterpret_cast (IR::FinderDef ** ACE_CAST_CONST, rhs.buffer_);
     
-    for (CORBA::ULong i = 0; i < nelems; i++)
+    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
       {
-        buf[i] = IR::FinderDef::_nil ();
+        tmp1[i] = IR::FinderDef::_duplicate (tmp2[i]);
       }
     
-    return buf;
-  }
-  
-  ACE_INLINE void 
-  IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::freebuf (IR::FinderDef **buffer)
-  {
-    if (buffer == 0)
-      return;
-    delete[] buffer;
+    this->buffer_ = tmp1;
   }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (void)
-  {
-  }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (CORBA::ULong maximum)
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    IR::FinderDef* *value,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+  else
   {
+    this->buffer_ = 0;
   }
+}
+
+ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &
+IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &rhs)
+{
+  if (this == &rhs)
+    return *this;
   
-  ACE_INLINE
-  IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq(const _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &rhs)
-    : TAO_Unbounded_Base_Sequence (rhs)
+  if (this->release_)
   {
-    if (rhs.buffer_ != 0)
+    IR::FinderDef **tmp = ACE_reinterpret_cast (IR::FinderDef **, this->buffer_);
+    
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      IR::FinderDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (this->maximum_);
-      IR::FinderDef ** const tmp2 = ACE_reinterpret_cast (IR::FinderDef ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = IR::FinderDef::_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
+      CORBA::release (tmp[i]);
+      tmp[i] = IR::FinderDef::_nil ();
     }
-    else
+    if (this->maximum_ < rhs.maximum_)
     {
-      this->buffer_ = 0;
+      _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::freebuf (tmp);
+      this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (rhs.maximum_);
     }
   }
+  else
+    this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (rhs.maximum_);
   
-  ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &
-  IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &rhs)
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  IR::FinderDef **tmp1 = ACE_reinterpret_cast (IR::FinderDef **, this->buffer_);
+  IR::FinderDef ** const tmp2 = ACE_reinterpret_cast (IR::FinderDef ** ACE_CAST_CONST, rhs.buffer_);
+  
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
-      IR::FinderDef **tmp = ACE_reinterpret_cast (IR::FinderDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-      {
-        CORBA::release (tmp[i]);
-        tmp[i] = IR::FinderDef::_nil ();
-      }
-      if (this->maximum_ < rhs.maximum_)
-      {
-        _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (rhs.maximum_);
-      }
+      tmp1[i] = IR::FinderDef::_duplicate (tmp2[i]);
     }
-    else
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    IR::FinderDef **tmp1 = ACE_reinterpret_cast (IR::FinderDef **, this->buffer_);
-    IR::FinderDef ** const tmp2 = ACE_reinterpret_cast (IR::FinderDef ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      {
-        tmp1[i] = IR::FinderDef::_duplicate (tmp2[i]);
-      }
-    
-    return *this;
-  }
-  
-  ACE_INLINE TAO_Object_Manager<IR::FinderDef,IR::FinderDef_var>
-  IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::operator[] (CORBA::ULong index) const
-  // read-write accessor
-  {
-    ACE_ASSERT (index < this->maximum_);
-    IR::FinderDef ** const tmp = ACE_reinterpret_cast (IR::FinderDef ** ACE_CAST_CONST, this->buffer_);
-    return TAO_Object_Manager<IR::FinderDef,IR::FinderDef_var> (tmp + index, this->release_);
-  }
   
-  ACE_INLINE IR::FinderDef* *
-  IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::get_buffer (CORBA::Boolean orphan)
+  return *this;
+}
+
+ACE_INLINE TAO_Object_Manager<IR::FinderDef,IR::FinderDef_var>
+IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::operator[] (CORBA::ULong index) const
+// read-write accessor
+{
+  ACE_ASSERT (index < this->maximum_);
+  IR::FinderDef ** const tmp = ACE_reinterpret_cast (IR::FinderDef ** ACE_CAST_CONST, this->buffer_);
+  return TAO_Object_Manager<IR::FinderDef,IR::FinderDef_var> (tmp + index, this->release_);
+}
+
+ACE_INLINE IR::FinderDef* *
+IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::get_buffer (CORBA::Boolean orphan)
+{
+  IR::FinderDef **result = 0;
+  if (orphan == 0)
   {
-    IR::FinderDef **result = 0;
-    if (orphan == 0)
+    // We retain ownership.
+    if (this->buffer_ == 0)
     {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (this->maximum_);
-        this->buffer_ = result;
-        this->release_ = 1;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (IR::FinderDef**, this->buffer_);
-      }
+      result = _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (this->maximum_);
+      this->buffer_ = result;
+      this->release_ = 1;
     }
-    else // if (orphan == 1)
+    else
     {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(IR::FinderDef**,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
+      result = ACE_reinterpret_cast (IR::FinderDef**, this->buffer_);
     }
-    return result;
   }
-  
-  ACE_INLINE const IR::FinderDef* *
-  IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::get_buffer (void) const
+  else // if (orphan == 1)
   {
-    return ACE_reinterpret_cast(const IR::FinderDef ** ACE_CAST_CONST, this->buffer_);
+    if (this->release_ != 0)
+    {
+      // We set the state back to default and relinquish
+      // ownership.
+      result = ACE_reinterpret_cast(IR::FinderDef**,this->buffer_);
+      this->maximum_ = 0;
+      this->length_ = 0;
+      this->buffer_ = 0;
+      this->release_ = 0;
+    }
   }
-  
-  
+  return result;
+}
+
+ACE_INLINE const IR::FinderDef* *
+IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::get_buffer (void) const
+{
+  return ACE_reinterpret_cast(const IR::FinderDef ** ACE_CAST_CONST, this->buffer_);
+}
+
+
 #endif /* end #if !defined */
 
 
@@ -4039,176 +4039,176 @@ IR::UsesDescription_out::operator-> (void)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CI_
 
-  // = Static operations.
-  ACE_INLINE IR::ProvidesDescription *
-  IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (CORBA::ULong size)
-  // Allocate storage for the sequence.
-  {
-    IR::ProvidesDescription *retval = 0;
-    ACE_NEW_RETURN (retval, IR::ProvidesDescription[size], 0);
-    return retval;
-  }
-  
-  ACE_INLINE void IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::freebuf (IR::ProvidesDescription *buffer)
-  // Free the sequence.
-  {
-    delete [] buffer;
-  }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (void) // Default constructor.
-  {
-  }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    IR::ProvidesDescription *data,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-  {
-  }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (const _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &rhs)
-  // Copy constructor.
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    if (rhs.buffer_ != 0)
-    {
-      IR::ProvidesDescription *tmp1 = _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (this->maximum_);
-      IR::ProvidesDescription * const tmp2 = ACE_reinterpret_cast (IR::ProvidesDescription * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp1[i] = tmp2[i];
-      
-      this->buffer_ = tmp1;
-    }
-    else
-    {
-      this->buffer_ = 0;
-    }
-  }
-  
-  ACE_INLINE IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq &
-  IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::operator= (const _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &rhs)
-  // Assignment operator.
+// = Static operations.
+ACE_INLINE IR::ProvidesDescription *
+IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (CORBA::ULong size)
+// Allocate storage for the sequence.
+{
+  IR::ProvidesDescription *retval = 0;
+  ACE_NEW_RETURN (retval, IR::ProvidesDescription[size], 0);
+  return retval;
+}
+
+ACE_INLINE void IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::freebuf (IR::ProvidesDescription *buffer)
+// Free the sequence.
+{
+  delete [] buffer;
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (void) // Default constructor.
+{
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (CORBA::ULong maximum,
+  CORBA::ULong length,
+  IR::ProvidesDescription *data,
+  CORBA::Boolean release)
+: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+{
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (const _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &rhs)
+// Copy constructor.
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
   {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-      {
-        // free the old buffer
-        IR::ProvidesDescription *tmp = ACE_reinterpret_cast (IR::ProvidesDescription *, this->buffer_);
-        _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    IR::ProvidesDescription *tmp1 = ACE_reinterpret_cast (IR::ProvidesDescription *, this->buffer_);
+    IR::ProvidesDescription *tmp1 = _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (this->maximum_);
     IR::ProvidesDescription * const tmp2 = ACE_reinterpret_cast (IR::ProvidesDescription * ACE_CAST_CONST, rhs.buffer_);
     
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
     
-    return *this;
+    this->buffer_ = tmp1;
   }
-  
-  // = Accessors.
-  ACE_INLINE IR::ProvidesDescription &
-  IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::operator[] (CORBA::ULong i)
-  // operator []
+  else
   {
-    ACE_ASSERT (i < this->maximum_);
-    IR::ProvidesDescription* tmp = ACE_reinterpret_cast(IR::ProvidesDescription*,this->buffer_);
-    return tmp[i];
+    this->buffer_ = 0;
   }
+}
+
+ACE_INLINE IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq &
+IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::operator= (const _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &rhs)
+// Assignment operator.
+{
+  if (this == &rhs)
+    return *this;
   
-  ACE_INLINE const IR::ProvidesDescription &
-  IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::operator[] (CORBA::ULong i) const
-  // operator []
+  if (this->release_)
   {
-    ACE_ASSERT (i < this->maximum_);
-    IR::ProvidesDescription * const tmp = ACE_reinterpret_cast (IR::ProvidesDescription* ACE_CAST_CONST, this->buffer_);
-    return tmp[i];
+    if (this->maximum_ < rhs.maximum_)
+    {
+      // free the old buffer
+      IR::ProvidesDescription *tmp = ACE_reinterpret_cast (IR::ProvidesDescription *, this->buffer_);
+      _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::freebuf (tmp);
+      this->buffer_ = _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (rhs.maximum_);
+    }
   }
+  else
+    this->buffer_ = _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (rhs.maximum_);
+  
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  IR::ProvidesDescription *tmp1 = ACE_reinterpret_cast (IR::ProvidesDescription *, this->buffer_);
+  IR::ProvidesDescription * const tmp2 = ACE_reinterpret_cast (IR::ProvidesDescription * ACE_CAST_CONST, rhs.buffer_);
   
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    tmp1[i] = tmp2[i];
   
-  ACE_INLINE IR::ProvidesDescription *
-  IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::get_buffer (CORBA::Boolean orphan)
+  return *this;
+}
+
+// = Accessors.
+ACE_INLINE IR::ProvidesDescription &
+IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::operator[] (CORBA::ULong i)
+// operator []
+{
+  ACE_ASSERT (i < this->maximum_);
+  IR::ProvidesDescription* tmp = ACE_reinterpret_cast(IR::ProvidesDescription*,this->buffer_);
+  return tmp[i];
+}
+
+ACE_INLINE const IR::ProvidesDescription &
+IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::operator[] (CORBA::ULong i) const
+// operator []
+{
+  ACE_ASSERT (i < this->maximum_);
+  IR::ProvidesDescription * const tmp = ACE_reinterpret_cast (IR::ProvidesDescription* ACE_CAST_CONST, this->buffer_);
+  return tmp[i];
+}
+
+// Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+ACE_INLINE IR::ProvidesDescription *
+IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::get_buffer (CORBA::Boolean orphan)
+{
+  IR::ProvidesDescription *result = 0;
+  if (orphan == 0)
   {
-    IR::ProvidesDescription *result = 0;
-    if (orphan == 0)
+    // We retain ownership.
+    if (this->buffer_ == 0)
     {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (this->length_);
-        this->buffer_ = result;
-        this->release_ = 1;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (IR::ProvidesDescription*, this->buffer_);
-      }
+      result = _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (this->length_);
+      this->buffer_ = result;
+      this->release_ = 1;
     }
-    else // if (orphan == 1)
+    else
     {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(IR::ProvidesDescription*,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
+      result = ACE_reinterpret_cast (IR::ProvidesDescription*, this->buffer_);
     }
-    return result;
   }
-  
-  ACE_INLINE const IR::ProvidesDescription *
-  IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::get_buffer (void) const
+  else // if (orphan == 1)
   {
-    return ACE_reinterpret_cast(const IR::ProvidesDescription * ACE_CAST_CONST, this->buffer_);
-  }
-  
-  ACE_INLINE void
-  IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::replace (CORBA::ULong max,
-  CORBA::ULong length,
-  IR::ProvidesDescription *data,
-  CORBA::Boolean release)
-  {
-    this->maximum_ = max;
-    this->length_ = length;
-    if (this->buffer_ && this->release_ == 1)
+    if (this->release_ != 0)
     {
-      IR::ProvidesDescription *tmp = ACE_reinterpret_cast(IR::ProvidesDescription*,this->buffer_);
-      _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::freebuf (tmp);
+      // We set the state back to default and relinquish
+      // ownership.
+      result = ACE_reinterpret_cast(IR::ProvidesDescription*,this->buffer_);
+      this->maximum_ = 0;
+      this->length_ = 0;
+      this->buffer_ = 0;
+      this->release_ = 0;
     }
-    this->buffer_ = data;
-    this->release_ = release;
   }
-  
+  return result;
+}
+
+ACE_INLINE const IR::ProvidesDescription *
+IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::get_buffer (void) const
+{
+  return ACE_reinterpret_cast(const IR::ProvidesDescription * ACE_CAST_CONST, this->buffer_);
+}
+
+ACE_INLINE void
+IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::replace (CORBA::ULong max,
+CORBA::ULong length,
+IR::ProvidesDescription *data,
+CORBA::Boolean release)
+{
+  this->maximum_ = max;
+  this->length_ = length;
+  if (this->buffer_ && this->release_ == 1)
+  {
+    IR::ProvidesDescription *tmp = ACE_reinterpret_cast(IR::ProvidesDescription*,this->buffer_);
+    _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::freebuf (tmp);
+  }
+  this->buffer_ = data;
+  this->release_ = release;
+}
+
 #endif /* end #if !defined */
 
 
@@ -4433,176 +4433,176 @@ IR::ProvidesDescSeq_out::operator[] (CORBA::ULong index)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CI_
 
-  // = Static operations.
-  ACE_INLINE IR::UsesDescription *
-  IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (CORBA::ULong size)
-  // Allocate storage for the sequence.
-  {
-    IR::UsesDescription *retval = 0;
-    ACE_NEW_RETURN (retval, IR::UsesDescription[size], 0);
-    return retval;
-  }
-  
-  ACE_INLINE void IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::freebuf (IR::UsesDescription *buffer)
-  // Free the sequence.
-  {
-    delete [] buffer;
-  }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (void) // Default constructor.
-  {
-  }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    IR::UsesDescription *data,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-  {
-  }
-  
-  ACE_INLINE
-  IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (const _TAO_Unbounded_Sequence_IR_UsesDescSeq &rhs)
-  // Copy constructor.
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    if (rhs.buffer_ != 0)
-    {
-      IR::UsesDescription *tmp1 = _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (this->maximum_);
-      IR::UsesDescription * const tmp2 = ACE_reinterpret_cast (IR::UsesDescription * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp1[i] = tmp2[i];
-      
-      this->buffer_ = tmp1;
-    }
-    else
-    {
-      this->buffer_ = 0;
-    }
-  }
-  
-  ACE_INLINE IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq &
-  IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::operator= (const _TAO_Unbounded_Sequence_IR_UsesDescSeq &rhs)
-  // Assignment operator.
+// = Static operations.
+ACE_INLINE IR::UsesDescription *
+IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (CORBA::ULong size)
+// Allocate storage for the sequence.
+{
+  IR::UsesDescription *retval = 0;
+  ACE_NEW_RETURN (retval, IR::UsesDescription[size], 0);
+  return retval;
+}
+
+ACE_INLINE void IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::freebuf (IR::UsesDescription *buffer)
+// Free the sequence.
+{
+  delete [] buffer;
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (void) // Default constructor.
+{
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (CORBA::ULong maximum,
+  CORBA::ULong length,
+  IR::UsesDescription *data,
+  CORBA::Boolean release)
+: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+{
+}
+
+ACE_INLINE
+IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (const _TAO_Unbounded_Sequence_IR_UsesDescSeq &rhs)
+// Copy constructor.
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
   {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-      {
-        // free the old buffer
-        IR::UsesDescription *tmp = ACE_reinterpret_cast (IR::UsesDescription *, this->buffer_);
-        _TAO_Unbounded_Sequence_IR_UsesDescSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    IR::UsesDescription *tmp1 = ACE_reinterpret_cast (IR::UsesDescription *, this->buffer_);
+    IR::UsesDescription *tmp1 = _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (this->maximum_);
     IR::UsesDescription * const tmp2 = ACE_reinterpret_cast (IR::UsesDescription * ACE_CAST_CONST, rhs.buffer_);
     
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
     
-    return *this;
+    this->buffer_ = tmp1;
   }
-  
-  // = Accessors.
-  ACE_INLINE IR::UsesDescription &
-  IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::operator[] (CORBA::ULong i)
-  // operator []
+  else
   {
-    ACE_ASSERT (i < this->maximum_);
-    IR::UsesDescription* tmp = ACE_reinterpret_cast(IR::UsesDescription*,this->buffer_);
-    return tmp[i];
+    this->buffer_ = 0;
   }
+}
+
+ACE_INLINE IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq &
+IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::operator= (const _TAO_Unbounded_Sequence_IR_UsesDescSeq &rhs)
+// Assignment operator.
+{
+  if (this == &rhs)
+    return *this;
   
-  ACE_INLINE const IR::UsesDescription &
-  IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::operator[] (CORBA::ULong i) const
-  // operator []
+  if (this->release_)
   {
-    ACE_ASSERT (i < this->maximum_);
-    IR::UsesDescription * const tmp = ACE_reinterpret_cast (IR::UsesDescription* ACE_CAST_CONST, this->buffer_);
-    return tmp[i];
+    if (this->maximum_ < rhs.maximum_)
+    {
+      // free the old buffer
+      IR::UsesDescription *tmp = ACE_reinterpret_cast (IR::UsesDescription *, this->buffer_);
+      _TAO_Unbounded_Sequence_IR_UsesDescSeq::freebuf (tmp);
+      this->buffer_ = _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (rhs.maximum_);
+    }
   }
+  else
+    this->buffer_ = _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (rhs.maximum_);
+  
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  IR::UsesDescription *tmp1 = ACE_reinterpret_cast (IR::UsesDescription *, this->buffer_);
+  IR::UsesDescription * const tmp2 = ACE_reinterpret_cast (IR::UsesDescription * ACE_CAST_CONST, rhs.buffer_);
   
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    tmp1[i] = tmp2[i];
   
-  ACE_INLINE IR::UsesDescription *
-  IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::get_buffer (CORBA::Boolean orphan)
+  return *this;
+}
+
+// = Accessors.
+ACE_INLINE IR::UsesDescription &
+IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::operator[] (CORBA::ULong i)
+// operator []
+{
+  ACE_ASSERT (i < this->maximum_);
+  IR::UsesDescription* tmp = ACE_reinterpret_cast(IR::UsesDescription*,this->buffer_);
+  return tmp[i];
+}
+
+ACE_INLINE const IR::UsesDescription &
+IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::operator[] (CORBA::ULong i) const
+// operator []
+{
+  ACE_ASSERT (i < this->maximum_);
+  IR::UsesDescription * const tmp = ACE_reinterpret_cast (IR::UsesDescription* ACE_CAST_CONST, this->buffer_);
+  return tmp[i];
+}
+
+// Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+ACE_INLINE IR::UsesDescription *
+IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::get_buffer (CORBA::Boolean orphan)
+{
+  IR::UsesDescription *result = 0;
+  if (orphan == 0)
   {
-    IR::UsesDescription *result = 0;
-    if (orphan == 0)
+    // We retain ownership.
+    if (this->buffer_ == 0)
     {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (this->length_);
-        this->buffer_ = result;
-        this->release_ = 1;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (IR::UsesDescription*, this->buffer_);
-      }
+      result = _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (this->length_);
+      this->buffer_ = result;
+      this->release_ = 1;
     }
-    else // if (orphan == 1)
+    else
     {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(IR::UsesDescription*,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
+      result = ACE_reinterpret_cast (IR::UsesDescription*, this->buffer_);
     }
-    return result;
   }
-  
-  ACE_INLINE const IR::UsesDescription *
-  IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::get_buffer (void) const
+  else // if (orphan == 1)
   {
-    return ACE_reinterpret_cast(const IR::UsesDescription * ACE_CAST_CONST, this->buffer_);
-  }
-  
-  ACE_INLINE void
-  IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::replace (CORBA::ULong max,
-  CORBA::ULong length,
-  IR::UsesDescription *data,
-  CORBA::Boolean release)
-  {
-    this->maximum_ = max;
-    this->length_ = length;
-    if (this->buffer_ && this->release_ == 1)
+    if (this->release_ != 0)
     {
-      IR::UsesDescription *tmp = ACE_reinterpret_cast(IR::UsesDescription*,this->buffer_);
-      _TAO_Unbounded_Sequence_IR_UsesDescSeq::freebuf (tmp);
+      // We set the state back to default and relinquish
+      // ownership.
+      result = ACE_reinterpret_cast(IR::UsesDescription*,this->buffer_);
+      this->maximum_ = 0;
+      this->length_ = 0;
+      this->buffer_ = 0;
+      this->release_ = 0;
     }
-    this->buffer_ = data;
-    this->release_ = release;
   }
-  
+  return result;
+}
+
+ACE_INLINE const IR::UsesDescription *
+IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::get_buffer (void) const
+{
+  return ACE_reinterpret_cast(const IR::UsesDescription * ACE_CAST_CONST, this->buffer_);
+}
+
+ACE_INLINE void
+IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::replace (CORBA::ULong max,
+CORBA::ULong length,
+IR::UsesDescription *data,
+CORBA::Boolean release)
+{
+  this->maximum_ = max;
+  this->length_ = length;
+  if (this->buffer_ && this->release_ == 1)
+  {
+    IR::UsesDescription *tmp = ACE_reinterpret_cast(IR::UsesDescription*,this->buffer_);
+    _TAO_Unbounded_Sequence_IR_UsesDescSeq::freebuf (tmp);
+  }
+  this->buffer_ = data;
+  this->release_ = release;
+}
+
 #endif /* end #if !defined */
 
 
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
index 898797beb30..763979d1c4b 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
@@ -20,10 +20,15 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "IFR_ExtendedC.h"
-#include "tao/ClientRequestInfo.h"
+
+#include "tao/Stub.h"
+#include "tao/Invocation.h"
+#include "tao/PortableInterceptor.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
+#include "tao/ClientRequestInfo.h"
+#include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 #if defined (__BORLANDC__)
@@ -125,7 +130,7 @@ CORBA_FixedDef_var::operator const ::CORBA_FixedDef_ptr &() const // cast
   return this->ptr_;
 }
 
-CORBA_FixedDef_var::operator ::CORBA_FixedDef_ptr &() // cast 
+CORBA_FixedDef_var::operator ::CORBA_FixedDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -201,7 +206,7 @@ CORBA_FixedDef_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class CORBA_FixedDef_out
+// Operations for class CORBA_FixedDef_out
 // *************************************************************
 
 CORBA_FixedDef_out::CORBA_FixedDef_out (CORBA_FixedDef_ptr &p)
@@ -267,24 +272,24 @@ public:
   TAO_ClientRequestInfo_CORBA_FixedDef_digits_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -301,7 +306,7 @@ private:
 TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::TAO_ClientRequestInfo_CORBA_FixedDef_digits_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -314,7 +319,7 @@ TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::arguments (CORBA::Environment &
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -326,12 +331,12 @@ TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::exceptions (CORBA::Environment
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -340,17 +345,17 @@ TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::result (CORBA::Environment &ACE
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::result (CORBA::UShort result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -361,24 +366,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::UShort & digits,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -388,14 +393,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_FixedDef_digits_set &);
 
   const CORBA::UShort & digits_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::TAO_ClientRequestInfo_CORBA_FixedDef_digits_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA::UShort & digits,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     digits_ (digits)
@@ -409,14 +414,16 @@ TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::arguments (CORBA::Environment &
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_digits = parameter_list->length ();
-  parameter_list->length (length_digits + 1);
-  (*parameter_list)[length_digits].argument <<= digits_;
-  (*parameter_list)[length_digits].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= digits_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -428,12 +435,12 @@ TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::exceptions (CORBA::Environment
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -442,7 +449,7 @@ TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::result (CORBA::Environment &ACE
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -452,24 +459,24 @@ public:
   TAO_ClientRequestInfo_CORBA_FixedDef_scale_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -486,7 +493,7 @@ private:
 TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::TAO_ClientRequestInfo_CORBA_FixedDef_scale_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -499,7 +506,7 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::arguments (CORBA::Environment &A
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -511,12 +518,12 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::exceptions (CORBA::Environment &
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -525,17 +532,17 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::result (CORBA::Environment &ACE_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::result (CORBA::Short result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -546,24 +553,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::Short & scale,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -573,14 +580,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_FixedDef_scale_set &);
 
   const CORBA::Short & scale_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::TAO_ClientRequestInfo_CORBA_FixedDef_scale_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA::Short & scale,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     scale_ (scale)
@@ -594,14 +601,16 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::arguments (CORBA::Environment &A
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_scale = parameter_list->length ();
-  parameter_list->length (length_scale + 1);
-  (*parameter_list)[length_scale].argument <<= scale_;
-  (*parameter_list)[length_scale].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= scale_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -613,12 +622,12 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::exceptions (CORBA::Environment &
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -627,14 +636,14 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::result (CORBA::Environment &ACE_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 _TAO_CORBA_FixedDef_Proxy_Impl::_TAO_CORBA_FixedDef_Proxy_Impl (void)
@@ -653,15 +662,15 @@ CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA::UShort _tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_digits",
@@ -670,17 +679,21 @@ CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_FixedDef_digits_get ri (
         &_tao_call,
@@ -688,43 +701,66 @@ CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN  (_tao_retval);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_retval)
@@ -734,73 +770,54 @@ CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA::UShort  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA::UShort _tao_retval_info = _tao_retval;
+          ri.result (_tao_retval_info);
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN  (_tao_retval);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_retval;
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN  (_tao_retval);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_retval;
 }
 
 void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
@@ -812,15 +829,15 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_digits",
@@ -829,17 +846,21 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_FixedDef_digits_set ri (
         &_tao_call,
@@ -848,31 +869,40 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << digits)
@@ -880,79 +910,76 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
@@ -963,15 +990,15 @@ CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA::Short _tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_scale",
@@ -980,17 +1007,21 @@ CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_FixedDef_scale_get ri (
         &_tao_call,
@@ -998,43 +1029,66 @@ CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN  (_tao_retval);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_retval)
@@ -1044,73 +1098,54 @@ CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA::Short  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA::Short _tao_retval_info = _tao_retval;
+          ri.result (_tao_retval_info);
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN  (_tao_retval);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_retval;
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN  (_tao_retval);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_retval;
 }
 
 void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
@@ -1122,15 +1157,15 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_scale",
@@ -1139,17 +1174,21 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_FixedDef_scale_set ri (
         &_tao_call,
@@ -1158,31 +1197,40 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << scale)
@@ -1190,84 +1238,81 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -1337,13 +1382,13 @@ CORBA_FixedDef::CORBA_FixedDef_setup_collocation (int collocated)
   else
     this->the_TAO_CORBA_FixedDef_Proxy_Broker_ =
       ::_TAO_CORBA_FixedDef_Remote_Proxy_Broker::the_TAO_CORBA_FixedDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_IDLType_setup_collocation (collocated);
 }
 
-void CORBA_FixedDef::_tao_any_destructor (void *x)
+void CORBA_FixedDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_FixedDef *tmp = ACE_static_cast (CORBA_FixedDef*,x);
+  CORBA_FixedDef *tmp = ACE_static_cast (CORBA_FixedDef*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -1390,14 +1435,14 @@ CORBA_FixedDef_ptr CORBA_FixedDef::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           CORBA_FixedDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::CORBA_FixedDef (stub, 0, obj->_servant ()), CORBA_FixedDef::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -1467,7 +1512,7 @@ void *CORBA_FixedDef::_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;
@@ -1485,10 +1530,10 @@ CORBA::UShort CORBA_FixedDef::digits (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_FixedDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_FixedDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.digits (
       this,
       ACE_TRY_ENV
@@ -1503,10 +1548,10 @@ void CORBA_FixedDef::digits (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_FixedDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_FixedDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.digits (
       this,
       digits,
@@ -1521,10 +1566,10 @@ CORBA::Short CORBA_FixedDef::scale (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_FixedDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_FixedDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.scale (
       this,
       ACE_TRY_ENV
@@ -1539,10 +1584,10 @@ void CORBA_FixedDef::scale (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_FixedDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_FixedDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.scale (
       this,
       scale,
@@ -1550,60 +1595,61 @@ void CORBA_FixedDef::scale (
     );
 }
 
-void CORBA_ValueMember::_tao_any_destructor (void *x)
+
+void CORBA_ValueMember::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_ValueMember *tmp = ACE_static_cast (CORBA_ValueMember*,x);
+  CORBA_ValueMember *tmp = ACE_static_cast (CORBA_ValueMember*, _tao_void_pointer);
   delete tmp;
 }
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_VALUEMEMBERSEQ_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_VALUEMEMBERSEQ_CS_
 
-  void
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA_ValueMember* tmp = 0;
-    tmp = _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA_ValueMember *old = ACE_reinterpret_cast (CORBA_ValueMember *,this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-      
-      if (this->release_)
-        _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::freebuf (old);
-      
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    
-    CORBA_ValueMember *tmp = ACE_reinterpret_cast (CORBA_ValueMember *,this->buffer_);
-    
-    _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  } 
-  
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::~_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (void) // Dtor.
+void
+_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::_allocate_buffer (CORBA::ULong length)
+{
+  CORBA_ValueMember* tmp = 0;
+  tmp = _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::allocbuf (length);
+
+  if (this->buffer_ != 0)
   {
-    this->_deallocate_buffer ();
+    CORBA_ValueMember *old = ACE_reinterpret_cast (CORBA_ValueMember *,this->buffer_);
+
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
+      tmp[i] = old[i];
+
+    if (this->release_)
+      _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::freebuf (old);
+
   }
-  
-  
+  this->buffer_ = tmp;
+}
+
+void
+_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    return;
+
+  CORBA_ValueMember *tmp = ACE_reinterpret_cast (CORBA_ValueMember *,this->buffer_);
+
+  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::freebuf (tmp);
+  this->buffer_ = 0;
+}
+
+_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::~_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (void) // Dtor.
+{
+  this->_deallocate_buffer ();
+}
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_VALUEMEMBERSEQ_CS_)
 #define _CORBA_VALUEMEMBERSEQ_CS_
@@ -1615,37 +1661,37 @@ void CORBA_ValueMember::_tao_any_destructor (void *x)
 CORBA_ValueMemberSeq::CORBA_ValueMemberSeq (void)
 {}
 CORBA_ValueMemberSeq::CORBA_ValueMemberSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq
+_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_ValueMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Sequence<CORBA_ValueMember>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 CORBA_ValueMemberSeq::CORBA_ValueMemberSeq (CORBA::ULong max, CORBA::ULong length, CORBA_ValueMember *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq
+_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_ValueMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Sequence<CORBA_ValueMember>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 CORBA_ValueMemberSeq::CORBA_ValueMemberSeq (const CORBA_ValueMemberSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq
+_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_ValueMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+TAO_Unbounded_Sequence<CORBA_ValueMember>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 CORBA_ValueMemberSeq::~CORBA_ValueMemberSeq (void) // dtor
 {}
-void CORBA_ValueMemberSeq::_tao_any_destructor (void *x)
+void CORBA_ValueMemberSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_ValueMemberSeq *tmp = ACE_static_cast (CORBA_ValueMemberSeq*,x);
+  CORBA_ValueMemberSeq *tmp = ACE_static_cast (CORBA_ValueMemberSeq*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -1743,7 +1789,7 @@ CORBA_ValueMemberDef_var::operator const ::CORBA_ValueMemberDef_ptr &() const //
   return this->ptr_;
 }
 
-CORBA_ValueMemberDef_var::operator ::CORBA_ValueMemberDef_ptr &() // cast 
+CORBA_ValueMemberDef_var::operator ::CORBA_ValueMemberDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1819,7 +1865,7 @@ CORBA_ValueMemberDef_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class CORBA_ValueMemberDef_out
+// Operations for class CORBA_ValueMemberDef_out
 // *************************************************************
 
 CORBA_ValueMemberDef_out::CORBA_ValueMemberDef_out (CORBA_ValueMemberDef_ptr &p)
@@ -1885,24 +1931,24 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -1919,7 +1965,7 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -1932,7 +1978,7 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::arguments (CORBA::Environme
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -1944,12 +1990,12 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::exceptions (CORBA::Environm
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1958,17 +2004,17 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::result (CORBA::Environment
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::result (CORBA::TypeCode_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -1978,24 +2024,24 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -2012,7 +2058,7 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -2025,7 +2071,7 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::arguments (CORBA::Envir
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -2037,12 +2083,12 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::exceptions (CORBA::Envi
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -2051,17 +2097,17 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::result (CORBA::Environm
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::result (CORBA_IDLType_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -2072,24 +2118,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -2099,14 +2145,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set &);
 
   CORBA_IDLType_ptr type_def_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     CORBA_IDLType_ptr type_def,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     type_def_ (type_def)
@@ -2120,15 +2166,16 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::arguments (CORBA::Envir
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_type_def = parameter_list->length ();
-  parameter_list->length (length_type_def + 1);
-  (*parameter_list)[length_type_def].argument <<=  this->type_def_;
-  
-  (*parameter_list)[length_type_def].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<=  this->type_def_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -2140,12 +2187,12 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::exceptions (CORBA::Envi
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -2154,7 +2201,7 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::result (CORBA::Environm
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -2164,24 +2211,24 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -2198,7 +2245,7 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -2211,7 +2258,7 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::arguments (CORBA::Environ
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -2223,12 +2270,12 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::exceptions (CORBA::Enviro
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -2237,17 +2284,17 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::result (CORBA::Environmen
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::result (CORBA::Visibility result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -2258,24 +2305,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::Visibility & access,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -2285,14 +2332,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set &);
 
   const CORBA::Visibility & access_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA::Visibility & access,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     access_ (access)
@@ -2306,14 +2353,16 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::arguments (CORBA::Environ
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_access = parameter_list->length ();
-  parameter_list->length (length_access + 1);
-  (*parameter_list)[length_access].argument <<= access_;
-  (*parameter_list)[length_access].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= access_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -2325,12 +2374,12 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::exceptions (CORBA::Enviro
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -2339,14 +2388,14 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::result (CORBA::Environmen
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 _TAO_CORBA_ValueMemberDef_Proxy_Impl::_TAO_CORBA_ValueMemberDef_Proxy_Impl (void)
@@ -2365,16 +2414,16 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
   CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_type",
@@ -2383,17 +2432,21 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get ri (
         &_tao_call,
@@ -2401,43 +2454,66 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -2447,74 +2523,55 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
@@ -2525,16 +2582,16 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_IDLType_ptr _tao_retval = CORBA_IDLType::_nil ();
   CORBA_IDLType_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_type_def",
@@ -2543,17 +2600,21 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get ri (
         &_tao_call,
@@ -2561,43 +2622,66 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -2607,74 +2691,55 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
@@ -2686,15 +2751,15 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_type_def",
@@ -2703,17 +2768,21 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set ri (
         &_tao_call,
@@ -2722,31 +2791,40 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << type_def)
@@ -2754,79 +2832,76 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
@@ -2837,15 +2912,15 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA::Visibility _tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_access",
@@ -2854,17 +2929,21 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get ri (
         &_tao_call,
@@ -2872,43 +2951,66 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN  (_tao_retval);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_retval)
@@ -2918,73 +3020,54 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA::Visibility  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA::Visibility _tao_retval_info = _tao_retval;
+          ri.result (_tao_retval_info);
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN  (_tao_retval);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_retval;
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN  (_tao_retval);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_retval;
 }
 
 void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
@@ -2996,15 +3079,15 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_access",
@@ -3013,17 +3096,21 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set ri (
         &_tao_call,
@@ -3032,31 +3119,40 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << access)
@@ -3064,84 +3160,81 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -3211,13 +3304,13 @@ CORBA_ValueMemberDef::CORBA_ValueMemberDef_setup_collocation (int collocated)
   else
     this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_ =
       ::_TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker::the_TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_Contained_setup_collocation (collocated);
 }
 
-void CORBA_ValueMemberDef::_tao_any_destructor (void *x)
+void CORBA_ValueMemberDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_ValueMemberDef *tmp = ACE_static_cast (CORBA_ValueMemberDef*,x);
+  CORBA_ValueMemberDef *tmp = ACE_static_cast (CORBA_ValueMemberDef*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -3264,14 +3357,14 @@ CORBA_ValueMemberDef_ptr CORBA_ValueMemberDef::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           CORBA_ValueMemberDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::CORBA_ValueMemberDef (stub, 0, obj->_servant ()), CORBA_ValueMemberDef::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -3341,7 +3434,7 @@ void *CORBA_ValueMemberDef::_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;
@@ -3359,10 +3452,10 @@ CORBA::TypeCode_ptr CORBA_ValueMemberDef::type (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.type (
       this,
       ACE_TRY_ENV
@@ -3376,10 +3469,10 @@ CORBA_IDLType_ptr CORBA_ValueMemberDef::type_def (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.type_def (
       this,
       ACE_TRY_ENV
@@ -3394,10 +3487,10 @@ void CORBA_ValueMemberDef::type_def (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.type_def (
       this,
       type_def,
@@ -3412,10 +3505,10 @@ CORBA::Visibility CORBA_ValueMemberDef::access (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.access (
       this,
       ACE_TRY_ENV
@@ -3430,10 +3523,10 @@ void CORBA_ValueMemberDef::access (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.access (
       this,
       access,
@@ -3532,7 +3625,7 @@ CORBA_ValueDef_var::operator const ::CORBA_ValueDef_ptr &() const // cast
   return this->ptr_;
 }
 
-CORBA_ValueDef_var::operator ::CORBA_ValueDef_ptr &() // cast 
+CORBA_ValueDef_var::operator ::CORBA_ValueDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -3608,7 +3701,7 @@ CORBA_ValueDef_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class CORBA_ValueDef_out
+// Operations for class CORBA_ValueDef_out
 // *************************************************************
 
 CORBA_ValueDef_out::CORBA_ValueDef_out (CORBA_ValueDef_ptr &p)
@@ -3674,24 +3767,24 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -3708,7 +3801,7 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -3721,7 +3814,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::arguments (CORBA:
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -3733,12 +3826,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::exceptions (CORBA
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -3747,17 +3840,17 @@ TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (CORBA::En
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (CORBA_InterfaceDefSeq * result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -3768,24 +3861,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA_InterfaceDefSeq & supported_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -3795,14 +3888,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set &);
 
   const CORBA_InterfaceDefSeq & supported_interfaces_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA_InterfaceDefSeq & supported_interfaces,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     supported_interfaces_ (supported_interfaces)
@@ -3816,15 +3909,16 @@ TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::arguments (CORBA:
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_supported_interfaces = parameter_list->length ();
-  parameter_list->length (length_supported_interfaces + 1);
-  (*parameter_list)[length_supported_interfaces].argument <<=  this->supported_interfaces_;
-  
-  (*parameter_list)[length_supported_interfaces].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<=  this->supported_interfaces_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -3836,12 +3930,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::exceptions (CORBA
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -3850,7 +3944,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::result (CORBA::En
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -3860,24 +3954,24 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -3894,7 +3988,7 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -3907,7 +4001,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::arguments (CORBA::Environ
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -3919,12 +4013,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::exceptions (CORBA::Enviro
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -3933,17 +4027,17 @@ TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::result (CORBA::Environmen
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::result (CORBA_InitializerSeq * result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -3954,24 +4048,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -3981,14 +4075,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set &);
 
   const CORBA_InitializerSeq & initializers_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     initializers_ (initializers)
@@ -4002,15 +4096,16 @@ TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::arguments (CORBA::Environ
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_initializers = parameter_list->length ();
-  parameter_list->length (length_initializers + 1);
-  (*parameter_list)[length_initializers].argument <<=  this->initializers_;
-  
-  (*parameter_list)[length_initializers].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<=  this->initializers_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -4022,12 +4117,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::exceptions (CORBA::Enviro
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -4036,7 +4131,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::result (CORBA::Environmen
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -4046,24 +4141,24 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -4080,7 +4175,7 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -4093,7 +4188,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::arguments (CORBA::Environme
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -4105,12 +4200,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::exceptions (CORBA::Environm
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -4119,17 +4214,17 @@ TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::result (CORBA::Environment
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::result (CORBA_ValueDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -4140,24 +4235,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA_ValueDef_ptr base_value,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -4167,14 +4262,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set &);
 
   CORBA_ValueDef_ptr base_value_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     CORBA_ValueDef_ptr base_value,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     base_value_ (base_value)
@@ -4188,15 +4283,16 @@ TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::arguments (CORBA::Environme
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_base_value = parameter_list->length ();
-  parameter_list->length (length_base_value + 1);
-  (*parameter_list)[length_base_value].argument <<=  this->base_value_;
-  
-  (*parameter_list)[length_base_value].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<=  this->base_value_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -4208,12 +4304,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::exceptions (CORBA::Environm
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -4222,7 +4318,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::result (CORBA::Environment
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -4232,24 +4328,24 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -4266,7 +4362,7 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -4279,7 +4375,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::arguments (CORBA:
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -4291,12 +4387,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::exceptions (CORBA
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -4305,17 +4401,17 @@ TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (CORBA::En
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (CORBA_ValueDefSeq * result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -4326,24 +4422,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA_ValueDefSeq & abstract_base_values,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -4353,14 +4449,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set &);
 
   const CORBA_ValueDefSeq & abstract_base_values_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA_ValueDefSeq & abstract_base_values,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     abstract_base_values_ (abstract_base_values)
@@ -4374,15 +4470,16 @@ TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::arguments (CORBA:
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_abstract_base_values = parameter_list->length ();
-  parameter_list->length (length_abstract_base_values + 1);
-  (*parameter_list)[length_abstract_base_values].argument <<=  this->abstract_base_values_;
-  
-  (*parameter_list)[length_abstract_base_values].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<=  this->abstract_base_values_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -4394,12 +4491,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::exceptions (CORBA
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -4408,7 +4505,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::result (CORBA::En
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -4418,24 +4515,24 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -4452,7 +4549,7 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -4465,7 +4562,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::arguments (CORBA::Environm
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -4477,12 +4574,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::exceptions (CORBA::Environ
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -4491,17 +4588,17 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::result (CORBA::Environment
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= CORBA::Any::from_boolean (this->_result);
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::result (CORBA::Boolean result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -4512,24 +4609,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::Boolean & is_abstract,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -4539,14 +4636,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set &);
 
   const CORBA::Boolean & is_abstract_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA::Boolean & is_abstract,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     is_abstract_ (is_abstract)
@@ -4560,14 +4657,16 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::arguments (CORBA::Environm
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_is_abstract = parameter_list->length ();
-  parameter_list->length (length_is_abstract + 1);
-  (*parameter_list)[length_is_abstract].argument <<= CORBA::Any::from_boolean (this->is_abstract_);
-  (*parameter_list)[length_is_abstract].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_abstract_);
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -4579,12 +4678,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::exceptions (CORBA::Environ
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -4593,7 +4692,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::result (CORBA::Environment
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -4603,24 +4702,24 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -4637,7 +4736,7 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -4650,7 +4749,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::arguments (CORBA::Environmen
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -4662,12 +4761,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::exceptions (CORBA::Environme
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -4676,17 +4775,17 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::result (CORBA::Environment &
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= CORBA::Any::from_boolean (this->_result);
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::result (CORBA::Boolean result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -4697,24 +4796,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::Boolean & is_custom,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -4724,14 +4823,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set &);
 
   const CORBA::Boolean & is_custom_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA::Boolean & is_custom,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     is_custom_ (is_custom)
@@ -4745,14 +4844,16 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::arguments (CORBA::Environmen
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_is_custom = parameter_list->length ();
-  parameter_list->length (length_is_custom + 1);
-  (*parameter_list)[length_is_custom].argument <<= CORBA::Any::from_boolean (this->is_custom_);
-  (*parameter_list)[length_is_custom].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_custom_);
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -4764,12 +4865,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::exceptions (CORBA::Environme
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -4778,7 +4879,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::result (CORBA::Environment &
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -4788,24 +4889,24 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -4822,7 +4923,7 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -4835,7 +4936,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::arguments (CORBA::Envir
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -4847,12 +4948,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::exceptions (CORBA::Envi
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -4861,17 +4962,17 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::result (CORBA::Environm
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= CORBA::Any::from_boolean (this->_result);
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::result (CORBA::Boolean result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -4882,24 +4983,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::Boolean & is_truncatable,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -4909,14 +5010,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set &);
 
   const CORBA::Boolean & is_truncatable_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA::Boolean & is_truncatable,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     is_truncatable_ (is_truncatable)
@@ -4930,14 +5031,16 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::arguments (CORBA::Envir
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_is_truncatable = parameter_list->length ();
-  parameter_list->length (length_is_truncatable + 1);
-  (*parameter_list)[length_is_truncatable].argument <<= CORBA::Any::from_boolean (this->is_truncatable_);
-  (*parameter_list)[length_is_truncatable].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_truncatable_);
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -4949,12 +5052,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::exceptions (CORBA::Envi
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -4963,7 +5066,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::result (CORBA::Environm
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -4974,24 +5077,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -5010,7 +5113,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_a::TAO_ClientRequestInfo_CORBA_ValueDef_
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const char * id,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id)
@@ -5024,14 +5127,16 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_a::arguments (CORBA::Environment &ACE_TR
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -5043,12 +5148,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_a::exceptions (CORBA::Environment &ACE_T
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -5057,17 +5162,17 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_a::result (CORBA::Environment &ACE_TRY_E
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= CORBA::Any::from_boolean (this->_result);
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ValueDef_is_a::result (CORBA::Boolean result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -5077,24 +5182,24 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueDef_describe_value (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -5111,7 +5216,7 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::TAO_ClientRequestInfo_CORBA_ValueDef_describe_value (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -5124,7 +5229,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::arguments (CORBA::Environme
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -5136,12 +5241,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::exceptions (CORBA::Environm
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -5150,17 +5255,17 @@ TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::result (CORBA::Environment
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::result (CORBA_ValueDef::FullValueDescription * result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -5175,24 +5280,24 @@ public:
       const char * version,
       CORBA_IDLType_ptr type,
       const CORBA::Visibility & access,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -5219,7 +5324,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::TAO_ClientRequestInfo_
     const char * version,
     CORBA_IDLType_ptr type,
     const CORBA::Visibility & access,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -5237,35 +5342,28 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::arguments (CORBA::Envi
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_type = parameter_list->length ();
-  parameter_list->length (length_type + 1);
-  (*parameter_list)[length_type].argument <<=  this->type_;
-  
-  (*parameter_list)[length_type].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_access = parameter_list->length ();
-  parameter_list->length (length_access + 1);
-  (*parameter_list)[length_access].argument <<= access_;
-  (*parameter_list)[length_access].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (5);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= version_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->type_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= access_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -5277,12 +5375,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::exceptions (CORBA::Env
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -5291,17 +5389,17 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::result (CORBA::Environ
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::result (CORBA_ValueMemberDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -5316,24 +5414,24 @@ public:
       const char * version,
       CORBA_IDLType_ptr type,
       CORBA::AttributeMode & mode,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -5360,7 +5458,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::TAO_ClientRequestInfo_COR
     const char * version,
     CORBA_IDLType_ptr type,
     CORBA::AttributeMode & mode,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -5378,36 +5476,28 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::arguments (CORBA::Environ
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_type = parameter_list->length ();
-  parameter_list->length (length_type + 1);
-  (*parameter_list)[length_type].argument <<=  this->type_;
-  
-  (*parameter_list)[length_type].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_mode = parameter_list->length ();
-  parameter_list->length (length_mode + 1);
-  (*parameter_list)[length_mode].argument <<=  this->mode_;
-  
-  (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (5);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= version_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->type_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->mode_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -5419,12 +5509,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::exceptions (CORBA::Enviro
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -5433,17 +5523,17 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::result (CORBA::Environmen
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::result (CORBA_AttributeDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -5461,24 +5551,24 @@ public:
       const CORBA_ParDescriptionSeq & params,
       const CORBA_ExceptionDefSeq & exceptions,
       const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -5511,7 +5601,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::TAO_ClientRequestInfo_COR
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
     const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -5532,54 +5622,37 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::arguments (CORBA::Environ
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_result = parameter_list->length ();
-  parameter_list->length (length_result + 1);
-  (*parameter_list)[length_result].argument <<=  this->result_;
-  
-  (*parameter_list)[length_result].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_mode = parameter_list->length ();
-  parameter_list->length (length_mode + 1);
-  (*parameter_list)[length_mode].argument <<=  this->mode_;
-  
-  (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_params = parameter_list->length ();
-  parameter_list->length (length_params + 1);
-  (*parameter_list)[length_params].argument <<=  this->params_;
-  
-  (*parameter_list)[length_params].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_exceptions = parameter_list->length ();
-  parameter_list->length (length_exceptions + 1);
-  (*parameter_list)[length_exceptions].argument <<=  this->exceptions_;
-  
-  (*parameter_list)[length_exceptions].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_contexts = parameter_list->length ();
-  parameter_list->length (length_contexts + 1);
-  (*parameter_list)[length_contexts].argument <<=  this->contexts_;
-  
-  (*parameter_list)[length_contexts].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (8);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<= id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= version_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->result_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->mode_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->params_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->exceptions_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->contexts_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -5591,12 +5664,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::exceptions (CORBA::Enviro
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -5605,24 +5678,24 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::result (CORBA::Environmen
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::result (CORBA_OperationDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 _TAO_CORBA_ValueDef_Proxy_Impl::_TAO_CORBA_ValueDef_Proxy_Impl (void)
@@ -5641,15 +5714,15 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfa
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_InterfaceDefSeq *_tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   ACE_NEW_RETURN (_tao_retval, CORBA_InterfaceDefSeq, _tao_retval);
   CORBA_InterfaceDefSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -5660,17 +5733,21 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfa
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get ri (
         &_tao_call,
@@ -5678,43 +5755,66 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfa
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -5724,74 +5824,55 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfa
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_InterfaceDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_InterfaceDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces (
@@ -5803,15 +5884,15 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_supported_interfaces",
@@ -5820,17 +5901,21 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set ri (
         &_tao_call,
@@ -5839,31 +5924,40 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << supported_interfaces)
@@ -5871,79 +5965,76 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
@@ -5954,15 +6045,15 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_InitializerSeq *_tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   ACE_NEW_RETURN (_tao_retval, CORBA_InitializerSeq, _tao_retval);
   CORBA_InitializerSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -5973,17 +6064,21 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get ri (
         &_tao_call,
@@ -5991,43 +6086,66 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -6037,74 +6155,55 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_InitializerSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_InitializerSeq * _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
@@ -6116,15 +6215,15 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_initializers",
@@ -6133,17 +6232,21 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set ri (
         &_tao_call,
@@ -6152,31 +6255,40 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << initializers)
@@ -6184,79 +6296,76 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
@@ -6267,16 +6376,16 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_ValueDef_ptr _tao_retval = CORBA_ValueDef::_nil ();
   CORBA_ValueDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_base_value",
@@ -6285,17 +6394,21 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get ri (
         &_tao_call,
@@ -6303,43 +6416,66 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -6349,74 +6485,55 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
@@ -6428,15 +6545,15 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_base_value",
@@ -6445,17 +6562,21 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set ri (
         &_tao_call,
@@ -6464,31 +6585,40 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << base_value)
@@ -6496,79 +6626,76 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values (
@@ -6579,15 +6706,15 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_ValueDefSeq *_tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   ACE_NEW_RETURN (_tao_retval, CORBA_ValueDefSeq, _tao_retval);
   CORBA_ValueDefSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -6598,17 +6725,21 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get ri (
         &_tao_call,
@@ -6616,43 +6747,66 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -6662,74 +6816,55 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_ValueDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_ValueDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values (
@@ -6741,15 +6876,15 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_abstract_base_values",
@@ -6758,17 +6893,21 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set ri (
         &_tao_call,
@@ -6777,31 +6916,40 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << abstract_base_values)
@@ -6809,79 +6957,76 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
@@ -6892,15 +7037,15 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA::Boolean _tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_is_abstract",
@@ -6909,17 +7054,21 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get ri (
         &_tao_call,
@@ -6927,43 +7076,66 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN  (_tao_retval);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
@@ -6973,73 +7145,54 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA::Boolean  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA::Boolean _tao_retval_info = _tao_retval;
+          ri.result (_tao_retval_info);
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN  (_tao_retval);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_retval;
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN  (_tao_retval);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_retval;
 }
 
 void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
@@ -7051,15 +7204,15 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_is_abstract",
@@ -7068,17 +7221,21 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set ri (
         &_tao_call,
@@ -7087,31 +7244,40 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << CORBA::Any::from_boolean (is_abstract))
@@ -7119,79 +7285,76 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
@@ -7202,15 +7365,15 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA::Boolean _tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_is_custom",
@@ -7219,17 +7382,21 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get ri (
         &_tao_call,
@@ -7237,43 +7404,66 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN  (_tao_retval);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
@@ -7283,73 +7473,54 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA::Boolean  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA::Boolean _tao_retval_info = _tao_retval;
+          ri.result (_tao_retval_info);
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN  (_tao_retval);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_retval;
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN  (_tao_retval);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_retval;
 }
 
 void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
@@ -7361,15 +7532,15 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_is_custom",
@@ -7378,17 +7549,21 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set ri (
         &_tao_call,
@@ -7397,31 +7572,40 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << CORBA::Any::from_boolean (is_custom))
@@ -7429,79 +7613,76 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
@@ -7512,15 +7693,15 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA::Boolean _tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_is_truncatable",
@@ -7529,17 +7710,21 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get ri (
         &_tao_call,
@@ -7547,43 +7732,66 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN  (_tao_retval);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
@@ -7593,73 +7801,54 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA::Boolean  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA::Boolean _tao_retval_info = _tao_retval;
+          ri.result (_tao_retval_info);
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN  (_tao_retval);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_retval;
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN  (_tao_retval);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_retval;
 }
 
 void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
@@ -7671,15 +7860,15 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_is_truncatable",
@@ -7688,17 +7877,21 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set ri (
         &_tao_call,
@@ -7707,31 +7900,40 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << CORBA::Any::from_boolean (is_truncatable))
@@ -7739,79 +7941,76 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a (
@@ -7823,15 +8022,15 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA::Boolean _tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "is_a",
@@ -7840,17 +8039,21 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_is_a ri (
         &_tao_call,
@@ -7859,31 +8062,40 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN  (_tao_retval);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << id)
@@ -7892,20 +8104,33 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a (
               CORBA::MARSHAL (),
               _tao_retval
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
@@ -7915,73 +8140,54 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA::Boolean  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA::Boolean _tao_retval_info = _tao_retval;
+          ri.result (_tao_retval_info);
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN  (_tao_retval);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_retval;
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN  (_tao_retval);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_retval;
 }
 
 CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::describe_value (
@@ -7992,14 +8198,14 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::de
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_ValueDef::FullValueDescription *_tao_retval = 0;
-  
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   ACE_NEW_RETURN (_tao_retval, CORBA_ValueDef::FullValueDescription, _tao_retval);
   CORBA_ValueDef::FullValueDescription_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -8010,17 +8216,21 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::de
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_describe_value ri (
         &_tao_call,
@@ -8028,43 +8238,66 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::de
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -8074,74 +8307,55 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::de
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_ValueDef::FullValueDescription * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_ValueDef::FullValueDescription * _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_member (
@@ -8157,16 +8371,16 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_ValueMemberDef_ptr _tao_retval = CORBA_ValueMemberDef::_nil ();
   CORBA_ValueMemberDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_value_member",
@@ -8175,17 +8389,21 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member ri (
         &_tao_call,
@@ -8198,31 +8416,40 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << id) &&
@@ -8235,20 +8462,33 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -8258,74 +8498,55 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_ValueMemberDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_ValueMemberDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute (
@@ -8341,16 +8562,16 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_AttributeDef_ptr _tao_retval = CORBA_AttributeDef::_nil ();
   CORBA_AttributeDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_attribute",
@@ -8359,17 +8580,21 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute ri (
         &_tao_call,
@@ -8382,31 +8607,40 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << id) &&
@@ -8419,20 +8653,33 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute (
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -8442,74 +8689,55 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_AttributeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_AttributeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation (
@@ -8528,16 +8756,16 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_OperationDef_ptr _tao_retval = CORBA_OperationDef::_nil ();
   CORBA_OperationDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_operation",
@@ -8546,17 +8774,21 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_create_operation ri (
         &_tao_call,
@@ -8572,31 +8804,40 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << id) &&
@@ -8612,20 +8853,33 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation (
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -8635,79 +8889,60 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_OperationDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_OperationDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -8777,17 +9012,17 @@ CORBA_ValueDef::CORBA_ValueDef_setup_collocation (int collocated)
   else
     this->the_TAO_CORBA_ValueDef_Proxy_Broker_ =
       ::_TAO_CORBA_ValueDef_Remote_Proxy_Broker::the_TAO_CORBA_ValueDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_Container_setup_collocation (collocated);
-  
+
   this->CORBA_Contained_setup_collocation (collocated);
-  
+
   this->CORBA_IDLType_setup_collocation (collocated);
 }
 
-void CORBA_ValueDef::_tao_any_destructor (void *x)
+void CORBA_ValueDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_ValueDef *tmp = ACE_static_cast (CORBA_ValueDef*,x);
+  CORBA_ValueDef *tmp = ACE_static_cast (CORBA_ValueDef*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -8834,14 +9069,14 @@ CORBA_ValueDef_ptr CORBA_ValueDef::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           CORBA_ValueDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::CORBA_ValueDef (stub, 0, obj->_servant ()), CORBA_ValueDef::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -8937,7 +9172,7 @@ void *CORBA_ValueDef::_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;
@@ -8955,10 +9190,10 @@ CORBA_InterfaceDefSeq * CORBA_ValueDef::supported_interfaces (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.supported_interfaces (
       this,
       ACE_TRY_ENV
@@ -8973,10 +9208,10 @@ void CORBA_ValueDef::supported_interfaces (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.supported_interfaces (
       this,
       supported_interfaces,
@@ -8991,10 +9226,10 @@ CORBA_InitializerSeq * CORBA_ValueDef::initializers (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.initializers (
       this,
       ACE_TRY_ENV
@@ -9009,10 +9244,10 @@ void CORBA_ValueDef::initializers (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.initializers (
       this,
       initializers,
@@ -9027,10 +9262,10 @@ CORBA_ValueDef_ptr CORBA_ValueDef::base_value (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.base_value (
       this,
       ACE_TRY_ENV
@@ -9045,10 +9280,10 @@ void CORBA_ValueDef::base_value (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.base_value (
       this,
       base_value,
@@ -9063,10 +9298,10 @@ CORBA_ValueDefSeq * CORBA_ValueDef::abstract_base_values (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.abstract_base_values (
       this,
       ACE_TRY_ENV
@@ -9081,10 +9316,10 @@ void CORBA_ValueDef::abstract_base_values (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.abstract_base_values (
       this,
       abstract_base_values,
@@ -9099,10 +9334,10 @@ CORBA::Boolean CORBA_ValueDef::is_abstract (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.is_abstract (
       this,
       ACE_TRY_ENV
@@ -9117,10 +9352,10 @@ void CORBA_ValueDef::is_abstract (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.is_abstract (
       this,
       is_abstract,
@@ -9135,10 +9370,10 @@ CORBA::Boolean CORBA_ValueDef::is_custom (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.is_custom (
       this,
       ACE_TRY_ENV
@@ -9153,10 +9388,10 @@ void CORBA_ValueDef::is_custom (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.is_custom (
       this,
       is_custom,
@@ -9171,10 +9406,10 @@ CORBA::Boolean CORBA_ValueDef::is_truncatable (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.is_truncatable (
       this,
       ACE_TRY_ENV
@@ -9189,10 +9424,10 @@ void CORBA_ValueDef::is_truncatable (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.is_truncatable (
       this,
       is_truncatable,
@@ -9208,10 +9443,10 @@ CORBA::Boolean CORBA_ValueDef::is_a (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.is_a (
       this,
       id,
@@ -9223,48 +9458,48 @@ static const CORBA::Long _oc_CORBA_ValueDef_FullValueDescription[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   52,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5661), 
-  ACE_NTOHL (0x6c756544), 
-  ACE_NTOHL (0x65662f46), 
-  ACE_NTOHL (0x756c6c56), 
-  ACE_NTOHL (0x616c7565), 
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
-  ACE_NTOHL (0x696f6e3a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5661),
+  ACE_NTOHL (0x6c756544),
+  ACE_NTOHL (0x65662f46),
+  ACE_NTOHL (0x756c6c56),
+  ACE_NTOHL (0x616c7565),
+  ACE_NTOHL (0x44657363),
+  ACE_NTOHL (0x72697074),
+  ACE_NTOHL (0x696f6e3a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ValueDef/FullValueDescription:1.0
   21,
-  ACE_NTOHL (0x46756c6c), 
-  ACE_NTOHL (0x56616c75), 
-  ACE_NTOHL (0x65446573), 
-  ACE_NTOHL (0x63726970), 
-  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x46756c6c),
+  ACE_NTOHL (0x56616c75),
+  ACE_NTOHL (0x65446573),
+  ACE_NTOHL (0x63726970),
+  ACE_NTOHL (0x74696f6e),
   ACE_NTOHL (0x0),  // name = FullValueDescription
   15, // member count
   5,
-  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x6e616d65),
   ACE_NTOHL (0x0),  // name = name
   CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4964), 
-    ACE_NTOHL (0x656e7469), 
-    ACE_NTOHL (0x66696572), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4964),
+    ACE_NTOHL (0x656e7469),
+    ACE_NTOHL (0x66696572),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
     11,
-    ACE_NTOHL (0x4964656e), 
-    ACE_NTOHL (0x74696669), 
+    ACE_NTOHL (0x4964656e),
+    ACE_NTOHL (0x74696669),
     ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
   3,
@@ -9273,106 +9508,106 @@ static const CORBA::Long _oc_CORBA_ValueDef_FullValueDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49643a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x49643a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
     13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
-    0U, // string length
+  CORBA::tk_string,
+  0U, // string length
 
   12,
-  ACE_NTOHL (0x69735f61), 
-  ACE_NTOHL (0x62737472), 
+  ACE_NTOHL (0x69735f61),
+  ACE_NTOHL (0x62737472),
   ACE_NTOHL (0x61637400),  // name = is_abstract
   CORBA::tk_boolean,
 
   10,
-  ACE_NTOHL (0x69735f63), 
-  ACE_NTOHL (0x7573746f), 
+  ACE_NTOHL (0x69735f63),
+  ACE_NTOHL (0x7573746f),
   ACE_NTOHL (0x6d000000),  // name = is_custom
   CORBA::tk_boolean,
 
   11,
-  ACE_NTOHL (0x64656669), 
-  ACE_NTOHL (0x6e65645f), 
+  ACE_NTOHL (0x64656669),
+  ACE_NTOHL (0x6e65645f),
   ACE_NTOHL (0x696e0000),  // name = defined_in
   CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49643a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x49643a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
     13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
-    0U, // string length
+  CORBA::tk_string,
+  0U, // string length
 
   8,
-  ACE_NTOHL (0x76657273), 
+  ACE_NTOHL (0x76657273),
   ACE_NTOHL (0x696f6e00),  // name = version
   CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5665), 
-    ACE_NTOHL (0x7273696f), 
-    ACE_NTOHL (0x6e537065), 
-    ACE_NTOHL (0x633a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5665),
+    ACE_NTOHL (0x7273696f),
+    ACE_NTOHL (0x6e537065),
+    ACE_NTOHL (0x633a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
     12,
-    ACE_NTOHL (0x56657273), 
-    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x56657273),
+    ACE_NTOHL (0x696f6e53),
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string, 
-    0U, // string length
+  CORBA::tk_string,
+  0U, // string length
 
   11,
-  ACE_NTOHL (0x6f706572), 
-  ACE_NTOHL (0x6174696f), 
+  ACE_NTOHL (0x6f706572),
+  ACE_NTOHL (0x6174696f),
   ACE_NTOHL (0x6e730000),  // name = operations
   CORBA::tk_alias, // typecode kind for typedefs
   2036, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     39,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4f70), 
-    ACE_NTOHL (0x44657363), 
-    ACE_NTOHL (0x72697074), 
-    ACE_NTOHL (0x696f6e53), 
-    ACE_NTOHL (0x65713a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4f70),
+    ACE_NTOHL (0x44657363),
+    ACE_NTOHL (0x72697074),
+    ACE_NTOHL (0x696f6e53),
+    ACE_NTOHL (0x65713a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OpDescriptionSeq:1.0
     17,
-    ACE_NTOHL (0x4f704465), 
-    ACE_NTOHL (0x73637269), 
-    ACE_NTOHL (0x7074696f), 
-    ACE_NTOHL (0x6e536571), 
+    ACE_NTOHL (0x4f704465),
+    ACE_NTOHL (0x73637269),
+    ACE_NTOHL (0x7074696f),
+    ACE_NTOHL (0x6e536571),
     ACE_NTOHL (0x0),  // name = OpDescriptionSeq
     CORBA::tk_sequence, // typecode kind
     1956, // encapsulation length
@@ -9381,47 +9616,47 @@ static const CORBA::Long _oc_CORBA_ValueDef_FullValueDescription[] =
       1940, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4f70), 
-        ACE_NTOHL (0x65726174), 
-        ACE_NTOHL (0x696f6e44), 
-        ACE_NTOHL (0x65736372), 
-        ACE_NTOHL (0x69707469), 
-        ACE_NTOHL (0x6f6e3a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4f70),
+        ACE_NTOHL (0x65726174),
+        ACE_NTOHL (0x696f6e44),
+        ACE_NTOHL (0x65736372),
+        ACE_NTOHL (0x69707469),
+        ACE_NTOHL (0x6f6e3a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
         21,
-        ACE_NTOHL (0x4f706572), 
-        ACE_NTOHL (0x6174696f), 
-        ACE_NTOHL (0x6e446573), 
-        ACE_NTOHL (0x63726970), 
-        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x4f706572),
+        ACE_NTOHL (0x6174696f),
+        ACE_NTOHL (0x6e446573),
+        ACE_NTOHL (0x63726970),
+        ACE_NTOHL (0x74696f6e),
         ACE_NTOHL (0x0),  // name = OperationDescription
         9, // member count
         5,
-        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x6e616d65),
         ACE_NTOHL (0x0),  // name = name
         CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4964), 
-          ACE_NTOHL (0x656e7469), 
-          ACE_NTOHL (0x66696572), 
-          ACE_NTOHL (0x3a312e30), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4964),
+          ACE_NTOHL (0x656e7469),
+          ACE_NTOHL (0x66696572),
+          ACE_NTOHL (0x3a312e30),
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
           11,
-          ACE_NTOHL (0x4964656e), 
-          ACE_NTOHL (0x74696669), 
+          ACE_NTOHL (0x4964656e),
+          ACE_NTOHL (0x74696669),
           ACE_NTOHL (0x65720000),  // name = Identifier
-          CORBA::tk_string, 
-          0U, // string length
+        CORBA::tk_string,
+        0U, // string length
 
         3,
         ACE_NTOHL (0x69640000),  // name = id
@@ -9429,128 +9664,128 @@ static const CORBA::Long _oc_CORBA_ValueDef_FullValueDescription[] =
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5265), 
-          ACE_NTOHL (0x706f7369), 
-          ACE_NTOHL (0x746f7279), 
-          ACE_NTOHL (0x49643a31), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5265),
+          ACE_NTOHL (0x706f7369),
+          ACE_NTOHL (0x746f7279),
+          ACE_NTOHL (0x49643a31),
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
           13,
-          ACE_NTOHL (0x5265706f), 
-          ACE_NTOHL (0x7369746f), 
-          ACE_NTOHL (0x72794964), 
+          ACE_NTOHL (0x5265706f),
+          ACE_NTOHL (0x7369746f),
+          ACE_NTOHL (0x72794964),
           ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
-          0U, // string length
+        CORBA::tk_string,
+        0U, // string length
 
         11,
-        ACE_NTOHL (0x64656669), 
-        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x64656669),
+        ACE_NTOHL (0x6e65645f),
         ACE_NTOHL (0x696e0000),  // name = defined_in
         CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5265), 
-          ACE_NTOHL (0x706f7369), 
-          ACE_NTOHL (0x746f7279), 
-          ACE_NTOHL (0x49643a31), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5265),
+          ACE_NTOHL (0x706f7369),
+          ACE_NTOHL (0x746f7279),
+          ACE_NTOHL (0x49643a31),
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
           13,
-          ACE_NTOHL (0x5265706f), 
-          ACE_NTOHL (0x7369746f), 
-          ACE_NTOHL (0x72794964), 
+          ACE_NTOHL (0x5265706f),
+          ACE_NTOHL (0x7369746f),
+          ACE_NTOHL (0x72794964),
           ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
-          0U, // string length
+        CORBA::tk_string,
+        0U, // string length
 
         8,
-        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x76657273),
         ACE_NTOHL (0x696f6e00),  // name = version
         CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           34,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5665), 
-          ACE_NTOHL (0x7273696f), 
-          ACE_NTOHL (0x6e537065), 
-          ACE_NTOHL (0x633a312e), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5665),
+          ACE_NTOHL (0x7273696f),
+          ACE_NTOHL (0x6e537065),
+          ACE_NTOHL (0x633a312e),
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
           12,
-          ACE_NTOHL (0x56657273), 
-          ACE_NTOHL (0x696f6e53), 
+          ACE_NTOHL (0x56657273),
+          ACE_NTOHL (0x696f6e53),
           ACE_NTOHL (0x70656300),  // name = VersionSpec
-          CORBA::tk_string, 
-          0U, // string length
+        CORBA::tk_string,
+        0U, // string length
 
         7,
-        ACE_NTOHL (0x72657375), 
+        ACE_NTOHL (0x72657375),
         ACE_NTOHL (0x6c740000),  // name = result
         CORBA::tk_TypeCode,
 
         5,
-        ACE_NTOHL (0x6d6f6465), 
+        ACE_NTOHL (0x6d6f6465),
         ACE_NTOHL (0x0),  // name = mode
         CORBA::tk_enum, // typecode kind
         100, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           36,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4f70), 
-          ACE_NTOHL (0x65726174), 
-          ACE_NTOHL (0x696f6e4d), 
-          ACE_NTOHL (0x6f64653a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4f70),
+          ACE_NTOHL (0x65726174),
+          ACE_NTOHL (0x696f6e4d),
+          ACE_NTOHL (0x6f64653a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
           14,
-          ACE_NTOHL (0x4f706572), 
-          ACE_NTOHL (0x6174696f), 
-          ACE_NTOHL (0x6e4d6f64), 
+          ACE_NTOHL (0x4f706572),
+          ACE_NTOHL (0x6174696f),
+          ACE_NTOHL (0x6e4d6f64),
           ACE_NTOHL (0x65000000),  // name = OperationMode
           2, // member count
           10,
-          ACE_NTOHL (0x4f505f4e), 
-          ACE_NTOHL (0x4f524d41), 
+          ACE_NTOHL (0x4f505f4e),
+          ACE_NTOHL (0x4f524d41),
           ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
           10,
-          ACE_NTOHL (0x4f505f4f), 
-          ACE_NTOHL (0x4e455741), 
+          ACE_NTOHL (0x4f505f4f),
+          ACE_NTOHL (0x4e455741),
           ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
 
         9,
-        ACE_NTOHL (0x636f6e74), 
-        ACE_NTOHL (0x65787473), 
+        ACE_NTOHL (0x636f6e74),
+        ACE_NTOHL (0x65787473),
         ACE_NTOHL (0x0),  // name = contexts
         CORBA::tk_alias, // typecode kind for typedefs
         236, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f436f), 
-          ACE_NTOHL (0x6e746578), 
-          ACE_NTOHL (0x74496453), 
-          ACE_NTOHL (0x65713a31), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f436f),
+          ACE_NTOHL (0x6e746578),
+          ACE_NTOHL (0x74496453),
+          ACE_NTOHL (0x65713a31),
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
           13,
-          ACE_NTOHL (0x436f6e74), 
-          ACE_NTOHL (0x65787449), 
-          ACE_NTOHL (0x64536571), 
+          ACE_NTOHL (0x436f6e74),
+          ACE_NTOHL (0x65787449),
+          ACE_NTOHL (0x64536571),
           ACE_NTOHL (0x0),  // name = ContextIdSeq
           CORBA::tk_sequence, // typecode kind
           164, // encapsulation length
@@ -9559,69 +9794,69 @@ static const CORBA::Long _oc_CORBA_ValueDef_FullValueDescription[] =
             148, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               40,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f436f), 
-              ACE_NTOHL (0x6e746578), 
-              ACE_NTOHL (0x74496465), 
-              ACE_NTOHL (0x6e746966), 
-              ACE_NTOHL (0x6965723a), 
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x6f6d672e),
+              ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f436f),
+          ACE_NTOHL (0x6e746578),
+              ACE_NTOHL (0x74496465),
+              ACE_NTOHL (0x6e746966),
+              ACE_NTOHL (0x6965723a),
               ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
               18,
-              ACE_NTOHL (0x436f6e74), 
-              ACE_NTOHL (0x65787449), 
-              ACE_NTOHL (0x64656e74), 
-              ACE_NTOHL (0x69666965), 
+              ACE_NTOHL (0x436f6e74),
+              ACE_NTOHL (0x65787449),
+              ACE_NTOHL (0x64656e74),
+              ACE_NTOHL (0x69666965),
               ACE_NTOHL (0x72000000),  // name = ContextIdentifier
               CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
+            TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f4964), 
-                ACE_NTOHL (0x656e7469), 
-                ACE_NTOHL (0x66696572), 
-                ACE_NTOHL (0x3a312e30), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f4964),
+                ACE_NTOHL (0x656e7469),
+                ACE_NTOHL (0x66696572),
+                ACE_NTOHL (0x3a312e30),
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-                ACE_NTOHL (0x4964656e), 
-                ACE_NTOHL (0x74696669), 
+                ACE_NTOHL (0x4964656e),
+                ACE_NTOHL (0x74696669),
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
-                0U, // string length
+            CORBA::tk_string,
+            0U, // string length
 
 
             0U,
 
 
         11,
-        ACE_NTOHL (0x70617261), 
-        ACE_NTOHL (0x6d657465), 
+        ACE_NTOHL (0x70617261),
+        ACE_NTOHL (0x6d657465),
         ACE_NTOHL (0x72730000),  // name = parameters
         CORBA::tk_alias, // typecode kind for typedefs
         496, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5061), 
-          ACE_NTOHL (0x72446573), 
-          ACE_NTOHL (0x63726970), 
-          ACE_NTOHL (0x74696f6e), 
-          ACE_NTOHL (0x5365713a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5061),
+          ACE_NTOHL (0x72446573),
+          ACE_NTOHL (0x63726970),
+          ACE_NTOHL (0x74696f6e),
+          ACE_NTOHL (0x5365713a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
           18,
-          ACE_NTOHL (0x50617244), 
-          ACE_NTOHL (0x65736372), 
-          ACE_NTOHL (0x69707469), 
-          ACE_NTOHL (0x6f6e5365), 
+          ACE_NTOHL (0x50617244),
+          ACE_NTOHL (0x65736372),
+          ACE_NTOHL (0x69707469),
+          ACE_NTOHL (0x6f6e5365),
           ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
           CORBA::tk_sequence, // typecode kind
           416, // encapsulation length
@@ -9630,106 +9865,106 @@ static const CORBA::Long _oc_CORBA_ValueDef_FullValueDescription[] =
             400, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f5061), 
-              ACE_NTOHL (0x72616d65), 
-              ACE_NTOHL (0x74657244), 
-              ACE_NTOHL (0x65736372), 
-              ACE_NTOHL (0x69707469), 
-              ACE_NTOHL (0x6f6e3a31), 
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x6f6d672e),
+              ACE_NTOHL (0x6f72672f),
+              ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f5061),
+              ACE_NTOHL (0x72616d65),
+              ACE_NTOHL (0x74657244),
+              ACE_NTOHL (0x65736372),
+              ACE_NTOHL (0x69707469),
+              ACE_NTOHL (0x6f6e3a31),
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
               21,
-              ACE_NTOHL (0x50617261), 
-              ACE_NTOHL (0x6d657465), 
-              ACE_NTOHL (0x72446573), 
-              ACE_NTOHL (0x63726970), 
-              ACE_NTOHL (0x74696f6e), 
+              ACE_NTOHL (0x50617261),
+              ACE_NTOHL (0x6d657465),
+              ACE_NTOHL (0x72446573),
+              ACE_NTOHL (0x63726970),
+              ACE_NTOHL (0x74696f6e),
               ACE_NTOHL (0x0),  // name = ParameterDescription
               4, // member count
               5,
-              ACE_NTOHL (0x6e616d65), 
+              ACE_NTOHL (0x6e616d65),
               ACE_NTOHL (0x0),  // name = name
               CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f4964), 
-                ACE_NTOHL (0x656e7469), 
-                ACE_NTOHL (0x66696572), 
-                ACE_NTOHL (0x3a312e30), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f4964),
+                ACE_NTOHL (0x656e7469),
+                ACE_NTOHL (0x66696572),
+                ACE_NTOHL (0x3a312e30),
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-                ACE_NTOHL (0x4964656e), 
-                ACE_NTOHL (0x74696669), 
+                ACE_NTOHL (0x4964656e),
+                ACE_NTOHL (0x74696669),
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
-                0U, // string length
+              CORBA::tk_string,
+              0U, // string length
 
               5,
-              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x74797065),
               ACE_NTOHL (0x0),  // name = type
               CORBA::tk_TypeCode,
 
               9,
-              ACE_NTOHL (0x74797065), 
-              ACE_NTOHL (0x5f646566), 
+              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x5f646566),
               ACE_NTOHL (0x0),  // name = type_def
               CORBA::tk_objref, // typecode kind
               52, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 30,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f4944), 
-                ACE_NTOHL (0x4c547970), 
-                ACE_NTOHL (0x653a312e), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f4944),
+                ACE_NTOHL (0x4c547970),
+                ACE_NTOHL (0x653a312e),
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
                 8,
-                ACE_NTOHL (0x49444c54), 
+                ACE_NTOHL (0x49444c54),
                 ACE_NTOHL (0x79706500),  // name = IDLType
 
               5,
-              ACE_NTOHL (0x6d6f6465), 
+              ACE_NTOHL (0x6d6f6465),
               ACE_NTOHL (0x0),  // name = mode
               CORBA::tk_enum, // typecode kind
               116, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 36,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f5061), 
-                ACE_NTOHL (0x72616d65), 
-                ACE_NTOHL (0x7465724d), 
-                ACE_NTOHL (0x6f64653a), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f5061),
+                ACE_NTOHL (0x72616d65),
+                ACE_NTOHL (0x7465724d),
+                ACE_NTOHL (0x6f64653a),
                 ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
                 14,
-                ACE_NTOHL (0x50617261), 
-                ACE_NTOHL (0x6d657465), 
-                ACE_NTOHL (0x724d6f64), 
+                ACE_NTOHL (0x50617261),
+                ACE_NTOHL (0x6d657465),
+                ACE_NTOHL (0x724d6f64),
                 ACE_NTOHL (0x65000000),  // name = ParameterMode
                 3, // member count
                 9,
-                ACE_NTOHL (0x50415241), 
-                ACE_NTOHL (0x4d5f494e), 
+                ACE_NTOHL (0x50415241),
+                ACE_NTOHL (0x4d5f494e),
                 ACE_NTOHL (0x0),  // name = PARAM_IN
                 10,
-                ACE_NTOHL (0x50415241), 
-                ACE_NTOHL (0x4d5f4f55), 
+                ACE_NTOHL (0x50415241),
+                ACE_NTOHL (0x4d5f4f55),
                 ACE_NTOHL (0x54000000),  // name = PARAM_OUT
                 12,
-                ACE_NTOHL (0x50415241), 
-                ACE_NTOHL (0x4d5f494e), 
+                ACE_NTOHL (0x50415241),
+                ACE_NTOHL (0x4d5f494e),
                 ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
 
 
@@ -9737,28 +9972,28 @@ static const CORBA::Long _oc_CORBA_ValueDef_FullValueDescription[] =
 
 
         11,
-        ACE_NTOHL (0x65786365), 
-        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x65786365),
+        ACE_NTOHL (0x7074696f),
         ACE_NTOHL (0x6e730000),  // name = exceptions
         CORBA::tk_alias, // typecode kind for typedefs
         556, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4578), 
-          ACE_NTOHL (0x63446573), 
-          ACE_NTOHL (0x63726970), 
-          ACE_NTOHL (0x74696f6e), 
-          ACE_NTOHL (0x5365713a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4578),
+          ACE_NTOHL (0x63446573),
+          ACE_NTOHL (0x63726970),
+          ACE_NTOHL (0x74696f6e),
+          ACE_NTOHL (0x5365713a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
           18,
-          ACE_NTOHL (0x45786344), 
-          ACE_NTOHL (0x65736372), 
-          ACE_NTOHL (0x69707469), 
-          ACE_NTOHL (0x6f6e5365), 
+          ACE_NTOHL (0x45786344),
+          ACE_NTOHL (0x65736372),
+          ACE_NTOHL (0x69707469),
+          ACE_NTOHL (0x6f6e5365),
           ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
           CORBA::tk_sequence, // typecode kind
           476, // encapsulation length
@@ -9767,47 +10002,47 @@ static const CORBA::Long _oc_CORBA_ValueDef_FullValueDescription[] =
             460, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f4578), 
-              ACE_NTOHL (0x63657074), 
-              ACE_NTOHL (0x696f6e44), 
-              ACE_NTOHL (0x65736372), 
-              ACE_NTOHL (0x69707469), 
-              ACE_NTOHL (0x6f6e3a31), 
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x6f6d672e),
+              ACE_NTOHL (0x6f72672f),
+              ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f4578),
+              ACE_NTOHL (0x63657074),
+              ACE_NTOHL (0x696f6e44),
+              ACE_NTOHL (0x65736372),
+              ACE_NTOHL (0x69707469),
+              ACE_NTOHL (0x6f6e3a31),
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
               21,
-              ACE_NTOHL (0x45786365), 
-              ACE_NTOHL (0x7074696f), 
-              ACE_NTOHL (0x6e446573), 
-              ACE_NTOHL (0x63726970), 
-              ACE_NTOHL (0x74696f6e), 
+              ACE_NTOHL (0x45786365),
+              ACE_NTOHL (0x7074696f),
+              ACE_NTOHL (0x6e446573),
+              ACE_NTOHL (0x63726970),
+              ACE_NTOHL (0x74696f6e),
               ACE_NTOHL (0x0),  // name = ExceptionDescription
               5, // member count
               5,
-              ACE_NTOHL (0x6e616d65), 
+              ACE_NTOHL (0x6e616d65),
               ACE_NTOHL (0x0),  // name = name
               CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f4964), 
-                ACE_NTOHL (0x656e7469), 
-                ACE_NTOHL (0x66696572), 
-                ACE_NTOHL (0x3a312e30), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f4964),
+                ACE_NTOHL (0x656e7469),
+                ACE_NTOHL (0x66696572),
+                ACE_NTOHL (0x3a312e30),
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-                ACE_NTOHL (0x4964656e), 
-                ACE_NTOHL (0x74696669), 
+                ACE_NTOHL (0x4964656e),
+                ACE_NTOHL (0x74696669),
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
-                0U, // string length
+              CORBA::tk_string,
+              0U, // string length
 
               3,
               ACE_NTOHL (0x69640000),  // name = id
@@ -9815,73 +10050,73 @@ static const CORBA::Long _oc_CORBA_ValueDef_FullValueDescription[] =
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f5265), 
-                ACE_NTOHL (0x706f7369), 
-                ACE_NTOHL (0x746f7279), 
-                ACE_NTOHL (0x49643a31), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f5265),
+                ACE_NTOHL (0x706f7369),
+                ACE_NTOHL (0x746f7279),
+                ACE_NTOHL (0x49643a31),
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-                ACE_NTOHL (0x5265706f), 
-                ACE_NTOHL (0x7369746f), 
-                ACE_NTOHL (0x72794964), 
+                ACE_NTOHL (0x5265706f),
+                ACE_NTOHL (0x7369746f),
+                ACE_NTOHL (0x72794964),
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string, 
-                0U, // string length
+              CORBA::tk_string,
+              0U, // string length
 
               11,
-              ACE_NTOHL (0x64656669), 
-              ACE_NTOHL (0x6e65645f), 
+              ACE_NTOHL (0x64656669),
+              ACE_NTOHL (0x6e65645f),
               ACE_NTOHL (0x696e0000),  // name = defined_in
               CORBA::tk_alias, // typecode kind for typedefs
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f5265), 
-                ACE_NTOHL (0x706f7369), 
-                ACE_NTOHL (0x746f7279), 
-                ACE_NTOHL (0x49643a31), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f5265),
+                ACE_NTOHL (0x706f7369),
+                ACE_NTOHL (0x746f7279),
+                ACE_NTOHL (0x49643a31),
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-                ACE_NTOHL (0x5265706f), 
-                ACE_NTOHL (0x7369746f), 
-                ACE_NTOHL (0x72794964), 
+                ACE_NTOHL (0x5265706f),
+                ACE_NTOHL (0x7369746f),
+                ACE_NTOHL (0x72794964),
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string, 
-                0U, // string length
+              CORBA::tk_string,
+              0U, // string length
 
               8,
-              ACE_NTOHL (0x76657273), 
+              ACE_NTOHL (0x76657273),
               ACE_NTOHL (0x696f6e00),  // name = version
               CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 34,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f5665), 
-                ACE_NTOHL (0x7273696f), 
-                ACE_NTOHL (0x6e537065), 
-                ACE_NTOHL (0x633a312e), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f5665),
+                ACE_NTOHL (0x7273696f),
+                ACE_NTOHL (0x6e537065),
+                ACE_NTOHL (0x633a312e),
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                 12,
-                ACE_NTOHL (0x56657273), 
-                ACE_NTOHL (0x696f6e53), 
+                ACE_NTOHL (0x56657273),
+                ACE_NTOHL (0x696f6e53),
                 ACE_NTOHL (0x70656300),  // name = VersionSpec
-                CORBA::tk_string, 
-                0U, // string length
+              CORBA::tk_string,
+              0U, // string length
 
               5,
-              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x74797065),
               ACE_NTOHL (0x0),  // name = type
               CORBA::tk_TypeCode,
 
@@ -9894,29 +10129,29 @@ static const CORBA::Long _oc_CORBA_ValueDef_FullValueDescription[] =
 
 
   11,
-  ACE_NTOHL (0x61747472), 
-  ACE_NTOHL (0x69627574), 
+  ACE_NTOHL (0x61747472),
+  ACE_NTOHL (0x69627574),
   ACE_NTOHL (0x65730000),  // name = attributes
   CORBA::tk_alias, // typecode kind for typedefs
   684, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     41,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4174), 
-    ACE_NTOHL (0x74724465), 
-    ACE_NTOHL (0x73637269), 
-    ACE_NTOHL (0x7074696f), 
-    ACE_NTOHL (0x6e536571), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4174),
+    ACE_NTOHL (0x74724465),
+    ACE_NTOHL (0x73637269),
+    ACE_NTOHL (0x7074696f),
+    ACE_NTOHL (0x6e536571),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/AttrDescriptionSeq:1.0
     19,
-    ACE_NTOHL (0x41747472), 
-    ACE_NTOHL (0x44657363), 
-    ACE_NTOHL (0x72697074), 
-    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x41747472),
+    ACE_NTOHL (0x44657363),
+    ACE_NTOHL (0x72697074),
+    ACE_NTOHL (0x696f6e53),
     ACE_NTOHL (0x65710000),  // name = AttrDescriptionSeq
     CORBA::tk_sequence, // typecode kind
     600, // encapsulation length
@@ -9925,47 +10160,47 @@ static const CORBA::Long _oc_CORBA_ValueDef_FullValueDescription[] =
       584, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4174), 
-        ACE_NTOHL (0x74726962), 
-        ACE_NTOHL (0x75746544), 
-        ACE_NTOHL (0x65736372), 
-        ACE_NTOHL (0x69707469), 
-        ACE_NTOHL (0x6f6e3a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4174),
+        ACE_NTOHL (0x74726962),
+        ACE_NTOHL (0x75746544),
+        ACE_NTOHL (0x65736372),
+        ACE_NTOHL (0x69707469),
+        ACE_NTOHL (0x6f6e3a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDescription:1.0
         21,
-        ACE_NTOHL (0x41747472), 
-        ACE_NTOHL (0x69627574), 
-        ACE_NTOHL (0x65446573), 
-        ACE_NTOHL (0x63726970), 
-        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x41747472),
+        ACE_NTOHL (0x69627574),
+        ACE_NTOHL (0x65446573),
+        ACE_NTOHL (0x63726970),
+        ACE_NTOHL (0x74696f6e),
         ACE_NTOHL (0x0),  // name = AttributeDescription
         6, // member count
         5,
-        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x6e616d65),
         ACE_NTOHL (0x0),  // name = name
         CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4964), 
-          ACE_NTOHL (0x656e7469), 
-          ACE_NTOHL (0x66696572), 
-          ACE_NTOHL (0x3a312e30), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4964),
+          ACE_NTOHL (0x656e7469),
+          ACE_NTOHL (0x66696572),
+          ACE_NTOHL (0x3a312e30),
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
           11,
-          ACE_NTOHL (0x4964656e), 
-          ACE_NTOHL (0x74696669), 
+          ACE_NTOHL (0x4964656e),
+          ACE_NTOHL (0x74696669),
           ACE_NTOHL (0x65720000),  // name = Identifier
-          CORBA::tk_string, 
-          0U, // string length
+        CORBA::tk_string,
+        0U, // string length
 
         3,
         ACE_NTOHL (0x69640000),  // name = id
@@ -9973,106 +10208,106 @@ static const CORBA::Long _oc_CORBA_ValueDef_FullValueDescription[] =
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5265), 
-          ACE_NTOHL (0x706f7369), 
-          ACE_NTOHL (0x746f7279), 
-          ACE_NTOHL (0x49643a31), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5265),
+          ACE_NTOHL (0x706f7369),
+          ACE_NTOHL (0x746f7279),
+          ACE_NTOHL (0x49643a31),
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
           13,
-          ACE_NTOHL (0x5265706f), 
-          ACE_NTOHL (0x7369746f), 
-          ACE_NTOHL (0x72794964), 
+          ACE_NTOHL (0x5265706f),
+          ACE_NTOHL (0x7369746f),
+          ACE_NTOHL (0x72794964),
           ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
-          0U, // string length
+        CORBA::tk_string,
+        0U, // string length
 
         11,
-        ACE_NTOHL (0x64656669), 
-        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x64656669),
+        ACE_NTOHL (0x6e65645f),
         ACE_NTOHL (0x696e0000),  // name = defined_in
         CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5265), 
-          ACE_NTOHL (0x706f7369), 
-          ACE_NTOHL (0x746f7279), 
-          ACE_NTOHL (0x49643a31), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5265),
+          ACE_NTOHL (0x706f7369),
+          ACE_NTOHL (0x746f7279),
+          ACE_NTOHL (0x49643a31),
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
           13,
-          ACE_NTOHL (0x5265706f), 
-          ACE_NTOHL (0x7369746f), 
-          ACE_NTOHL (0x72794964), 
+          ACE_NTOHL (0x5265706f),
+          ACE_NTOHL (0x7369746f),
+          ACE_NTOHL (0x72794964),
           ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
-          0U, // string length
+        CORBA::tk_string,
+        0U, // string length
 
         8,
-        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x76657273),
         ACE_NTOHL (0x696f6e00),  // name = version
         CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           34,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5665), 
-          ACE_NTOHL (0x7273696f), 
-          ACE_NTOHL (0x6e537065), 
-          ACE_NTOHL (0x633a312e), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5665),
+          ACE_NTOHL (0x7273696f),
+          ACE_NTOHL (0x6e537065),
+          ACE_NTOHL (0x633a312e),
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
           12,
-          ACE_NTOHL (0x56657273), 
-          ACE_NTOHL (0x696f6e53), 
+          ACE_NTOHL (0x56657273),
+          ACE_NTOHL (0x696f6e53),
           ACE_NTOHL (0x70656300),  // name = VersionSpec
-          CORBA::tk_string, 
-          0U, // string length
+        CORBA::tk_string,
+        0U, // string length
 
         5,
-        ACE_NTOHL (0x74797065), 
+        ACE_NTOHL (0x74797065),
         ACE_NTOHL (0x0),  // name = type
         CORBA::tk_TypeCode,
 
         5,
-        ACE_NTOHL (0x6d6f6465), 
+        ACE_NTOHL (0x6d6f6465),
         ACE_NTOHL (0x0),  // name = mode
         CORBA::tk_enum, // typecode kind
         104, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           36,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4174), 
-          ACE_NTOHL (0x74726962), 
-          ACE_NTOHL (0x7574654d), 
-          ACE_NTOHL (0x6f64653a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4174),
+          ACE_NTOHL (0x74726962),
+          ACE_NTOHL (0x7574654d),
+          ACE_NTOHL (0x6f64653a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
           14,
-          ACE_NTOHL (0x41747472), 
-          ACE_NTOHL (0x69627574), 
-          ACE_NTOHL (0x654d6f64), 
+          ACE_NTOHL (0x41747472),
+          ACE_NTOHL (0x69627574),
+          ACE_NTOHL (0x654d6f64),
           ACE_NTOHL (0x65000000),  // name = AttributeMode
           2, // member count
           12,
-          ACE_NTOHL (0x41545452), 
-          ACE_NTOHL (0x5f4e4f52), 
+          ACE_NTOHL (0x41545452),
+          ACE_NTOHL (0x5f4e4f52),
           ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
           14,
-          ACE_NTOHL (0x41545452), 
-          ACE_NTOHL (0x5f524541), 
-          ACE_NTOHL (0x444f4e4c), 
+          ACE_NTOHL (0x41545452),
+          ACE_NTOHL (0x5f524541),
+          ACE_NTOHL (0x444f4e4c),
           ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
 
 
@@ -10080,26 +10315,26 @@ static const CORBA::Long _oc_CORBA_ValueDef_FullValueDescription[] =
 
 
   8,
-  ACE_NTOHL (0x6d656d62), 
+  ACE_NTOHL (0x6d656d62),
   ACE_NTOHL (0x65727300),  // name = members
   CORBA::tk_alias, // typecode kind for typedefs
   692, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     37,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5661), 
-    ACE_NTOHL (0x6c75654d), 
-    ACE_NTOHL (0x656d6265), 
-    ACE_NTOHL (0x72536571), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5661),
+    ACE_NTOHL (0x6c75654d),
+    ACE_NTOHL (0x656d6265),
+    ACE_NTOHL (0x72536571),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ValueMemberSeq:1.0
     15,
-    ACE_NTOHL (0x56616c75), 
-    ACE_NTOHL (0x654d656d), 
-    ACE_NTOHL (0x62657253), 
+    ACE_NTOHL (0x56616c75),
+    ACE_NTOHL (0x654d656d),
+    ACE_NTOHL (0x62657253),
     ACE_NTOHL (0x65710000),  // name = ValueMemberSeq
     CORBA::tk_sequence, // typecode kind
     616, // encapsulation length
@@ -10108,42 +10343,42 @@ static const CORBA::Long _oc_CORBA_ValueDef_FullValueDescription[] =
       600, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         34,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5661), 
-        ACE_NTOHL (0x6c75654d), 
-        ACE_NTOHL (0x656d6265), 
-        ACE_NTOHL (0x723a312e), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f5661),
+        ACE_NTOHL (0x6c75654d),
+        ACE_NTOHL (0x656d6265),
+        ACE_NTOHL (0x723a312e),
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ValueMember:1.0
         12,
-        ACE_NTOHL (0x56616c75), 
-        ACE_NTOHL (0x654d656d), 
+        ACE_NTOHL (0x56616c75),
+        ACE_NTOHL (0x654d656d),
         ACE_NTOHL (0x62657200),  // name = ValueMember
         7, // member count
         5,
-        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x6e616d65),
         ACE_NTOHL (0x0),  // name = name
         CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4964), 
-          ACE_NTOHL (0x656e7469), 
-          ACE_NTOHL (0x66696572), 
-          ACE_NTOHL (0x3a312e30), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4964),
+          ACE_NTOHL (0x656e7469),
+          ACE_NTOHL (0x66696572),
+          ACE_NTOHL (0x3a312e30),
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
           11,
-          ACE_NTOHL (0x4964656e), 
-          ACE_NTOHL (0x74696669), 
+          ACE_NTOHL (0x4964656e),
+          ACE_NTOHL (0x74696669),
           ACE_NTOHL (0x65720000),  // name = Identifier
-          CORBA::tk_string, 
-          0U, // string length
+        CORBA::tk_string,
+        0U, // string length
 
         3,
         ACE_NTOHL (0x69640000),  // name = id
@@ -10151,115 +10386,115 @@ static const CORBA::Long _oc_CORBA_ValueDef_FullValueDescription[] =
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5265), 
-          ACE_NTOHL (0x706f7369), 
-          ACE_NTOHL (0x746f7279), 
-          ACE_NTOHL (0x49643a31), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5265),
+          ACE_NTOHL (0x706f7369),
+          ACE_NTOHL (0x746f7279),
+          ACE_NTOHL (0x49643a31),
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
           13,
-          ACE_NTOHL (0x5265706f), 
-          ACE_NTOHL (0x7369746f), 
-          ACE_NTOHL (0x72794964), 
+          ACE_NTOHL (0x5265706f),
+          ACE_NTOHL (0x7369746f),
+          ACE_NTOHL (0x72794964),
           ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
-          0U, // string length
+        CORBA::tk_string,
+        0U, // string length
 
         11,
-        ACE_NTOHL (0x64656669), 
-        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x64656669),
+        ACE_NTOHL (0x6e65645f),
         ACE_NTOHL (0x696e0000),  // name = defined_in
         CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5265), 
-          ACE_NTOHL (0x706f7369), 
-          ACE_NTOHL (0x746f7279), 
-          ACE_NTOHL (0x49643a31), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5265),
+          ACE_NTOHL (0x706f7369),
+          ACE_NTOHL (0x746f7279),
+          ACE_NTOHL (0x49643a31),
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
           13,
-          ACE_NTOHL (0x5265706f), 
-          ACE_NTOHL (0x7369746f), 
-          ACE_NTOHL (0x72794964), 
+          ACE_NTOHL (0x5265706f),
+          ACE_NTOHL (0x7369746f),
+          ACE_NTOHL (0x72794964),
           ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
-          0U, // string length
+        CORBA::tk_string,
+        0U, // string length
 
         8,
-        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x76657273),
         ACE_NTOHL (0x696f6e00),  // name = version
         CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           34,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5665), 
-          ACE_NTOHL (0x7273696f), 
-          ACE_NTOHL (0x6e537065), 
-          ACE_NTOHL (0x633a312e), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5665),
+          ACE_NTOHL (0x7273696f),
+          ACE_NTOHL (0x6e537065),
+          ACE_NTOHL (0x633a312e),
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
           12,
-          ACE_NTOHL (0x56657273), 
-          ACE_NTOHL (0x696f6e53), 
+          ACE_NTOHL (0x56657273),
+          ACE_NTOHL (0x696f6e53),
           ACE_NTOHL (0x70656300),  // name = VersionSpec
-          CORBA::tk_string, 
-          0U, // string length
+        CORBA::tk_string,
+        0U, // string length
 
         5,
-        ACE_NTOHL (0x74797065), 
+        ACE_NTOHL (0x74797065),
         ACE_NTOHL (0x0),  // name = type
         CORBA::tk_TypeCode,
 
         9,
-        ACE_NTOHL (0x74797065), 
-        ACE_NTOHL (0x5f646566), 
+        ACE_NTOHL (0x74797065),
+        ACE_NTOHL (0x5f646566),
         ACE_NTOHL (0x0),  // name = type_def
         CORBA::tk_objref, // typecode kind
         52, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           30,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4944), 
-          ACE_NTOHL (0x4c547970), 
-          ACE_NTOHL (0x653a312e), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4944),
+          ACE_NTOHL (0x4c547970),
+          ACE_NTOHL (0x653a312e),
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
           8,
-          ACE_NTOHL (0x49444c54), 
+          ACE_NTOHL (0x49444c54),
           ACE_NTOHL (0x79706500),  // name = IDLType
 
         7,
-        ACE_NTOHL (0x61636365), 
+        ACE_NTOHL (0x61636365),
         ACE_NTOHL (0x73730000),  // name = access
         CORBA::tk_alias, // typecode kind for typedefs
         64, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5669), 
-          ACE_NTOHL (0x73696269), 
-          ACE_NTOHL (0x6c697479), 
-          ACE_NTOHL (0x3a312e30), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5669),
+          ACE_NTOHL (0x73696269),
+          ACE_NTOHL (0x6c697479),
+          ACE_NTOHL (0x3a312e30),
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Visibility:1.0
           11,
-          ACE_NTOHL (0x56697369), 
-          ACE_NTOHL (0x62696c69), 
+          ACE_NTOHL (0x56697369),
+          ACE_NTOHL (0x62696c69),
           ACE_NTOHL (0x74790000),  // name = Visibility
           CORBA::tk_short,
 
@@ -10269,28 +10504,28 @@ static const CORBA::Long _oc_CORBA_ValueDef_FullValueDescription[] =
 
 
   13,
-  ACE_NTOHL (0x696e6974), 
-  ACE_NTOHL (0x69616c69), 
-  ACE_NTOHL (0x7a657273), 
+  ACE_NTOHL (0x696e6974),
+  ACE_NTOHL (0x69616c69),
+  ACE_NTOHL (0x7a657273),
   ACE_NTOHL (0x0),  // name = initializers
   CORBA::tk_alias, // typecode kind for typedefs
   604, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     37,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f496e), 
-    ACE_NTOHL (0x69746961), 
-    ACE_NTOHL (0x6c697a65), 
-    ACE_NTOHL (0x72536571), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f496e),
+    ACE_NTOHL (0x69746961),
+    ACE_NTOHL (0x6c697a65),
+    ACE_NTOHL (0x72536571),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/InitializerSeq:1.0
     15,
-    ACE_NTOHL (0x496e6974), 
-    ACE_NTOHL (0x69616c69), 
-    ACE_NTOHL (0x7a657253), 
+    ACE_NTOHL (0x496e6974),
+    ACE_NTOHL (0x69616c69),
+    ACE_NTOHL (0x7a657253),
     ACE_NTOHL (0x65710000),  // name = InitializerSeq
     CORBA::tk_sequence, // typecode kind
     528, // encapsulation length
@@ -10299,41 +10534,41 @@ static const CORBA::Long _oc_CORBA_ValueDef_FullValueDescription[] =
       512, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         34,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f496e), 
-        ACE_NTOHL (0x69746961), 
-        ACE_NTOHL (0x6c697a65), 
-        ACE_NTOHL (0x723a312e), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f496e),
+        ACE_NTOHL (0x69746961),
+        ACE_NTOHL (0x6c697a65),
+        ACE_NTOHL (0x723a312e),
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/Initializer:1.0
         12,
-        ACE_NTOHL (0x496e6974), 
-        ACE_NTOHL (0x69616c69), 
+        ACE_NTOHL (0x496e6974),
+        ACE_NTOHL (0x69616c69),
         ACE_NTOHL (0x7a657200),  // name = Initializer
         2, // member count
         8,
-        ACE_NTOHL (0x6d656d62), 
+        ACE_NTOHL (0x6d656d62),
         ACE_NTOHL (0x65727300),  // name = members
         CORBA::tk_alias, // typecode kind for typedefs
         340, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           38,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5374), 
-          ACE_NTOHL (0x72756374), 
-          ACE_NTOHL (0x4d656d62), 
-          ACE_NTOHL (0x65725365), 
-          ACE_NTOHL (0x713a312e), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5374),
+          ACE_NTOHL (0x72756374),
+          ACE_NTOHL (0x4d656d62),
+          ACE_NTOHL (0x65725365),
+          ACE_NTOHL (0x713a312e),
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
           16,
-          ACE_NTOHL (0x53747275), 
-          ACE_NTOHL (0x63744d65), 
-          ACE_NTOHL (0x6d626572), 
+          ACE_NTOHL (0x53747275),
+          ACE_NTOHL (0x63744d65),
+          ACE_NTOHL (0x6d626572),
           ACE_NTOHL (0x53657100),  // name = StructMemberSeq
           CORBA::tk_sequence, // typecode kind
           264, // encapsulation length
@@ -10342,67 +10577,67 @@ static const CORBA::Long _oc_CORBA_ValueDef_FullValueDescription[] =
             248, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               35,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f5374), 
-              ACE_NTOHL (0x72756374), 
-              ACE_NTOHL (0x4d656d62), 
-              ACE_NTOHL (0x65723a31), 
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x6f6d672e),
+              ACE_NTOHL (0x6f72672f),
+              ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f5374),
+              ACE_NTOHL (0x72756374),
+              ACE_NTOHL (0x4d656d62),
+              ACE_NTOHL (0x65723a31),
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
               13,
-              ACE_NTOHL (0x53747275), 
-              ACE_NTOHL (0x63744d65), 
-              ACE_NTOHL (0x6d626572), 
+              ACE_NTOHL (0x53747275),
+              ACE_NTOHL (0x63744d65),
+              ACE_NTOHL (0x6d626572),
               ACE_NTOHL (0x0),  // name = StructMember
               3, // member count
               5,
-              ACE_NTOHL (0x6e616d65), 
+              ACE_NTOHL (0x6e616d65),
               ACE_NTOHL (0x0),  // name = name
               CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f4964), 
-                ACE_NTOHL (0x656e7469), 
-                ACE_NTOHL (0x66696572), 
-                ACE_NTOHL (0x3a312e30), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f4964),
+                ACE_NTOHL (0x656e7469),
+                ACE_NTOHL (0x66696572),
+                ACE_NTOHL (0x3a312e30),
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-                ACE_NTOHL (0x4964656e), 
-                ACE_NTOHL (0x74696669), 
+                ACE_NTOHL (0x4964656e),
+                ACE_NTOHL (0x74696669),
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
-                0U, // string length
+              CORBA::tk_string,
+              0U, // string length
 
               5,
-              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x74797065),
               ACE_NTOHL (0x0),  // name = type
               CORBA::tk_TypeCode,
 
               9,
-              ACE_NTOHL (0x74797065), 
-              ACE_NTOHL (0x5f646566), 
+              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x5f646566),
               ACE_NTOHL (0x0),  // name = type_def
               CORBA::tk_objref, // typecode kind
               52, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 30,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f4944), 
-                ACE_NTOHL (0x4c547970), 
-                ACE_NTOHL (0x653a312e), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f4944),
+                ACE_NTOHL (0x4c547970),
+                ACE_NTOHL (0x653a312e),
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
                 8,
-                ACE_NTOHL (0x49444c54), 
+                ACE_NTOHL (0x49444c54),
                 ACE_NTOHL (0x79706500),  // name = IDLType
 
 
@@ -10410,57 +10645,57 @@ static const CORBA::Long _oc_CORBA_ValueDef_FullValueDescription[] =
 
 
         5,
-        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x6e616d65),
         ACE_NTOHL (0x0),  // name = name
         CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4964), 
-          ACE_NTOHL (0x656e7469), 
-          ACE_NTOHL (0x66696572), 
-          ACE_NTOHL (0x3a312e30), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4964),
+          ACE_NTOHL (0x656e7469),
+          ACE_NTOHL (0x66696572),
+          ACE_NTOHL (0x3a312e30),
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
           11,
-          ACE_NTOHL (0x4964656e), 
-          ACE_NTOHL (0x74696669), 
+          ACE_NTOHL (0x4964656e),
+          ACE_NTOHL (0x74696669),
           ACE_NTOHL (0x65720000),  // name = Identifier
-          CORBA::tk_string, 
-          0U, // string length
+        CORBA::tk_string,
+        0U, // string length
 
 
       0U,
 
 
   21,
-  ACE_NTOHL (0x73757070), 
-  ACE_NTOHL (0x6f727465), 
-  ACE_NTOHL (0x645f696e), 
-  ACE_NTOHL (0x74657266), 
-  ACE_NTOHL (0x61636573), 
+  ACE_NTOHL (0x73757070),
+  ACE_NTOHL (0x6f727465),
+  ACE_NTOHL (0x645f696e),
+  ACE_NTOHL (0x74657266),
+  ACE_NTOHL (0x61636573),
   ACE_NTOHL (0x0),  // name = supported_interfaces
   CORBA::tk_alias, // typecode kind for typedefs
   164, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49645365), 
-    ACE_NTOHL (0x713a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x49645365),
+    ACE_NTOHL (0x713a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
     16,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
     CORBA::tk_sequence, // typecode kind
     88, // encapsulation length
@@ -10469,51 +10704,51 @@ static const CORBA::Long _oc_CORBA_ValueDef_FullValueDescription[] =
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5265), 
-        ACE_NTOHL (0x706f7369), 
-        ACE_NTOHL (0x746f7279), 
-        ACE_NTOHL (0x49643a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+        ACE_NTOHL (0x49643a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-        ACE_NTOHL (0x5265706f), 
-        ACE_NTOHL (0x7369746f), 
-        ACE_NTOHL (0x72794964), 
+        ACE_NTOHL (0x5265706f),
+        ACE_NTOHL (0x7369746f),
+        ACE_NTOHL (0x72794964),
         ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
-        0U, // string length
+      CORBA::tk_string,
+      0U, // string length
 
       0U,
 
 
   21,
-  ACE_NTOHL (0x61627374), 
-  ACE_NTOHL (0x72616374), 
-  ACE_NTOHL (0x5f626173), 
-  ACE_NTOHL (0x655f7661), 
-  ACE_NTOHL (0x6c756573), 
+  ACE_NTOHL (0x61627374),
+  ACE_NTOHL (0x72616374),
+  ACE_NTOHL (0x5f626173),
+  ACE_NTOHL (0x655f7661),
+  ACE_NTOHL (0x6c756573),
   ACE_NTOHL (0x0),  // name = abstract_base_values
   CORBA::tk_alias, // typecode kind for typedefs
   164, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49645365), 
-    ACE_NTOHL (0x713a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x49645365),
+    ACE_NTOHL (0x713a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
     16,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
     CORBA::tk_sequence, // typecode kind
     88, // encapsulation length
@@ -10522,60 +10757,60 @@ static const CORBA::Long _oc_CORBA_ValueDef_FullValueDescription[] =
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5265), 
-        ACE_NTOHL (0x706f7369), 
-        ACE_NTOHL (0x746f7279), 
-        ACE_NTOHL (0x49643a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+        ACE_NTOHL (0x49643a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-        ACE_NTOHL (0x5265706f), 
-        ACE_NTOHL (0x7369746f), 
-        ACE_NTOHL (0x72794964), 
+        ACE_NTOHL (0x5265706f),
+        ACE_NTOHL (0x7369746f),
+        ACE_NTOHL (0x72794964),
         ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
-        0U, // string length
+      CORBA::tk_string,
+      0U, // string length
 
       0U,
 
 
   15,
-  ACE_NTOHL (0x69735f74), 
-  ACE_NTOHL (0x72756e63), 
-  ACE_NTOHL (0x61746162), 
+  ACE_NTOHL (0x69735f74),
+  ACE_NTOHL (0x72756e63),
+  ACE_NTOHL (0x61746162),
   ACE_NTOHL (0x6c650000),  // name = is_truncatable
   CORBA::tk_boolean,
 
   11,
-  ACE_NTOHL (0x62617365), 
-  ACE_NTOHL (0x5f76616c), 
+  ACE_NTOHL (0x62617365),
+  ACE_NTOHL (0x5f76616c),
   ACE_NTOHL (0x75650000),  // name = base_value
   CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49643a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x49643a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
     13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
-    0U, // string length
+  CORBA::tk_string,
+  0U, // string length
 
   5,
-  ACE_NTOHL (0x74797065), 
+  ACE_NTOHL (0x74797065),
   ACE_NTOHL (0x0),  // name = type
   CORBA::tk_TypeCode,
 
@@ -10592,9 +10827,9 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueDef_FullValueDescription (
 CORBA::TypeCode_ptr CORBA_ValueDef::_tc_FullValueDescription =
   &_tc_TAO_tc_CORBA_ValueDef_FullValueDescription;
 
-void CORBA_ValueDef::FullValueDescription::_tao_any_destructor (void *x)
+void CORBA_ValueDef::FullValueDescription::_tao_any_destructor (void *_tao_void_pointer)
 {
-  FullValueDescription *tmp = ACE_static_cast (FullValueDescription*,x);
+  FullValueDescription *tmp = ACE_static_cast (FullValueDescription*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -10605,10 +10840,10 @@ CORBA_ValueDef::FullValueDescription * CORBA_ValueDef::describe_value (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.describe_value (
       this,
       ACE_TRY_ENV
@@ -10627,10 +10862,10 @@ CORBA_ValueMemberDef_ptr CORBA_ValueDef::create_value_member (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_value_member (
       this,
       id,
@@ -10654,10 +10889,10 @@ CORBA_AttributeDef_ptr CORBA_ValueDef::create_attribute (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_attribute (
       this,
       id,
@@ -10684,10 +10919,10 @@ CORBA_OperationDef_ptr CORBA_ValueDef::create_operation (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_operation (
       this,
       id,
@@ -10702,9 +10937,10 @@ CORBA_OperationDef_ptr CORBA_ValueDef::create_operation (
     );
 }
 
-void CORBA_ValueDescription::_tao_any_destructor (void *x)
+
+void CORBA_ValueDescription::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_ValueDescription *tmp = ACE_static_cast (CORBA_ValueDescription*,x);
+  CORBA_ValueDescription *tmp = ACE_static_cast (CORBA_ValueDescription*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -10799,7 +11035,7 @@ CORBA_ValueBoxDef_var::operator const ::CORBA_ValueBoxDef_ptr &() const // cast
   return this->ptr_;
 }
 
-CORBA_ValueBoxDef_var::operator ::CORBA_ValueBoxDef_ptr &() // cast 
+CORBA_ValueBoxDef_var::operator ::CORBA_ValueBoxDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -10875,7 +11111,7 @@ CORBA_ValueBoxDef_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class CORBA_ValueBoxDef_out
+// Operations for class CORBA_ValueBoxDef_out
 // *************************************************************
 
 CORBA_ValueBoxDef_out::CORBA_ValueBoxDef_out (CORBA_ValueBoxDef_ptr &p)
@@ -10941,24 +11177,24 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -10975,7 +11211,7 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -10988,7 +11224,7 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::arguments (CORBA:
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -11000,12 +11236,12 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::exceptions (CORBA
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -11014,17 +11250,17 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (CORBA::En
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (CORBA_IDLType_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -11035,24 +11271,24 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -11062,14 +11298,14 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set &);
 
   CORBA_IDLType_ptr original_type_def_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     original_type_def_ (original_type_def)
@@ -11083,15 +11319,16 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::arguments (CORBA:
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_original_type_def = parameter_list->length ();
-  parameter_list->length (length_original_type_def + 1);
-  (*parameter_list)[length_original_type_def].argument <<=  this->original_type_def_;
-  
-  (*parameter_list)[length_original_type_def].mode = Dynamic::PARAM_IN;
-  
+
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+
+    (*parameter_list)[len].argument <<=  this->original_type_def_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+
   return safe_parameter_list._retn ();
 }
 
@@ -11103,12 +11340,12 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::exceptions (CORBA
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -11117,14 +11354,14 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::result (CORBA::En
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 _TAO_CORBA_ValueBoxDef_Proxy_Impl::_TAO_CORBA_ValueBoxDef_Proxy_Impl (void)
@@ -11143,16 +11380,16 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA_IDLType_ptr _tao_retval = CORBA_IDLType::_nil ();
   CORBA_IDLType_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_original_type_def",
@@ -11161,17 +11398,21 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get ri (
         &_tao_call,
@@ -11179,43 +11420,66 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -11225,74 +11489,55 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
@@ -11304,15 +11549,15 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_original_type_def",
@@ -11321,17 +11566,21 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set ri (
         &_tao_call,
@@ -11340,31 +11589,40 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << original_type_def)
@@ -11372,84 +11630,81 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -11519,13 +11774,13 @@ CORBA_ValueBoxDef::CORBA_ValueBoxDef_setup_collocation (int collocated)
   else
     this->the_TAO_CORBA_ValueBoxDef_Proxy_Broker_ =
       ::_TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker::the_TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_TypedefDef_setup_collocation (collocated);
 }
 
-void CORBA_ValueBoxDef::_tao_any_destructor (void *x)
+void CORBA_ValueBoxDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA_ValueBoxDef *tmp = ACE_static_cast (CORBA_ValueBoxDef*,x);
+  CORBA_ValueBoxDef *tmp = ACE_static_cast (CORBA_ValueBoxDef*, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -11572,14 +11827,14 @@ CORBA_ValueBoxDef_ptr CORBA_ValueBoxDef::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           CORBA_ValueBoxDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::CORBA_ValueBoxDef (stub, 0, obj->_servant ()), CORBA_ValueBoxDef::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -11675,7 +11930,7 @@ void *CORBA_ValueBoxDef::_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;
@@ -11693,10 +11948,10 @@ CORBA_IDLType_ptr CORBA_ValueBoxDef::original_type_def (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ValueBoxDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ValueBoxDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ValueBoxDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.original_type_def (
       this,
       ACE_TRY_ENV
@@ -11711,10 +11966,10 @@ void CORBA_ValueBoxDef::original_type_def (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_ValueBoxDef_Proxy_Impl &proxy = 
+  _TAO_CORBA_ValueBoxDef_Proxy_Impl &proxy =
     this->the_TAO_CORBA_ValueBoxDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.original_type_def (
       this,
       original_type_def,
@@ -11728,7 +11983,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_FixedDef_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        CORBA::_tc_FixedDef, 
+        CORBA::_tc_FixedDef,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -11744,13 +11999,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_FixedDef_ptr &_tao
   {
     _tao_elem = CORBA_FixedDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_FixedDef, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -11819,13 +12074,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ValueMember
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueMember, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -11910,13 +12165,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ValueMemberS
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueMemberSeq, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -11963,7 +12218,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_ValueMemberDef_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        CORBA::_tc_ValueMemberDef, 
+        CORBA::_tc_ValueMemberDef,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -11979,13 +12234,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ValueMemberDef_ptr
   {
     _tao_elem = CORBA_ValueMemberDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueMemberDef, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -12024,7 +12279,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_ValueDef_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        CORBA::_tc_ValueDef, 
+        CORBA::_tc_ValueDef,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -12040,13 +12295,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ValueDef_ptr &_tao
   {
     _tao_elem = CORBA_ValueDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueDef, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -12115,13 +12370,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ValueDef::Fu
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA_ValueDef::_tc_FullValueDescription, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -12198,13 +12453,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ValueDescrip
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueDescription, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -12251,7 +12506,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_ValueBoxDef_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        CORBA::_tc_ValueBoxDef, 
+        CORBA::_tc_ValueBoxDef,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -12267,13 +12522,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ValueBoxDef_ptr &_
   {
     _tao_elem = CORBA_ValueBoxDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueBoxDef, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -12371,7 +12626,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;
@@ -12491,4 +12746,3 @@ CORBA::Boolean operator>> (
   ACE_ENDTRY;
   return 0;
 }
-
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.h b/TAO/tao/IFR_Client/IFR_ExtendedC.h
index b7a05aac5f7..5b43aea4cf4 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.h
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.h
@@ -52,6 +52,7 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+
 #if !defined (_CORBA_FIXEDDEF___PTR_CH_)
 #define _CORBA_FIXEDDEF___PTR_CH_
 
@@ -68,29 +69,32 @@ class TAO_IFR_Client_Export CORBA_FixedDef_var : public TAO_Base_var
 {
 public:
   CORBA_FixedDef_var (void); // default constructor
-  CORBA_FixedDef_var (CORBA_FixedDef_ptr p) : ptr_ (p) {} 
+  CORBA_FixedDef_var (CORBA_FixedDef_ptr p) : ptr_ (p) {}
   CORBA_FixedDef_var (const CORBA_FixedDef_var &); // copy constructor
   ~CORBA_FixedDef_var (void); // destructor
-  
+
   CORBA_FixedDef_var &operator= (CORBA_FixedDef_ptr);
   CORBA_FixedDef_var &operator= (const CORBA_FixedDef_var &);
   CORBA_FixedDef_ptr operator-> (void) const;
-  
+
   operator const CORBA_FixedDef_ptr &() const;
   operator CORBA_FixedDef_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   CORBA_FixedDef_ptr in (void) const;
   CORBA_FixedDef_ptr &inout (void);
   CORBA_FixedDef_ptr &out (void);
   CORBA_FixedDef_ptr _retn (void);
   CORBA_FixedDef_ptr ptr (void) const;
-  
+
   // Hooks used by template sequence and object manager classes
   // for non-defined forward declared interfaces.
   static CORBA_FixedDef_ptr duplicate (CORBA_FixedDef_ptr);
   static void release (CORBA_FixedDef_ptr);
   static CORBA_FixedDef_ptr nil (void);
-  static CORBA_FixedDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA_FixedDef_ptr narrow (
+      CORBA::Object *,
+      CORBA::Environment &
+    );
   static CORBA::Object * upcast (void *);
 
 private:
@@ -137,7 +141,8 @@ class _TAO_CORBA_FixedDef_Remote_Proxy_Impl;
 class _TAO_CORBA_FixedDef_Proxy_Broker;
 class _TAO_CORBA_FixedDef_Remote_Proxy_Broker;
 
-class TAO_IFR_Client_Export CORBA_FixedDef: public virtual CORBA_IDLType
+class TAO_IFR_Client_Export CORBA_FixedDef
+  : public virtual CORBA_IDLType
 {
 public:
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -147,16 +152,19 @@ public:
 
   // the static operations
   static CORBA_FixedDef_ptr _duplicate (CORBA_FixedDef_ptr obj);
+
   static CORBA_FixedDef_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
   static CORBA_FixedDef_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
   static CORBA_FixedDef_ptr _nil (void)
     {
       return (CORBA_FixedDef_ptr)0;
@@ -165,7 +173,7 @@ public:
   static void _tao_any_destructor (void*);
 
   virtual CORBA::UShort digits (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -174,7 +182,7 @@ public:
 
   virtual void digits (
       CORBA::UShort digits,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -182,7 +190,7 @@ public:
     ));
 
   virtual CORBA::Short scale (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -191,7 +199,7 @@ public:
 
   virtual void scale (
       CORBA::Short scale,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -199,58 +207,57 @@ public:
     ));
 
   virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
+      const CORBA::Char *type_id,
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
   virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
+
   virtual const char* _interface_repository_id (void) const;
 
 private:
   _TAO_CORBA_FixedDef_Proxy_Broker *the_TAO_CORBA_FixedDef_Proxy_Broker_;
-  
+
 protected:
   CORBA_FixedDef (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void CORBA_FixedDef_setup_collocation (int collocated);
-    
-    CORBA_FixedDef (
-      TAO_Stub *objref, 
+
+  // This methods travese the inheritance tree and set the
+  // parents piece of the given class in the right mode
+  virtual void CORBA_FixedDef_setup_collocation (int collocated);
+
+  CORBA_FixedDef (
+      TAO_Stub *objref,
       CORBA::Boolean _tao_collocated = 0,
       TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_CORBA_FixedDef_Remote_Proxy_Impl;
-    friend class _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_CORBA_FixedDef_Direct_Proxy_Impl;
-  
+    );
+
+  friend class _TAO_CORBA_FixedDef_Remote_Proxy_Impl;
+  friend class _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl;
+  friend class _TAO_CORBA_FixedDef_Direct_Proxy_Impl;
+
   virtual ~CORBA_FixedDef (void);
+
 private:
   CORBA_FixedDef (const CORBA_FixedDef &);
   void operator= (const CORBA_FixedDef &);
 };
 
-
 // The Proxy Implementations are used by each interface to
 // perform a call. Each different implementation encapsulate
 // an invocation logics.
 
 
 ///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
+//                    Base Proxy Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_CORBA_FixedDef_Proxy_Impl : 
-  public virtual _TAO_CORBA_IDLType_Proxy_Impl
+class TAO_IFR_Client_Export _TAO_CORBA_FixedDef_Proxy_Impl
+  : public virtual _TAO_CORBA_IDLType_Proxy_Impl
 {
 public:
   virtual ~_TAO_CORBA_FixedDef_Proxy_Impl (void) { }
-  
-    virtual CORBA::UShort digits (
+  virtual CORBA::UShort digits (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -284,31 +291,30 @@ public:
       CORBA::SystemException
     )) = 0;
 
+
 protected:
   _TAO_CORBA_FixedDef_Proxy_Impl (void);
-
 };
+
 //
-//                Base  Proxy Impl. Declaration
+//               End Base Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
 ///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
+//                Remote Proxy Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_CORBA_FixedDef_Remote_Proxy_Impl : 
-  public virtual _TAO_CORBA_FixedDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_IDLType_Remote_Proxy_Impl
-  
+class TAO_IFR_Client_Export _TAO_CORBA_FixedDef_Remote_Proxy_Impl
+  : public virtual _TAO_CORBA_FixedDef_Proxy_Impl,
+    public virtual TAO_Remote_Object_Proxy_Impl,
+    public virtual _TAO_CORBA_IDLType_Remote_Proxy_Impl
 {
 public:
   _TAO_CORBA_FixedDef_Remote_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_FixedDef_Remote_Proxy_Impl (void) { }
-  
-    virtual CORBA::UShort digits (
+  virtual CORBA::UShort digits (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -342,22 +348,21 @@ public:
       CORBA::SystemException
     ));
 
+
 };
 
 //
-//                Base  Proxy Impl. Declaration
+//             End Remote Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
 // The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
+// the right proxy for performing a call. In the new
 // collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
-
+// a call by call basis.
 
 
 ///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
+//                 Base Proxy Broker Declaration
 //
 
 class TAO_IFR_Client_Export _TAO_CORBA_FixedDef_Proxy_Broker
@@ -365,200 +370,213 @@ class TAO_IFR_Client_Export _TAO_CORBA_FixedDef_Proxy_Broker
 public:
   virtual ~_TAO_CORBA_FixedDef_Proxy_Broker (void);
   virtual _TAO_CORBA_FixedDef_Proxy_Impl &select_proxy (
-    CORBA_FixedDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
+      CORBA_FixedDef *object,
+      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+    ) = 0;
 
 protected:
   _TAO_CORBA_FixedDef_Proxy_Broker (void);
-  
+
 };
 
 //
-//              End Base Proxy Broker Declaration 
+//              End Base Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
 ///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
+//                 Remote Proxy Broker Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_CORBA_FixedDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_FixedDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_FixedDef_Remote_Proxy_Broker
+  : public virtual _TAO_CORBA_FixedDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_FixedDef_Remote_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_FixedDef_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_CORBA_FixedDef_Proxy_Impl &select_proxy (
-    CORBA_FixedDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
 
-private:
-  _TAO_CORBA_FixedDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
+  virtual _TAO_CORBA_FixedDef_Proxy_Impl &select_proxy (
+      CORBA_FixedDef *object,
+      CORBA_Environment &ACE_TRY_ENV
+    );
 
-public:
-  static _TAO_CORBA_FixedDef_Remote_Proxy_Broker *the_TAO_CORBA_FixedDef_Remote_Proxy_Broker (void);
-};
+  private:
+    _TAO_CORBA_FixedDef_Remote_Proxy_Impl remote_proxy_impl_;
 
+  public:
+    // This member function is used to get an handle to the unique instance
+    // of the Remote Proxy Broker that is available for a given
+    // interface.
+    static _TAO_CORBA_FixedDef_Remote_Proxy_Broker *the_TAO_CORBA_FixedDef_Remote_Proxy_Broker (void);
+  };
 
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+  //
+  //              End Remote Proxy Broker Declaration
+  ///////////////////////////////////////////////////////////////////////
 
 
 #endif /* end #if !defined */
 
-struct CORBA_ValueMember;
-class CORBA_ValueMember_var;
+  struct CORBA_ValueMember;
+  class CORBA_ValueMember_var;
 
-struct TAO_IFR_Client_Export CORBA_ValueMember
-{
+  struct TAO_IFR_Client_Export CORBA_ValueMember
+  {
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_ValueMember_var _var_type;
+    typedef CORBA_ValueMember_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-  static void _tao_any_destructor (void*);
+    static void _tao_any_destructor (void*);
 
-  TAO_String_Manager name;
-  TAO_String_Manager id;
-  TAO_String_Manager defined_in;
-  TAO_String_Manager version;
-  CORBA::TypeCode_var type;
-  CORBA_IDLType_var type_def;
-  CORBA::Visibility access;
-};
+    TAO_String_Manager name;
+    TAO_String_Manager id;
+    TAO_String_Manager defined_in;
+    TAO_String_Manager version;
+    CORBA::TypeCode_var type;
+    CORBA_IDLType_var type_def;
+    CORBA::Visibility access;
 
-class TAO_IFR_Client_Export CORBA_ValueMember_var
-{
-public:
-  CORBA_ValueMember_var (void); // default constructor
-  CORBA_ValueMember_var (CORBA_ValueMember *);
-  CORBA_ValueMember_var (const CORBA_ValueMember_var &); // copy constructor
-  ~CORBA_ValueMember_var (void); // destructor
-  
-  CORBA_ValueMember_var &operator= (CORBA_ValueMember *);
-  CORBA_ValueMember_var &operator= (const CORBA_ValueMember_var &);
-  CORBA_ValueMember *operator-> (void);
-  const CORBA_ValueMember *operator-> (void) const;
-  
-  operator const CORBA_ValueMember &() const;
-  operator CORBA_ValueMember &();
-  operator CORBA_ValueMember &() const;
-  operator CORBA_ValueMember *&(); // variable-size types only
-  
-  // in, inout, out, _retn 
-  const CORBA_ValueMember &in (void) const;
-  CORBA_ValueMember &inout (void);
-  CORBA_ValueMember *&out (void);
-  CORBA_ValueMember *_retn (void);
-  CORBA_ValueMember *ptr (void) const;
+  };
 
-private:
-  CORBA_ValueMember *ptr_;
-};
+  class TAO_IFR_Client_Export CORBA_ValueMember_var
+  {
+  public:
+    CORBA_ValueMember_var (void);
+    CORBA_ValueMember_var (CORBA_ValueMember *);
+    CORBA_ValueMember_var (const CORBA_ValueMember_var &);
+    ~CORBA_ValueMember_var (void);
+
+    CORBA_ValueMember_var &operator= (CORBA_ValueMember *);
+    CORBA_ValueMember_var &operator= (const CORBA_ValueMember_var &);
+    CORBA_ValueMember *operator-> (void);
+    const CORBA_ValueMember *operator-> (void) const;
+
+    operator const CORBA_ValueMember &() const;
+    operator CORBA_ValueMember &();
+    operator CORBA_ValueMember &() const;
+    // Variable-size types only.
+    operator CORBA_ValueMember *&();
+
+    // in, inout, out, _retn
+    const CORBA_ValueMember &in (void) const;
+    CORBA_ValueMember &inout (void);
+    CORBA_ValueMember *&out (void);
+    CORBA_ValueMember *_retn (void);
+    CORBA_ValueMember *ptr (void) const;
 
-class TAO_IFR_Client_Export CORBA_ValueMember_out
-{
-public:
-  CORBA_ValueMember_out (CORBA_ValueMember *&);
-  CORBA_ValueMember_out (CORBA_ValueMember_var &);
-  CORBA_ValueMember_out (const CORBA_ValueMember_out &);
-  CORBA_ValueMember_out &operator= (const CORBA_ValueMember_out &);
-  CORBA_ValueMember_out &operator= (CORBA_ValueMember *);
-  operator CORBA_ValueMember *&();
-  CORBA_ValueMember *&ptr (void);
-  CORBA_ValueMember *operator-> (void);
-  
-private:
-  CORBA_ValueMember *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_ValueMember_var &);
-};
+  private:
+    CORBA_ValueMember *ptr_;
+  };
+
+  class TAO_IFR_Client_Export CORBA_ValueMember_out
+  {
+  public:
+    CORBA_ValueMember_out (CORBA_ValueMember *&);
+    CORBA_ValueMember_out (CORBA_ValueMember_var &);
+    CORBA_ValueMember_out (const CORBA_ValueMember_out &);
+    CORBA_ValueMember_out &operator= (const CORBA_ValueMember_out &);
+    CORBA_ValueMember_out &operator= (CORBA_ValueMember *);
+    operator CORBA_ValueMember *&();
+    CORBA_ValueMember *&ptr (void);
+    CORBA_ValueMember *operator-> (void);
+
+  private:
+    CORBA_ValueMember *&ptr_;
+    // Assignment from T_var not allowed.
+    void operator= (const CORBA_ValueMember_var &);
+  };
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_VALUEMEMBERSEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_VALUEMEMBERSEQ_CH_
 
-  class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq : public TAO_Unbounded_Base_Sequence
+  class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq
+    : public TAO_Unbounded_Base_Sequence
   {
   public:
     // = Initialization and termination methods.
-    
-    _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (void); // Default constructor.
-    _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (CORBA::ULong maximum,
-      CORBA::ULong length,
-      CORBA_ValueMember *data,
-      CORBA::Boolean release = 0);
-    _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (const _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq &rhs);
-    _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq &operator= (const _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq &rhs);
-    virtual ~_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (void); // Dtor.
+    _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (void);
+    _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (CORBA::ULong maximum);
+    _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (
+        CORBA::ULong maximum,
+        CORBA::ULong length,
+        CORBA_ValueMember *data,
+        CORBA::Boolean release = 0
+      );
+    _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (
+        const _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq &rhs
+      );
+    _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq &operator= (
+        const _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq &rhs
+      );
+    virtual ~_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (void);
+
     // = Accessors.
     CORBA_ValueMember &operator[] (CORBA::ULong i);
     const CORBA_ValueMember &operator[] (CORBA::ULong i) const;
+
     // = Static operations.
     static CORBA_ValueMember *allocbuf (CORBA::ULong size);
     static void freebuf (CORBA_ValueMember *buffer);
+
+    // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    
     CORBA_ValueMember *get_buffer (CORBA::Boolean orphan = 0);
     const CORBA_ValueMember *get_buffer (void) const;
-    void replace (CORBA::ULong max,
-      CORBA::ULong length,
-      CORBA_ValueMember *data,
-      CORBA::Boolean release);
+    void replace (
+        CORBA::ULong max,
+        CORBA::ULong length,
+        CORBA_ValueMember *data,
+        CORBA::Boolean release
+      );
   };
 
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_VALUEMEMBERSEQ_CH_)
 #define _CORBA_VALUEMEMBERSEQ_CH_
 
-class CORBA_ValueMemberSeq;
-class CORBA_ValueMemberSeq_var;
+  class CORBA_ValueMemberSeq;
+  class CORBA_ValueMemberSeq_var;
 
-// *************************************************************
-// CORBA_ValueMemberSeq
-// *************************************************************
+  // *************************************************************
+  // CORBA_ValueMemberSeq
+  // *************************************************************
 
-class TAO_IFR_Client_Export CORBA_ValueMemberSeq : public 
+  class TAO_IFR_Client_Export CORBA_ValueMemberSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA_ValueMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-{
-public:
-  CORBA_ValueMemberSeq (void); // default ctor
-  CORBA_ValueMemberSeq (CORBA::ULong max); // uses max size
-  CORBA_ValueMemberSeq (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    CORBA_ValueMember *buffer, 
-    CORBA::Boolean release = 0
-  );
-  CORBA_ValueMemberSeq (const CORBA_ValueMemberSeq &); // copy ctor
-  ~CORBA_ValueMemberSeq (void);
-  static void _tao_any_destructor (void*);
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+  {
+  public:
+    CORBA_ValueMemberSeq (void); // default ctor
+    CORBA_ValueMemberSeq (CORBA::ULong max); // uses max size
+    CORBA_ValueMemberSeq (
+        CORBA::ULong max,
+        CORBA::ULong length,
+        CORBA_ValueMember *buffer,
+        CORBA::Boolean release = 0
+      );
+    CORBA_ValueMemberSeq (const CORBA_ValueMemberSeq &); // copy ctor
+    ~CORBA_ValueMemberSeq (void);
+    static void _tao_any_destructor (void*);
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_ValueMemberSeq_var _var_type;
+    typedef CORBA_ValueMemberSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-};
+
+  };
 
 #endif /* end #if !defined */
 
@@ -566,41 +584,41 @@ public:
 #if !defined (_CORBA_VALUEMEMBERSEQ___VAR_CH_)
 #define _CORBA_VALUEMEMBERSEQ___VAR_CH_
 
-// *************************************************************
-// class CORBA_ValueMemberSeq_var
-// *************************************************************
+  // *************************************************************
+  // class CORBA_ValueMemberSeq_var
+  // *************************************************************
 
-class TAO_IFR_Client_Export CORBA_ValueMemberSeq_var
-{
-public:
-  CORBA_ValueMemberSeq_var (void); // default constructor
-  CORBA_ValueMemberSeq_var (CORBA_ValueMemberSeq *);
-  CORBA_ValueMemberSeq_var (const CORBA_ValueMemberSeq_var &); // copy constructor
-  ~CORBA_ValueMemberSeq_var (void); // destructor
-  
-  CORBA_ValueMemberSeq_var &operator= (CORBA_ValueMemberSeq *);
-  CORBA_ValueMemberSeq_var &operator= (const CORBA_ValueMemberSeq_var &);
-  CORBA_ValueMemberSeq *operator-> (void);
-  const CORBA_ValueMemberSeq *operator-> (void) const;
-  
-  operator const CORBA_ValueMemberSeq &() const;
-  operator CORBA_ValueMemberSeq &();
-  operator CORBA_ValueMemberSeq &() const;
-  operator CORBA_ValueMemberSeq *&(); // variable-size base types only
-  
-  CORBA_ValueMember & operator[] (CORBA::ULong index);
-  const CORBA_ValueMember & operator[] (CORBA::ULong index) const;
-  
-  // in, inout, out, _retn 
-  const CORBA_ValueMemberSeq &in (void) const;
-  CORBA_ValueMemberSeq &inout (void);
-  CORBA_ValueMemberSeq *&out (void);
-  CORBA_ValueMemberSeq *_retn (void);
-  CORBA_ValueMemberSeq *ptr (void) const;
+  class TAO_IFR_Client_Export CORBA_ValueMemberSeq_var
+  {
+  public:
+    CORBA_ValueMemberSeq_var (void);
+    CORBA_ValueMemberSeq_var (CORBA_ValueMemberSeq *);
+    CORBA_ValueMemberSeq_var (const CORBA_ValueMemberSeq_var &);
+    ~CORBA_ValueMemberSeq_var (void);
+
+    CORBA_ValueMemberSeq_var &operator= (CORBA_ValueMemberSeq *);
+    CORBA_ValueMemberSeq_var &operator= (const CORBA_ValueMemberSeq_var &);
+    CORBA_ValueMemberSeq *operator-> (void);
+    const CORBA_ValueMemberSeq *operator-> (void) const;
+
+    operator const CORBA_ValueMemberSeq &() const;
+    operator CORBA_ValueMemberSeq &();
+    operator CORBA_ValueMemberSeq &() const;
+    operator CORBA_ValueMemberSeq *&(); // variable-size base types only
+
+    CORBA_ValueMember & operator[] (CORBA::ULong index);
+    const CORBA_ValueMember & operator[] (CORBA::ULong index) const;
+
+    // in, inout, out, _retn
+    const CORBA_ValueMemberSeq &in (void) const;
+    CORBA_ValueMemberSeq &inout (void);
+    CORBA_ValueMemberSeq *&out (void);
+    CORBA_ValueMemberSeq *_retn (void);
+    CORBA_ValueMemberSeq *ptr (void) const;
 
-private:
-  CORBA_ValueMemberSeq *ptr_;
-};
+  private:
+    CORBA_ValueMemberSeq *ptr_;
+  };
 
 
 #endif /* end #if !defined */
@@ -609,24 +627,24 @@ private:
 #if !defined (_CORBA_VALUEMEMBERSEQ___OUT_CH_)
 #define _CORBA_VALUEMEMBERSEQ___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_ValueMemberSeq_out
-{
-public:
-  CORBA_ValueMemberSeq_out (CORBA_ValueMemberSeq *&);
-  CORBA_ValueMemberSeq_out (CORBA_ValueMemberSeq_var &);
-  CORBA_ValueMemberSeq_out (const CORBA_ValueMemberSeq_out &);
-  CORBA_ValueMemberSeq_out &operator= (const CORBA_ValueMemberSeq_out &);
-  CORBA_ValueMemberSeq_out &operator= (CORBA_ValueMemberSeq *);
-  operator CORBA_ValueMemberSeq *&();
-  CORBA_ValueMemberSeq *&ptr (void);
-  CORBA_ValueMemberSeq *operator-> (void);
-  CORBA_ValueMember & operator[] (CORBA::ULong index);
-  
-private:
-  CORBA_ValueMemberSeq *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_ValueMemberSeq_var &);
-};
+  class TAO_IFR_Client_Export CORBA_ValueMemberSeq_out
+  {
+  public:
+    CORBA_ValueMemberSeq_out (CORBA_ValueMemberSeq *&);
+    CORBA_ValueMemberSeq_out (CORBA_ValueMemberSeq_var &);
+    CORBA_ValueMemberSeq_out (const CORBA_ValueMemberSeq_out &);
+    CORBA_ValueMemberSeq_out &operator= (const CORBA_ValueMemberSeq_out &);
+    CORBA_ValueMemberSeq_out &operator= (CORBA_ValueMemberSeq *);
+    operator CORBA_ValueMemberSeq *&();
+    CORBA_ValueMemberSeq *&ptr (void);
+    CORBA_ValueMemberSeq *operator-> (void);
+    CORBA_ValueMember & operator[] (CORBA::ULong index);
+
+  private:
+    CORBA_ValueMemberSeq *&ptr_;
+    // Assignment from T_var not allowed.
+    void operator= (const CORBA_ValueMemberSeq_var &);
+  };
 
 
 #endif /* end #if !defined */
@@ -635,8 +653,8 @@ private:
 #if !defined (_CORBA_VALUEMEMBERDEF___PTR_CH_)
 #define _CORBA_VALUEMEMBERDEF___PTR_CH_
 
-class CORBA_ValueMemberDef;
-typedef CORBA_ValueMemberDef *CORBA_ValueMemberDef_ptr;
+  class CORBA_ValueMemberDef;
+  typedef CORBA_ValueMemberDef *CORBA_ValueMemberDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -644,41 +662,44 @@ typedef CORBA_ValueMemberDef *CORBA_ValueMemberDef_ptr;
 #if !defined (_CORBA_VALUEMEMBERDEF___VAR_CH_)
 #define _CORBA_VALUEMEMBERDEF___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_ValueMemberDef_var : public TAO_Base_var
-{
-public:
-  CORBA_ValueMemberDef_var (void); // default constructor
-  CORBA_ValueMemberDef_var (CORBA_ValueMemberDef_ptr p) : ptr_ (p) {} 
-  CORBA_ValueMemberDef_var (const CORBA_ValueMemberDef_var &); // copy constructor
-  ~CORBA_ValueMemberDef_var (void); // destructor
-  
-  CORBA_ValueMemberDef_var &operator= (CORBA_ValueMemberDef_ptr);
-  CORBA_ValueMemberDef_var &operator= (const CORBA_ValueMemberDef_var &);
-  CORBA_ValueMemberDef_ptr operator-> (void) const;
-  
-  operator const CORBA_ValueMemberDef_ptr &() const;
-  operator CORBA_ValueMemberDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_ValueMemberDef_ptr in (void) const;
-  CORBA_ValueMemberDef_ptr &inout (void);
-  CORBA_ValueMemberDef_ptr &out (void);
-  CORBA_ValueMemberDef_ptr _retn (void);
-  CORBA_ValueMemberDef_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_ValueMemberDef_ptr duplicate (CORBA_ValueMemberDef_ptr);
-  static void release (CORBA_ValueMemberDef_ptr);
-  static CORBA_ValueMemberDef_ptr nil (void);
-  static CORBA_ValueMemberDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
+  class TAO_IFR_Client_Export CORBA_ValueMemberDef_var : public TAO_Base_var
+  {
+  public:
+    CORBA_ValueMemberDef_var (void); // default constructor
+    CORBA_ValueMemberDef_var (CORBA_ValueMemberDef_ptr p) : ptr_ (p) {}
+    CORBA_ValueMemberDef_var (const CORBA_ValueMemberDef_var &); // copy constructor
+    ~CORBA_ValueMemberDef_var (void); // destructor
+
+    CORBA_ValueMemberDef_var &operator= (CORBA_ValueMemberDef_ptr);
+    CORBA_ValueMemberDef_var &operator= (const CORBA_ValueMemberDef_var &);
+    CORBA_ValueMemberDef_ptr operator-> (void) const;
+
+    operator const CORBA_ValueMemberDef_ptr &() const;
+    operator CORBA_ValueMemberDef_ptr &();
+    // in, inout, out, _retn
+    CORBA_ValueMemberDef_ptr in (void) const;
+    CORBA_ValueMemberDef_ptr &inout (void);
+    CORBA_ValueMemberDef_ptr &out (void);
+    CORBA_ValueMemberDef_ptr _retn (void);
+    CORBA_ValueMemberDef_ptr ptr (void) const;
+
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static CORBA_ValueMemberDef_ptr duplicate (CORBA_ValueMemberDef_ptr);
+    static void release (CORBA_ValueMemberDef_ptr);
+    static CORBA_ValueMemberDef_ptr nil (void);
+    static CORBA_ValueMemberDef_ptr narrow (
+        CORBA::Object *,
+        CORBA::Environment &
+      );
+    static CORBA::Object * upcast (void *);
 
-private:
-  CORBA_ValueMemberDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_ValueMemberDef_var (const TAO_Base_var &rhs);
-  CORBA_ValueMemberDef_var &operator= (const TAO_Base_var &rhs);
-};
+  private:
+    CORBA_ValueMemberDef_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    CORBA_ValueMemberDef_var (const TAO_Base_var &rhs);
+    CORBA_ValueMemberDef_var &operator= (const TAO_Base_var &rhs);
+  };
 
 
 #endif /* end #if !defined */
@@ -687,22 +708,22 @@ private:
 #if !defined (_CORBA_VALUEMEMBERDEF___OUT_CH_)
 #define _CORBA_VALUEMEMBERDEF___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_ValueMemberDef_out
-{
-public:
-  CORBA_ValueMemberDef_out (CORBA_ValueMemberDef_ptr &);
-  CORBA_ValueMemberDef_out (CORBA_ValueMemberDef_var &);
-  CORBA_ValueMemberDef_out (const CORBA_ValueMemberDef_out &);
-  CORBA_ValueMemberDef_out &operator= (const CORBA_ValueMemberDef_out &);
-  CORBA_ValueMemberDef_out &operator= (const CORBA_ValueMemberDef_var &);
-  CORBA_ValueMemberDef_out &operator= (CORBA_ValueMemberDef_ptr);
-  operator CORBA_ValueMemberDef_ptr &();
-  CORBA_ValueMemberDef_ptr &ptr (void);
-  CORBA_ValueMemberDef_ptr operator-> (void);
+  class TAO_IFR_Client_Export CORBA_ValueMemberDef_out
+  {
+  public:
+    CORBA_ValueMemberDef_out (CORBA_ValueMemberDef_ptr &);
+    CORBA_ValueMemberDef_out (CORBA_ValueMemberDef_var &);
+    CORBA_ValueMemberDef_out (const CORBA_ValueMemberDef_out &);
+    CORBA_ValueMemberDef_out &operator= (const CORBA_ValueMemberDef_out &);
+    CORBA_ValueMemberDef_out &operator= (const CORBA_ValueMemberDef_var &);
+    CORBA_ValueMemberDef_out &operator= (CORBA_ValueMemberDef_ptr);
+    operator CORBA_ValueMemberDef_ptr &();
+    CORBA_ValueMemberDef_ptr &ptr (void);
+    CORBA_ValueMemberDef_ptr operator-> (void);
 
-private:
-  CORBA_ValueMemberDef_ptr &ptr_;
-};
+  private:
+    CORBA_ValueMemberDef_ptr &ptr_;
+  };
 
 
 #endif /* end #if !defined */
@@ -711,308 +732,309 @@ private:
 #if !defined (_CORBA_VALUEMEMBERDEF_CH_)
 #define _CORBA_VALUEMEMBERDEF_CH_
 
-// Forward Classes Declaration
-class _TAO_CORBA_ValueMemberDef_Proxy_Impl;
-class _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl;
-class _TAO_CORBA_ValueMemberDef_Proxy_Broker;
-class _TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker;
+  // Forward Classes Declaration
+  class _TAO_CORBA_ValueMemberDef_Proxy_Impl;
+  class _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl;
+  class _TAO_CORBA_ValueMemberDef_Proxy_Broker;
+  class _TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker;
 
-class TAO_IFR_Client_Export CORBA_ValueMemberDef: public virtual CORBA_Contained
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_ValueMemberDef_ptr _ptr_type;
-  typedef CORBA_ValueMemberDef_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
+  class TAO_IFR_Client_Export CORBA_ValueMemberDef
+    : public virtual CORBA_Contained
+  {
+  public:
+  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    typedef CORBA_ValueMemberDef_ptr _ptr_type;
+    typedef CORBA_ValueMemberDef_var _var_type;
+  #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+    // the static operations
+    static CORBA_ValueMemberDef_ptr _duplicate (CORBA_ValueMemberDef_ptr obj);
+
+    static CORBA_ValueMemberDef_ptr _narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
 
-  // the static operations
-  static CORBA_ValueMemberDef_ptr _duplicate (CORBA_ValueMemberDef_ptr obj);
-  static CORBA_ValueMemberDef_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_ValueMemberDef_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_ValueMemberDef_ptr _nil (void)
-    {
-      return (CORBA_ValueMemberDef_ptr)0;
-    }
+    static CORBA_ValueMemberDef_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
 
-  static void _tao_any_destructor (void*);
+    static CORBA_ValueMemberDef_ptr _nil (void)
+      {
+        return (CORBA_ValueMemberDef_ptr)0;
+      }
 
-  virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_IDLType_ptr type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    static void _tao_any_destructor (void*);
 
-  virtual void type_def (
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    virtual CORBA::TypeCode_ptr type (
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    virtual CORBA_IDLType_ptr type_def (
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    virtual void type_def (
+        CORBA_IDLType_ptr type_def,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    virtual CORBA::Visibility access (
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    virtual void access (
+        CORBA::Visibility access,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    virtual CORBA::Boolean _is_a (
+        const CORBA::Char *type_id,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
 
-  virtual CORBA::Visibility access (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    virtual void *_tao_QueryInterface (ptr_arith_t type);
 
-  virtual void access (
-      CORBA::Visibility access,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    virtual const char* _interface_repository_id (void) const;
 
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
+  private:
+    _TAO_CORBA_ValueMemberDef_Proxy_Broker *the_TAO_CORBA_ValueMemberDef_Proxy_Broker_;
 
-private:
-  _TAO_CORBA_ValueMemberDef_Proxy_Broker *the_TAO_CORBA_ValueMemberDef_Proxy_Broker_;
-  
-protected:
-  CORBA_ValueMemberDef (int collocated = 0);
-  
   protected:
+    CORBA_ValueMemberDef (int collocated = 0);
+
     // This methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode
     virtual void CORBA_ValueMemberDef_setup_collocation (int collocated);
-    
+
     CORBA_ValueMemberDef (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
+        TAO_Stub *objref,
+        CORBA::Boolean _tao_collocated = 0,
+        TAO_Abstract_ServantBase *servant = 0
       );
-    
+
     friend class _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl;
     friend class _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl;
     friend class _TAO_CORBA_ValueMemberDef_Direct_Proxy_Impl;
-  
-  virtual ~CORBA_ValueMemberDef (void);
-private:
-  CORBA_ValueMemberDef (const CORBA_ValueMemberDef &);
-  void operator= (const CORBA_ValueMemberDef &);
-};
 
+    virtual ~CORBA_ValueMemberDef (void);
 
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
+  private:
+    CORBA_ValueMemberDef (const CORBA_ValueMemberDef &);
+    void operator= (const CORBA_ValueMemberDef &);
+  };
 
+  // The Proxy Implementations are used by each interface to
+  // perform a call. Each different implementation encapsulate
+  // an invocation logics.
 
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
 
-class TAO_IFR_Client_Export _TAO_CORBA_ValueMemberDef_Proxy_Impl : 
-  public virtual _TAO_CORBA_Contained_Proxy_Impl
-{
-public:
-  virtual ~_TAO_CORBA_ValueMemberDef_Proxy_Impl (void) { }
-  
-    virtual CORBA::TypeCode_ptr type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
+  ///////////////////////////////////////////////////////////////////////
+  //                    Base Proxy Impl. Declaration
+  //
 
-  virtual CORBA_IDLType_ptr type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
+  class TAO_IFR_Client_Export _TAO_CORBA_ValueMemberDef_Proxy_Impl
+    : public virtual _TAO_CORBA_Contained_Proxy_Impl
+  {
+  public:
+    virtual ~_TAO_CORBA_ValueMemberDef_Proxy_Impl (void) { }
+    virtual CORBA::TypeCode_ptr type (
+        CORBA_Object *_collocated_tao_target_,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual CORBA_IDLType_ptr type_def (
+        CORBA_Object *_collocated_tao_target_,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual void type_def (
+        CORBA_Object *_collocated_tao_target_,
+        CORBA_IDLType_ptr type_def,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual CORBA::Visibility access (
+        CORBA_Object *_collocated_tao_target_,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual void access (
+        CORBA_Object *_collocated_tao_target_,
+        CORBA::Visibility access,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
 
-  virtual CORBA::Visibility access (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
 
-  virtual void access (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Visibility access,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
+  protected:
+    _TAO_CORBA_ValueMemberDef_Proxy_Impl (void);
+  };
 
-protected:
-  _TAO_CORBA_ValueMemberDef_Proxy_Impl (void);
+  //
+  //               End Base Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
 
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
 
+  ///////////////////////////////////////////////////////////////////////
+  //                Remote Proxy Impl. Declaration
+  //
 
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
+  class TAO_IFR_Client_Export _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl
+    : public virtual _TAO_CORBA_ValueMemberDef_Proxy_Impl,
+      public virtual TAO_Remote_Object_Proxy_Impl,
+      public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl
+  {
+  public:
+    _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl (void);
 
-class TAO_IFR_Client_Export _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl : 
-  public virtual _TAO_CORBA_ValueMemberDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl (void) { }
-  
+    virtual ~_TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl (void) { }
     virtual CORBA::TypeCode_ptr type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_IDLType_ptr type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Visibility access (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+        CORBA_Object *_collocated_tao_target_,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    virtual CORBA_IDLType_ptr type_def (
+        CORBA_Object *_collocated_tao_target_,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    virtual void type_def (
+        CORBA_Object *_collocated_tao_target_,
+        CORBA_IDLType_ptr type_def,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    virtual CORBA::Visibility access (
+        CORBA_Object *_collocated_tao_target_,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    virtual void access (
+        CORBA_Object *_collocated_tao_target_,
+        CORBA::Visibility access,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
 
-  virtual void access (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Visibility access,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
 
-};
+  };
 
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
+  //
+  //             End Remote Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
 
+  // The Proxy Brokers are used by each interface to get
+  // the right proxy for performing a call. In the new
+  // collocation scheme, the proxy to be used can vary on
+  // a call by call basis.
 
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
 
+  ///////////////////////////////////////////////////////////////////////
+  //                 Base Proxy Broker Declaration
+  //
 
+    class TAO_IFR_Client_Export _TAO_CORBA_ValueMemberDef_Proxy_Broker
+  {
+  public:
+    virtual ~_TAO_CORBA_ValueMemberDef_Proxy_Broker (void);
+    virtual _TAO_CORBA_ValueMemberDef_Proxy_Impl &select_proxy (
+        CORBA_ValueMemberDef *object,
+        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+      ) = 0;
 
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
+  protected:
+    _TAO_CORBA_ValueMemberDef_Proxy_Broker (void);
 
-class TAO_IFR_Client_Export _TAO_CORBA_ValueMemberDef_Proxy_Broker
-{
-public:
-  virtual ~_TAO_CORBA_ValueMemberDef_Proxy_Broker (void);
-  virtual _TAO_CORBA_ValueMemberDef_Proxy_Impl &select_proxy (
-    CORBA_ValueMemberDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
+  };
 
-protected:
-  _TAO_CORBA_ValueMemberDef_Proxy_Broker (void);
-  
-};
+  //
+  //              End Base Proxy Broker Declaration
+  ///////////////////////////////////////////////////////////////////////
 
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
 
+  ///////////////////////////////////////////////////////////////////////
+  //                 Remote Proxy Broker Declaration
+  //
 
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
+  class TAO_IFR_Client_Export _TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker
+    : public virtual _TAO_CORBA_ValueMemberDef_Proxy_Broker
+  {
+  public:
+    _TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker (void);
 
-class TAO_IFR_Client_Export _TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_ValueMemberDef_Proxy_Broker
-{
-public: 
-  _TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_CORBA_ValueMemberDef_Proxy_Impl &select_proxy (
-    CORBA_ValueMemberDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
+    virtual ~_TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker (void);
 
-private:
-  _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
+    virtual _TAO_CORBA_ValueMemberDef_Proxy_Impl &select_proxy (
+        CORBA_ValueMemberDef *object,
+        CORBA_Environment &ACE_TRY_ENV
+      );
 
-public:
-  static _TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker *the_TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker (void);
-};
+    private:
+      _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl remote_proxy_impl_;
 
+    public:
+      // This member function is used to get an handle to the unique instance
+      // of the Remote Proxy Broker that is available for a given
+      // interface.
+      static _TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker *the_TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker (void);
+    };
 
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+    //
+    //              End Remote Proxy Broker Declaration
+    ///////////////////////////////////////////////////////////////////////
 
 
 #endif /* end #if !defined */
@@ -1021,8 +1043,8 @@ public:
 #if !defined (_CORBA_VALUEDEF___PTR_CH_)
 #define _CORBA_VALUEDEF___PTR_CH_
 
-class CORBA_ValueDef;
-typedef CORBA_ValueDef *CORBA_ValueDef_ptr;
+    class CORBA_ValueDef;
+    typedef CORBA_ValueDef *CORBA_ValueDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -1030,41 +1052,44 @@ typedef CORBA_ValueDef *CORBA_ValueDef_ptr;
 #if !defined (_CORBA_VALUEDEF___VAR_CH_)
 #define _CORBA_VALUEDEF___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_ValueDef_var : public TAO_Base_var
-{
-public:
-  CORBA_ValueDef_var (void); // default constructor
-  CORBA_ValueDef_var (CORBA_ValueDef_ptr p) : ptr_ (p) {} 
-  CORBA_ValueDef_var (const CORBA_ValueDef_var &); // copy constructor
-  ~CORBA_ValueDef_var (void); // destructor
-  
-  CORBA_ValueDef_var &operator= (CORBA_ValueDef_ptr);
-  CORBA_ValueDef_var &operator= (const CORBA_ValueDef_var &);
-  CORBA_ValueDef_ptr operator-> (void) const;
-  
-  operator const CORBA_ValueDef_ptr &() const;
-  operator CORBA_ValueDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_ValueDef_ptr in (void) const;
-  CORBA_ValueDef_ptr &inout (void);
-  CORBA_ValueDef_ptr &out (void);
-  CORBA_ValueDef_ptr _retn (void);
-  CORBA_ValueDef_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_ValueDef_ptr duplicate (CORBA_ValueDef_ptr);
-  static void release (CORBA_ValueDef_ptr);
-  static CORBA_ValueDef_ptr nil (void);
-  static CORBA_ValueDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
-
-private:
-  CORBA_ValueDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_ValueDef_var (const TAO_Base_var &rhs);
-  CORBA_ValueDef_var &operator= (const TAO_Base_var &rhs);
-};
+    class TAO_IFR_Client_Export CORBA_ValueDef_var : public TAO_Base_var
+    {
+    public:
+      CORBA_ValueDef_var (void); // default constructor
+      CORBA_ValueDef_var (CORBA_ValueDef_ptr p) : ptr_ (p) {}
+      CORBA_ValueDef_var (const CORBA_ValueDef_var &); // copy constructor
+      ~CORBA_ValueDef_var (void); // destructor
+
+      CORBA_ValueDef_var &operator= (CORBA_ValueDef_ptr);
+      CORBA_ValueDef_var &operator= (const CORBA_ValueDef_var &);
+      CORBA_ValueDef_ptr operator-> (void) const;
+
+      operator const CORBA_ValueDef_ptr &() const;
+      operator CORBA_ValueDef_ptr &();
+      // in, inout, out, _retn
+      CORBA_ValueDef_ptr in (void) const;
+      CORBA_ValueDef_ptr &inout (void);
+      CORBA_ValueDef_ptr &out (void);
+      CORBA_ValueDef_ptr _retn (void);
+      CORBA_ValueDef_ptr ptr (void) const;
+
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static CORBA_ValueDef_ptr duplicate (CORBA_ValueDef_ptr);
+      static void release (CORBA_ValueDef_ptr);
+      static CORBA_ValueDef_ptr nil (void);
+      static CORBA_ValueDef_ptr narrow (
+          CORBA::Object *,
+          CORBA::Environment &
+        );
+      static CORBA::Object * upcast (void *);
+
+    private:
+      CORBA_ValueDef_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      CORBA_ValueDef_var (const TAO_Base_var &rhs);
+      CORBA_ValueDef_var &operator= (const TAO_Base_var &rhs);
+    };
 
 
 #endif /* end #if !defined */
@@ -1073,22 +1098,22 @@ private:
 #if !defined (_CORBA_VALUEDEF___OUT_CH_)
 #define _CORBA_VALUEDEF___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_ValueDef_out
-{
-public:
-  CORBA_ValueDef_out (CORBA_ValueDef_ptr &);
-  CORBA_ValueDef_out (CORBA_ValueDef_var &);
-  CORBA_ValueDef_out (const CORBA_ValueDef_out &);
-  CORBA_ValueDef_out &operator= (const CORBA_ValueDef_out &);
-  CORBA_ValueDef_out &operator= (const CORBA_ValueDef_var &);
-  CORBA_ValueDef_out &operator= (CORBA_ValueDef_ptr);
-  operator CORBA_ValueDef_ptr &();
-  CORBA_ValueDef_ptr &ptr (void);
-  CORBA_ValueDef_ptr operator-> (void);
-
-private:
-  CORBA_ValueDef_ptr &ptr_;
-};
+    class TAO_IFR_Client_Export CORBA_ValueDef_out
+    {
+    public:
+      CORBA_ValueDef_out (CORBA_ValueDef_ptr &);
+      CORBA_ValueDef_out (CORBA_ValueDef_var &);
+      CORBA_ValueDef_out (const CORBA_ValueDef_out &);
+      CORBA_ValueDef_out &operator= (const CORBA_ValueDef_out &);
+      CORBA_ValueDef_out &operator= (const CORBA_ValueDef_var &);
+      CORBA_ValueDef_out &operator= (CORBA_ValueDef_ptr);
+      operator CORBA_ValueDef_ptr &();
+      CORBA_ValueDef_ptr &ptr (void);
+      CORBA_ValueDef_ptr operator-> (void);
+
+    private:
+      CORBA_ValueDef_ptr &ptr_;
+    };
 
 
 #endif /* end #if !defined */
@@ -1097,879 +1122,886 @@ private:
 #if !defined (_CORBA_VALUEDEF_CH_)
 #define _CORBA_VALUEDEF_CH_
 
-// Forward Classes Declaration
-class _TAO_CORBA_ValueDef_Proxy_Impl;
-class _TAO_CORBA_ValueDef_Remote_Proxy_Impl;
-class _TAO_CORBA_ValueDef_Proxy_Broker;
-class _TAO_CORBA_ValueDef_Remote_Proxy_Broker;
+    // Forward Classes Declaration
+    class _TAO_CORBA_ValueDef_Proxy_Impl;
+    class _TAO_CORBA_ValueDef_Remote_Proxy_Impl;
+    class _TAO_CORBA_ValueDef_Proxy_Broker;
+    class _TAO_CORBA_ValueDef_Remote_Proxy_Broker;
 
-class TAO_IFR_Client_Export CORBA_ValueDef: public virtual CORBA_Container, public virtual CORBA_Contained, public virtual CORBA_IDLType
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_ValueDef_ptr _ptr_type;
-  typedef CORBA_ValueDef_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static CORBA_ValueDef_ptr _duplicate (CORBA_ValueDef_ptr obj);
-  static CORBA_ValueDef_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_ValueDef_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_ValueDef_ptr _nil (void)
+    class TAO_IFR_Client_Export CORBA_ValueDef
+      : public virtual CORBA_Container,
+        public virtual CORBA_Contained,
+        public virtual CORBA_IDLType
     {
-      return (CORBA_ValueDef_ptr)0;
-    }
-
-  static void _tao_any_destructor (void*);
-
-  virtual CORBA_InterfaceDefSeq * supported_interfaces (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void supported_interfaces (
-      const CORBA_InterfaceDefSeq & supported_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_InitializerSeq * initializers (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void initializers (
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_ValueDef_ptr base_value (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void base_value (
-      CORBA_ValueDef_ptr base_value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_ValueDefSeq * abstract_base_values (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void abstract_base_values (
-      const CORBA_ValueDefSeq & abstract_base_values,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean is_abstract (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void is_abstract (
-      CORBA::Boolean is_abstract,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean is_custom (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void is_custom (
-      CORBA::Boolean is_custom,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean is_truncatable (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void is_truncatable (
-      CORBA::Boolean is_truncatable,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  struct FullValueDescription;
-  class FullValueDescription_var;
-  
-  struct TAO_IFR_Client_Export FullValueDescription
-  {
+    public:
+    #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+      typedef CORBA_ValueDef_ptr _ptr_type;
+      typedef CORBA_ValueDef_var _var_type;
+    #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+      // the static operations
+      static CORBA_ValueDef_ptr _duplicate (CORBA_ValueDef_ptr obj);
+
+      static CORBA_ValueDef_ptr _narrow (
+          CORBA::Object_ptr obj,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        );
+
+      static CORBA_ValueDef_ptr _unchecked_narrow (
+          CORBA::Object_ptr obj,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        );
+
+      static CORBA_ValueDef_ptr _nil (void)
+        {
+          return (CORBA_ValueDef_ptr)0;
+        }
+
+      static void _tao_any_destructor (void*);
+
+      virtual CORBA_InterfaceDefSeq * supported_interfaces (
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual void supported_interfaces (
+          const CORBA_InterfaceDefSeq & supported_interfaces,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_InitializerSeq * initializers (
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual void initializers (
+          const CORBA_InitializerSeq & initializers,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_ValueDef_ptr base_value (
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual void base_value (
+          CORBA_ValueDef_ptr base_value,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_ValueDefSeq * abstract_base_values (
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual void abstract_base_values (
+          const CORBA_ValueDefSeq & abstract_base_values,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA::Boolean is_abstract (
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual void is_abstract (
+          CORBA::Boolean is_abstract,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA::Boolean is_custom (
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual void is_custom (
+          CORBA::Boolean is_custom,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA::Boolean is_truncatable (
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual void is_truncatable (
+          CORBA::Boolean is_truncatable,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA::Boolean is_a (
+          const char * id,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      struct FullValueDescription;
+      class FullValueDescription_var;
+
+      struct TAO_IFR_Client_Export FullValueDescription
+      {
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef FullValueDescription_var _var_type;
+        typedef FullValueDescription_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-    static void _tao_any_destructor (void*);
-
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    CORBA::Boolean is_abstract;
-    CORBA::Boolean is_custom;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
-    CORBA_OpDescriptionSeq operations;
-    CORBA_AttrDescriptionSeq attributes;
-    CORBA_ValueMemberSeq members;
-    CORBA_InitializerSeq initializers;
-    CORBA_RepositoryIdSeq supported_interfaces;
-    CORBA_RepositoryIdSeq abstract_base_values;
-    CORBA::Boolean is_truncatable;
-    TAO_String_Manager base_value;
-    CORBA::TypeCode_var type;
-  };
-
-  class TAO_IFR_Client_Export FullValueDescription_var
-  {
-  public:
-    FullValueDescription_var (void); // default constructor
-    FullValueDescription_var (FullValueDescription *);
-    FullValueDescription_var (const FullValueDescription_var &); // copy constructor
-    ~FullValueDescription_var (void); // destructor
-    
-    FullValueDescription_var &operator= (FullValueDescription *);
-    FullValueDescription_var &operator= (const FullValueDescription_var &);
-    FullValueDescription *operator-> (void);
-    const FullValueDescription *operator-> (void) const;
-    
-    operator const FullValueDescription &() const;
-    operator FullValueDescription &();
-    operator FullValueDescription &() const;
-    operator FullValueDescription *&(); // variable-size types only
-    
-    // in, inout, out, _retn 
-    const FullValueDescription &in (void) const;
-    FullValueDescription &inout (void);
-    FullValueDescription *&out (void);
-    FullValueDescription *_retn (void);
-    FullValueDescription *ptr (void) const;
-
-  private:
-    FullValueDescription *ptr_;
-  };
-
-  class TAO_IFR_Client_Export FullValueDescription_out
-  {
-  public:
-    FullValueDescription_out (FullValueDescription *&);
-    FullValueDescription_out (FullValueDescription_var &);
-    FullValueDescription_out (const FullValueDescription_out &);
-    FullValueDescription_out &operator= (const FullValueDescription_out &);
-    FullValueDescription_out &operator= (FullValueDescription *);
-    operator FullValueDescription *&();
-    FullValueDescription *&ptr (void);
-    FullValueDescription *operator-> (void);
-    
-  private:
-    FullValueDescription *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const FullValueDescription_var &);
-  };
-
-  static CORBA::TypeCode_ptr _tc_FullValueDescription;
-
-  virtual CORBA_ValueDef::FullValueDescription * describe_value (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_ValueMemberDef_ptr create_value_member (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr type,
-      CORBA::Visibility access,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_AttributeDef_ptr create_attribute (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_OperationDef_ptr create_operation (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr result,
-      CORBA::OperationMode mode,
-      const CORBA_ParDescriptionSeq & params,
-      const CORBA_ExceptionDefSeq & exceptions,
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
-
-private:
-  _TAO_CORBA_ValueDef_Proxy_Broker *the_TAO_CORBA_ValueDef_Proxy_Broker_;
-  
-protected:
-  CORBA_ValueDef (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void CORBA_ValueDef_setup_collocation (int collocated);
-    
-    CORBA_ValueDef (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_CORBA_ValueDef_Remote_Proxy_Impl;
-    friend class _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_CORBA_ValueDef_Direct_Proxy_Impl;
-  
-  virtual ~CORBA_ValueDef (void);
-private:
-  CORBA_ValueDef (const CORBA_ValueDef &);
-  void operator= (const CORBA_ValueDef &);
-};
-
-
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_ValueDef_Proxy_Impl : 
-  public virtual _TAO_CORBA_Container_Proxy_Impl, 
-  public virtual _TAO_CORBA_Contained_Proxy_Impl, 
-  public virtual _TAO_CORBA_IDLType_Proxy_Impl
-{
-public:
-  virtual ~_TAO_CORBA_ValueDef_Proxy_Impl (void) { }
-  
-    virtual CORBA_InterfaceDefSeq * supported_interfaces (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void supported_interfaces (
-      CORBA_Object *_collocated_tao_target_,
-      const CORBA_InterfaceDefSeq & supported_interfaces,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_InitializerSeq * initializers (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void initializers (
-      CORBA_Object *_collocated_tao_target_,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_ValueDef_ptr base_value (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void base_value (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA_ValueDef_ptr base_value,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_ValueDefSeq * abstract_base_values (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void abstract_base_values (
-      CORBA_Object *_collocated_tao_target_,
-      const CORBA_ValueDefSeq & abstract_base_values,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA::Boolean is_abstract (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void is_abstract (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Boolean is_abstract,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA::Boolean is_custom (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void is_custom (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Boolean is_custom,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA::Boolean is_truncatable (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void is_truncatable (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Boolean is_truncatable,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA::Boolean is_a (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_ValueDef::FullValueDescription * describe_value (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_ValueMemberDef_ptr create_value_member (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr type,
-      CORBA::Visibility access,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_AttributeDef_ptr create_attribute (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_OperationDef_ptr create_operation (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr result,
-      CORBA::OperationMode mode,
-      const CORBA_ParDescriptionSeq & params,
-      const CORBA_ExceptionDefSeq & exceptions,
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-protected:
-  _TAO_CORBA_ValueDef_Proxy_Impl (void);
-
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_ValueDef_Remote_Proxy_Impl : 
-  public virtual _TAO_CORBA_ValueDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_Container_Remote_Proxy_Impl, 
-  public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl, 
-  public virtual _TAO_CORBA_IDLType_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_CORBA_ValueDef_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_CORBA_ValueDef_Remote_Proxy_Impl (void) { }
-  
-    virtual CORBA_InterfaceDefSeq * supported_interfaces (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void supported_interfaces (
-      CORBA_Object *_collocated_tao_target_,
-      const CORBA_InterfaceDefSeq & supported_interfaces,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_InitializerSeq * initializers (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void initializers (
-      CORBA_Object *_collocated_tao_target_,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_ValueDef_ptr base_value (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void base_value (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA_ValueDef_ptr base_value,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_ValueDefSeq * abstract_base_values (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void abstract_base_values (
-      CORBA_Object *_collocated_tao_target_,
-      const CORBA_ValueDefSeq & abstract_base_values,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean is_abstract (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void is_abstract (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Boolean is_abstract,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean is_custom (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void is_custom (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Boolean is_custom,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean is_truncatable (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void is_truncatable (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Boolean is_truncatable,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean is_a (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_ValueDef::FullValueDescription * describe_value (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_ValueMemberDef_ptr create_value_member (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr type,
-      CORBA::Visibility access,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_AttributeDef_ptr create_attribute (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_OperationDef_ptr create_operation (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr result,
-      CORBA::OperationMode mode,
-      const CORBA_ParDescriptionSeq & params,
-      const CORBA_ExceptionDefSeq & exceptions,
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-};
-
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
-
+        static void _tao_any_destructor (void*);
+
+        TAO_String_Manager name;
+        TAO_String_Manager id;
+        CORBA::Boolean is_abstract;
+        CORBA::Boolean is_custom;
+        TAO_String_Manager defined_in;
+        TAO_String_Manager version;
+        CORBA_OpDescriptionSeq operations;
+        CORBA_AttrDescriptionSeq attributes;
+        CORBA_ValueMemberSeq members;
+        CORBA_InitializerSeq initializers;
+        CORBA_RepositoryIdSeq supported_interfaces;
+        CORBA_RepositoryIdSeq abstract_base_values;
+        CORBA::Boolean is_truncatable;
+        TAO_String_Manager base_value;
+        CORBA::TypeCode_var type;
+
+      };
+
+      class TAO_IFR_Client_Export FullValueDescription_var
+      {
+      public:
+        FullValueDescription_var (void);
+        FullValueDescription_var (FullValueDescription *);
+        FullValueDescription_var (const FullValueDescription_var &);
+        ~FullValueDescription_var (void);
+
+        FullValueDescription_var &operator= (FullValueDescription *);
+        FullValueDescription_var &operator= (const FullValueDescription_var &);
+        FullValueDescription *operator-> (void);
+        const FullValueDescription *operator-> (void) const;
+
+        operator const FullValueDescription &() const;
+        operator FullValueDescription &();
+        operator FullValueDescription &() const;
+        // Variable-size types only.
+        operator FullValueDescription *&();
+
+        // in, inout, out, _retn
+        const FullValueDescription &in (void) const;
+        FullValueDescription &inout (void);
+        FullValueDescription *&out (void);
+        FullValueDescription *_retn (void);
+        FullValueDescription *ptr (void) const;
+
+      private:
+        FullValueDescription *ptr_;
+      };
+
+      class TAO_IFR_Client_Export FullValueDescription_out
+      {
+      public:
+        FullValueDescription_out (FullValueDescription *&);
+        FullValueDescription_out (FullValueDescription_var &);
+        FullValueDescription_out (const FullValueDescription_out &);
+        FullValueDescription_out &operator= (const FullValueDescription_out &);
+        FullValueDescription_out &operator= (FullValueDescription *);
+        operator FullValueDescription *&();
+        FullValueDescription *&ptr (void);
+        FullValueDescription *operator-> (void);
+
+      private:
+        FullValueDescription *&ptr_;
+        // Assignment from T_var not allowed.
+        void operator= (const FullValueDescription_var &);
+      };
+
+      static CORBA::TypeCode_ptr _tc_FullValueDescription;
+
+      virtual CORBA_ValueDef::FullValueDescription * describe_value (
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_ValueMemberDef_ptr create_value_member (
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA_IDLType_ptr type,
+          CORBA::Visibility access,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_AttributeDef_ptr create_attribute (
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA_IDLType_ptr type,
+          CORBA::AttributeMode mode,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_OperationDef_ptr create_operation (
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA_IDLType_ptr result,
+          CORBA::OperationMode mode,
+          const CORBA_ParDescriptionSeq & params,
+          const CORBA_ExceptionDefSeq & exceptions,
+          const CORBA_ContextIdSeq & contexts,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA::Boolean _is_a (
+          const CORBA::Char *type_id,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        );
+
+      virtual void *_tao_QueryInterface (ptr_arith_t type);
+
+      virtual const char* _interface_repository_id (void) const;
+
+    private:
+      _TAO_CORBA_ValueDef_Proxy_Broker *the_TAO_CORBA_ValueDef_Proxy_Broker_;
+
+    protected:
+      CORBA_ValueDef (int collocated = 0);
+
+      // This methods travese the inheritance tree and set the
+      // parents piece of the given class in the right mode
+      virtual void CORBA_ValueDef_setup_collocation (int collocated);
+
+      CORBA_ValueDef (
+          TAO_Stub *objref,
+          CORBA::Boolean _tao_collocated = 0,
+          TAO_Abstract_ServantBase *servant = 0
+        );
+
+      friend class _TAO_CORBA_ValueDef_Remote_Proxy_Impl;
+      friend class _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl;
+      friend class _TAO_CORBA_ValueDef_Direct_Proxy_Impl;
+
+      virtual ~CORBA_ValueDef (void);
+
+    private:
+      CORBA_ValueDef (const CORBA_ValueDef &);
+      void operator= (const CORBA_ValueDef &);
+    };
+
+    // The Proxy Implementations are used by each interface to
+    // perform a call. Each different implementation encapsulate
+    // an invocation logics.
+
+
+    ///////////////////////////////////////////////////////////////////////
+    //                    Base Proxy Impl. Declaration
+    //
+
+    class TAO_IFR_Client_Export _TAO_CORBA_ValueDef_Proxy_Impl
+      : public virtual _TAO_CORBA_Container_Proxy_Impl,
+        public virtual _TAO_CORBA_Contained_Proxy_Impl,
+        public virtual _TAO_CORBA_IDLType_Proxy_Impl
+    {
+    public:
+      virtual ~_TAO_CORBA_ValueDef_Proxy_Impl (void) { }
+      virtual CORBA_InterfaceDefSeq * supported_interfaces (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual void supported_interfaces (
+          CORBA_Object *_collocated_tao_target_,
+          const CORBA_InterfaceDefSeq & supported_interfaces,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual CORBA_InitializerSeq * initializers (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual void initializers (
+          CORBA_Object *_collocated_tao_target_,
+          const CORBA_InitializerSeq & initializers,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual CORBA_ValueDef_ptr base_value (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual void base_value (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA_ValueDef_ptr base_value,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual CORBA_ValueDefSeq * abstract_base_values (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual void abstract_base_values (
+          CORBA_Object *_collocated_tao_target_,
+          const CORBA_ValueDefSeq & abstract_base_values,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual CORBA::Boolean is_abstract (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual void is_abstract (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::Boolean is_abstract,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual CORBA::Boolean is_custom (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual void is_custom (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::Boolean is_custom,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual CORBA::Boolean is_truncatable (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual void is_truncatable (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::Boolean is_truncatable,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual CORBA::Boolean is_a (
+          CORBA_Object *_collocated_tao_target_,
+          const char * id,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual CORBA_ValueDef::FullValueDescription * describe_value (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual CORBA_ValueMemberDef_ptr create_value_member (
+          CORBA_Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA_IDLType_ptr type,
+          CORBA::Visibility access,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual CORBA_AttributeDef_ptr create_attribute (
+          CORBA_Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA_IDLType_ptr type,
+          CORBA::AttributeMode mode,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual CORBA_OperationDef_ptr create_operation (
+          CORBA_Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA_IDLType_ptr result,
+          CORBA::OperationMode mode,
+          const CORBA_ParDescriptionSeq & params,
+          const CORBA_ExceptionDefSeq & exceptions,
+          const CORBA_ContextIdSeq & contexts,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+
+    protected:
+      _TAO_CORBA_ValueDef_Proxy_Impl (void);
+    };
+
+    //
+    //               End Base Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+
+
+    ///////////////////////////////////////////////////////////////////////
+    //                Remote Proxy Impl. Declaration
+    //
+
+    class TAO_IFR_Client_Export _TAO_CORBA_ValueDef_Remote_Proxy_Impl
+      : public virtual _TAO_CORBA_ValueDef_Proxy_Impl,
+        public virtual TAO_Remote_Object_Proxy_Impl,
+        public virtual _TAO_CORBA_Container_Remote_Proxy_Impl,
+        public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl,
+        public virtual _TAO_CORBA_IDLType_Remote_Proxy_Impl
+    {
+    public:
+      _TAO_CORBA_ValueDef_Remote_Proxy_Impl (void);
+
+      virtual ~_TAO_CORBA_ValueDef_Remote_Proxy_Impl (void) { }
+      virtual CORBA_InterfaceDefSeq * supported_interfaces (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual void supported_interfaces (
+          CORBA_Object *_collocated_tao_target_,
+          const CORBA_InterfaceDefSeq & supported_interfaces,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_InitializerSeq * initializers (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual void initializers (
+          CORBA_Object *_collocated_tao_target_,
+          const CORBA_InitializerSeq & initializers,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_ValueDef_ptr base_value (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual void base_value (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA_ValueDef_ptr base_value,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_ValueDefSeq * abstract_base_values (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual void abstract_base_values (
+          CORBA_Object *_collocated_tao_target_,
+          const CORBA_ValueDefSeq & abstract_base_values,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA::Boolean is_abstract (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual void is_abstract (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::Boolean is_abstract,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA::Boolean is_custom (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual void is_custom (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::Boolean is_custom,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA::Boolean is_truncatable (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual void is_truncatable (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::Boolean is_truncatable,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA::Boolean is_a (
+          CORBA_Object *_collocated_tao_target_,
+          const char * id,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_ValueDef::FullValueDescription * describe_value (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_ValueMemberDef_ptr create_value_member (
+          CORBA_Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA_IDLType_ptr type,
+          CORBA::Visibility access,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_AttributeDef_ptr create_attribute (
+          CORBA_Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA_IDLType_ptr type,
+          CORBA::AttributeMode mode,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA_OperationDef_ptr create_operation (
+          CORBA_Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA_IDLType_ptr result,
+          CORBA::OperationMode mode,
+          const CORBA_ParDescriptionSeq & params,
+          const CORBA_ExceptionDefSeq & exceptions,
+          const CORBA_ContextIdSeq & contexts,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+
+    };
+
+    //
+    //             End Remote Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+
+    // The Proxy Brokers are used by each interface to get
+    // the right proxy for performing a call. In the new
+    // collocation scheme, the proxy to be used can vary on
+    // a call by call basis.
+
+
+    ///////////////////////////////////////////////////////////////////////
+    //                 Base Proxy Broker Declaration
+    //
+
+        class TAO_IFR_Client_Export _TAO_CORBA_ValueDef_Proxy_Broker
+    {
+    public:
+      virtual ~_TAO_CORBA_ValueDef_Proxy_Broker (void);
+      virtual _TAO_CORBA_ValueDef_Proxy_Impl &select_proxy (
+          CORBA_ValueDef *object,
+          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+        ) = 0;
 
+    protected:
+      _TAO_CORBA_ValueDef_Proxy_Broker (void);
 
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
+    };
 
-class TAO_IFR_Client_Export _TAO_CORBA_ValueDef_Proxy_Broker
-{
-public:
-  virtual ~_TAO_CORBA_ValueDef_Proxy_Broker (void);
-  virtual _TAO_CORBA_ValueDef_Proxy_Impl &select_proxy (
-    CORBA_ValueDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
+    //
+    //              End Base Proxy Broker Declaration
+    ///////////////////////////////////////////////////////////////////////
 
-protected:
-  _TAO_CORBA_ValueDef_Proxy_Broker (void);
-  
-};
 
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+    ///////////////////////////////////////////////////////////////////////
+    //                 Remote Proxy Broker Declaration
+    //
 
+    class TAO_IFR_Client_Export _TAO_CORBA_ValueDef_Remote_Proxy_Broker
+      : public virtual _TAO_CORBA_ValueDef_Proxy_Broker
+    {
+    public:
+      _TAO_CORBA_ValueDef_Remote_Proxy_Broker (void);
 
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
+      virtual ~_TAO_CORBA_ValueDef_Remote_Proxy_Broker (void);
 
-class TAO_IFR_Client_Export _TAO_CORBA_ValueDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_ValueDef_Proxy_Broker
-{
-public: 
-  _TAO_CORBA_ValueDef_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_CORBA_ValueDef_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_CORBA_ValueDef_Proxy_Impl &select_proxy (
-    CORBA_ValueDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
+      virtual _TAO_CORBA_ValueDef_Proxy_Impl &select_proxy (
+          CORBA_ValueDef *object,
+          CORBA_Environment &ACE_TRY_ENV
+        );
 
-private:
-  _TAO_CORBA_ValueDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
+      private:
+        _TAO_CORBA_ValueDef_Remote_Proxy_Impl remote_proxy_impl_;
 
-public:
-  static _TAO_CORBA_ValueDef_Remote_Proxy_Broker *the_TAO_CORBA_ValueDef_Remote_Proxy_Broker (void);
-};
+      public:
+        // This member function is used to get an handle to the unique instance
+        // of the Remote Proxy Broker that is available for a given
+        // interface.
+        static _TAO_CORBA_ValueDef_Remote_Proxy_Broker *the_TAO_CORBA_ValueDef_Remote_Proxy_Broker (void);
+      };
 
-
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+      //
+      //              End Remote Proxy Broker Declaration
+      ///////////////////////////////////////////////////////////////////////
 
 
 #endif /* end #if !defined */
 
-struct CORBA_ValueDescription;
-class CORBA_ValueDescription_var;
+      struct CORBA_ValueDescription;
+      class CORBA_ValueDescription_var;
 
-struct TAO_IFR_Client_Export CORBA_ValueDescription
-{
+      struct TAO_IFR_Client_Export CORBA_ValueDescription
+      {
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_ValueDescription_var _var_type;
+        typedef CORBA_ValueDescription_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-  static void _tao_any_destructor (void*);
-
-  TAO_String_Manager name;
-  TAO_String_Manager id;
-  CORBA::Boolean is_abstract;
-  CORBA::Boolean is_custom;
-  TAO_String_Manager defined_in;
-  TAO_String_Manager version;
-  CORBA_RepositoryIdSeq supported_interfaces;
-  CORBA_RepositoryIdSeq abstract_base_values;
-  CORBA::Boolean is_truncatable;
-  TAO_String_Manager base_value;
-};
-
-class TAO_IFR_Client_Export CORBA_ValueDescription_var
-{
-public:
-  CORBA_ValueDescription_var (void); // default constructor
-  CORBA_ValueDescription_var (CORBA_ValueDescription *);
-  CORBA_ValueDescription_var (const CORBA_ValueDescription_var &); // copy constructor
-  ~CORBA_ValueDescription_var (void); // destructor
-  
-  CORBA_ValueDescription_var &operator= (CORBA_ValueDescription *);
-  CORBA_ValueDescription_var &operator= (const CORBA_ValueDescription_var &);
-  CORBA_ValueDescription *operator-> (void);
-  const CORBA_ValueDescription *operator-> (void) const;
-  
-  operator const CORBA_ValueDescription &() const;
-  operator CORBA_ValueDescription &();
-  operator CORBA_ValueDescription &() const;
-  operator CORBA_ValueDescription *&(); // variable-size types only
-  
-  // in, inout, out, _retn 
-  const CORBA_ValueDescription &in (void) const;
-  CORBA_ValueDescription &inout (void);
-  CORBA_ValueDescription *&out (void);
-  CORBA_ValueDescription *_retn (void);
-  CORBA_ValueDescription *ptr (void) const;
-
-private:
-  CORBA_ValueDescription *ptr_;
-};
-
-class TAO_IFR_Client_Export CORBA_ValueDescription_out
-{
-public:
-  CORBA_ValueDescription_out (CORBA_ValueDescription *&);
-  CORBA_ValueDescription_out (CORBA_ValueDescription_var &);
-  CORBA_ValueDescription_out (const CORBA_ValueDescription_out &);
-  CORBA_ValueDescription_out &operator= (const CORBA_ValueDescription_out &);
-  CORBA_ValueDescription_out &operator= (CORBA_ValueDescription *);
-  operator CORBA_ValueDescription *&();
-  CORBA_ValueDescription *&ptr (void);
-  CORBA_ValueDescription *operator-> (void);
-  
-private:
-  CORBA_ValueDescription *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_ValueDescription_var &);
-};
+        static void _tao_any_destructor (void*);
+
+        TAO_String_Manager name;
+        TAO_String_Manager id;
+        CORBA::Boolean is_abstract;
+        CORBA::Boolean is_custom;
+        TAO_String_Manager defined_in;
+        TAO_String_Manager version;
+        CORBA_RepositoryIdSeq supported_interfaces;
+        CORBA_RepositoryIdSeq abstract_base_values;
+        CORBA::Boolean is_truncatable;
+        TAO_String_Manager base_value;
+
+      };
+
+      class TAO_IFR_Client_Export CORBA_ValueDescription_var
+      {
+      public:
+        CORBA_ValueDescription_var (void);
+        CORBA_ValueDescription_var (CORBA_ValueDescription *);
+        CORBA_ValueDescription_var (const CORBA_ValueDescription_var &);
+        ~CORBA_ValueDescription_var (void);
+
+        CORBA_ValueDescription_var &operator= (CORBA_ValueDescription *);
+        CORBA_ValueDescription_var &operator= (const CORBA_ValueDescription_var &);
+        CORBA_ValueDescription *operator-> (void);
+        const CORBA_ValueDescription *operator-> (void) const;
+
+        operator const CORBA_ValueDescription &() const;
+        operator CORBA_ValueDescription &();
+        operator CORBA_ValueDescription &() const;
+        // Variable-size types only.
+        operator CORBA_ValueDescription *&();
+
+        // in, inout, out, _retn
+        const CORBA_ValueDescription &in (void) const;
+        CORBA_ValueDescription &inout (void);
+        CORBA_ValueDescription *&out (void);
+        CORBA_ValueDescription *_retn (void);
+        CORBA_ValueDescription *ptr (void) const;
+
+      private:
+        CORBA_ValueDescription *ptr_;
+      };
+
+      class TAO_IFR_Client_Export CORBA_ValueDescription_out
+      {
+      public:
+        CORBA_ValueDescription_out (CORBA_ValueDescription *&);
+        CORBA_ValueDescription_out (CORBA_ValueDescription_var &);
+        CORBA_ValueDescription_out (const CORBA_ValueDescription_out &);
+        CORBA_ValueDescription_out &operator= (const CORBA_ValueDescription_out &);
+        CORBA_ValueDescription_out &operator= (CORBA_ValueDescription *);
+        operator CORBA_ValueDescription *&();
+        CORBA_ValueDescription *&ptr (void);
+        CORBA_ValueDescription *operator-> (void);
+
+      private:
+        CORBA_ValueDescription *&ptr_;
+        // Assignment from T_var not allowed.
+        void operator= (const CORBA_ValueDescription_var &);
+      };
 
 
 #if !defined (_CORBA_VALUEBOXDEF___PTR_CH_)
 #define _CORBA_VALUEBOXDEF___PTR_CH_
 
-class CORBA_ValueBoxDef;
-typedef CORBA_ValueBoxDef *CORBA_ValueBoxDef_ptr;
+      class CORBA_ValueBoxDef;
+      typedef CORBA_ValueBoxDef *CORBA_ValueBoxDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -1977,41 +2009,44 @@ typedef CORBA_ValueBoxDef *CORBA_ValueBoxDef_ptr;
 #if !defined (_CORBA_VALUEBOXDEF___VAR_CH_)
 #define _CORBA_VALUEBOXDEF___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_ValueBoxDef_var : public TAO_Base_var
-{
-public:
-  CORBA_ValueBoxDef_var (void); // default constructor
-  CORBA_ValueBoxDef_var (CORBA_ValueBoxDef_ptr p) : ptr_ (p) {} 
-  CORBA_ValueBoxDef_var (const CORBA_ValueBoxDef_var &); // copy constructor
-  ~CORBA_ValueBoxDef_var (void); // destructor
-  
-  CORBA_ValueBoxDef_var &operator= (CORBA_ValueBoxDef_ptr);
-  CORBA_ValueBoxDef_var &operator= (const CORBA_ValueBoxDef_var &);
-  CORBA_ValueBoxDef_ptr operator-> (void) const;
-  
-  operator const CORBA_ValueBoxDef_ptr &() const;
-  operator CORBA_ValueBoxDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_ValueBoxDef_ptr in (void) const;
-  CORBA_ValueBoxDef_ptr &inout (void);
-  CORBA_ValueBoxDef_ptr &out (void);
-  CORBA_ValueBoxDef_ptr _retn (void);
-  CORBA_ValueBoxDef_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_ValueBoxDef_ptr duplicate (CORBA_ValueBoxDef_ptr);
-  static void release (CORBA_ValueBoxDef_ptr);
-  static CORBA_ValueBoxDef_ptr nil (void);
-  static CORBA_ValueBoxDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
-
-private:
-  CORBA_ValueBoxDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_ValueBoxDef_var (const TAO_Base_var &rhs);
-  CORBA_ValueBoxDef_var &operator= (const TAO_Base_var &rhs);
-};
+      class TAO_IFR_Client_Export CORBA_ValueBoxDef_var : public TAO_Base_var
+      {
+      public:
+        CORBA_ValueBoxDef_var (void); // default constructor
+        CORBA_ValueBoxDef_var (CORBA_ValueBoxDef_ptr p) : ptr_ (p) {}
+        CORBA_ValueBoxDef_var (const CORBA_ValueBoxDef_var &); // copy constructor
+        ~CORBA_ValueBoxDef_var (void); // destructor
+
+        CORBA_ValueBoxDef_var &operator= (CORBA_ValueBoxDef_ptr);
+        CORBA_ValueBoxDef_var &operator= (const CORBA_ValueBoxDef_var &);
+        CORBA_ValueBoxDef_ptr operator-> (void) const;
+
+        operator const CORBA_ValueBoxDef_ptr &() const;
+        operator CORBA_ValueBoxDef_ptr &();
+        // in, inout, out, _retn
+        CORBA_ValueBoxDef_ptr in (void) const;
+        CORBA_ValueBoxDef_ptr &inout (void);
+        CORBA_ValueBoxDef_ptr &out (void);
+        CORBA_ValueBoxDef_ptr _retn (void);
+        CORBA_ValueBoxDef_ptr ptr (void) const;
+
+        // Hooks used by template sequence and object manager classes
+        // for non-defined forward declared interfaces.
+        static CORBA_ValueBoxDef_ptr duplicate (CORBA_ValueBoxDef_ptr);
+        static void release (CORBA_ValueBoxDef_ptr);
+        static CORBA_ValueBoxDef_ptr nil (void);
+        static CORBA_ValueBoxDef_ptr narrow (
+            CORBA::Object *,
+            CORBA::Environment &
+          );
+        static CORBA::Object * upcast (void *);
+
+      private:
+        CORBA_ValueBoxDef_ptr ptr_;
+        // Unimplemented - prevents widening assignment.
+        CORBA_ValueBoxDef_var (const TAO_Base_var &rhs);
+        CORBA_ValueBoxDef_var &operator= (const TAO_Base_var &rhs);
+      };
 
 
 #endif /* end #if !defined */
@@ -2020,22 +2055,22 @@ private:
 #if !defined (_CORBA_VALUEBOXDEF___OUT_CH_)
 #define _CORBA_VALUEBOXDEF___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_ValueBoxDef_out
-{
-public:
-  CORBA_ValueBoxDef_out (CORBA_ValueBoxDef_ptr &);
-  CORBA_ValueBoxDef_out (CORBA_ValueBoxDef_var &);
-  CORBA_ValueBoxDef_out (const CORBA_ValueBoxDef_out &);
-  CORBA_ValueBoxDef_out &operator= (const CORBA_ValueBoxDef_out &);
-  CORBA_ValueBoxDef_out &operator= (const CORBA_ValueBoxDef_var &);
-  CORBA_ValueBoxDef_out &operator= (CORBA_ValueBoxDef_ptr);
-  operator CORBA_ValueBoxDef_ptr &();
-  CORBA_ValueBoxDef_ptr &ptr (void);
-  CORBA_ValueBoxDef_ptr operator-> (void);
+      class TAO_IFR_Client_Export CORBA_ValueBoxDef_out
+      {
+      public:
+        CORBA_ValueBoxDef_out (CORBA_ValueBoxDef_ptr &);
+        CORBA_ValueBoxDef_out (CORBA_ValueBoxDef_var &);
+        CORBA_ValueBoxDef_out (const CORBA_ValueBoxDef_out &);
+        CORBA_ValueBoxDef_out &operator= (const CORBA_ValueBoxDef_out &);
+        CORBA_ValueBoxDef_out &operator= (const CORBA_ValueBoxDef_var &);
+        CORBA_ValueBoxDef_out &operator= (CORBA_ValueBoxDef_ptr);
+        operator CORBA_ValueBoxDef_ptr &();
+        CORBA_ValueBoxDef_ptr &ptr (void);
+        CORBA_ValueBoxDef_ptr operator-> (void);
 
-private:
-  CORBA_ValueBoxDef_ptr &ptr_;
-};
+      private:
+        CORBA_ValueBoxDef_ptr &ptr_;
+      };
 
 
 #endif /* end #if !defined */
@@ -2044,325 +2079,326 @@ private:
 #if !defined (_CORBA_VALUEBOXDEF_CH_)
 #define _CORBA_VALUEBOXDEF_CH_
 
-// Forward Classes Declaration
-class _TAO_CORBA_ValueBoxDef_Proxy_Impl;
-class _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl;
-class _TAO_CORBA_ValueBoxDef_Proxy_Broker;
-class _TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker;
+      // Forward Classes Declaration
+      class _TAO_CORBA_ValueBoxDef_Proxy_Impl;
+      class _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl;
+      class _TAO_CORBA_ValueBoxDef_Proxy_Broker;
+      class _TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker;
+
+      class TAO_IFR_Client_Export CORBA_ValueBoxDef
+        : public virtual CORBA_TypedefDef
+      {
+      public:
+      #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+        typedef CORBA_ValueBoxDef_ptr _ptr_type;
+        typedef CORBA_ValueBoxDef_var _var_type;
+      #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+        // the static operations
+        static CORBA_ValueBoxDef_ptr _duplicate (CORBA_ValueBoxDef_ptr obj);
+
+        static CORBA_ValueBoxDef_ptr _narrow (
+            CORBA::Object_ptr obj,
+            CORBA::Environment &ACE_TRY_ENV =
+              TAO_default_environment ()
+          );
+
+        static CORBA_ValueBoxDef_ptr _unchecked_narrow (
+            CORBA::Object_ptr obj,
+            CORBA::Environment &ACE_TRY_ENV =
+              TAO_default_environment ()
+          );
+
+        static CORBA_ValueBoxDef_ptr _nil (void)
+          {
+            return (CORBA_ValueBoxDef_ptr)0;
+          }
+
+        static void _tao_any_destructor (void*);
+
+        virtual CORBA_IDLType_ptr original_type_def (
+            CORBA::Environment &ACE_TRY_ENV =
+              TAO_default_environment ()
+          )
+          ACE_THROW_SPEC ((
+            CORBA::SystemException
+          ));
+
+        virtual void original_type_def (
+            CORBA_IDLType_ptr original_type_def,
+            CORBA::Environment &ACE_TRY_ENV =
+              TAO_default_environment ()
+          )
+          ACE_THROW_SPEC ((
+            CORBA::SystemException
+          ));
+
+        virtual CORBA::Boolean _is_a (
+            const CORBA::Char *type_id,
+            CORBA::Environment &ACE_TRY_ENV =
+              TAO_default_environment ()
+          );
+
+        virtual void *_tao_QueryInterface (ptr_arith_t type);
+
+        virtual const char* _interface_repository_id (void) const;
+
+      private:
+        _TAO_CORBA_ValueBoxDef_Proxy_Broker *the_TAO_CORBA_ValueBoxDef_Proxy_Broker_;
+
+      protected:
+        CORBA_ValueBoxDef (int collocated = 0);
+
+        // This methods travese the inheritance tree and set the
+        // parents piece of the given class in the right mode
+        virtual void CORBA_ValueBoxDef_setup_collocation (int collocated);
+
+        CORBA_ValueBoxDef (
+            TAO_Stub *objref,
+            CORBA::Boolean _tao_collocated = 0,
+            TAO_Abstract_ServantBase *servant = 0
+          );
+
+        friend class _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl;
+        friend class _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl;
+        friend class _TAO_CORBA_ValueBoxDef_Direct_Proxy_Impl;
+
+        virtual ~CORBA_ValueBoxDef (void);
+
+      private:
+        CORBA_ValueBoxDef (const CORBA_ValueBoxDef &);
+        void operator= (const CORBA_ValueBoxDef &);
+      };
+
+      // The Proxy Implementations are used by each interface to
+      // perform a call. Each different implementation encapsulate
+      // an invocation logics.
+
+
+      ///////////////////////////////////////////////////////////////////////
+      //                    Base Proxy Impl. Declaration
+      //
+
+      class TAO_IFR_Client_Export _TAO_CORBA_ValueBoxDef_Proxy_Impl
+        : public virtual _TAO_CORBA_TypedefDef_Proxy_Impl
+      {
+      public:
+        virtual ~_TAO_CORBA_ValueBoxDef_Proxy_Impl (void) { }
+        virtual CORBA_IDLType_ptr original_type_def (
+            CORBA_Object *_collocated_tao_target_,
+            CORBA::Environment &ACE_TRY_ENV
+          )
+          ACE_THROW_SPEC ((
+            CORBA::SystemException
+          )) = 0;
+
+        virtual void original_type_def (
+            CORBA_Object *_collocated_tao_target_,
+            CORBA_IDLType_ptr original_type_def,
+            CORBA::Environment &ACE_TRY_ENV
+          )
+          ACE_THROW_SPEC ((
+            CORBA::SystemException
+          )) = 0;
+
+
+      protected:
+        _TAO_CORBA_ValueBoxDef_Proxy_Impl (void);
+      };
+
+      //
+      //               End Base Proxy Impl. Declaration
+      ///////////////////////////////////////////////////////////////////////
+
+
+      ///////////////////////////////////////////////////////////////////////
+      //                Remote Proxy Impl. Declaration
+      //
+
+      class TAO_IFR_Client_Export _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl
+        : public virtual _TAO_CORBA_ValueBoxDef_Proxy_Impl,
+          public virtual TAO_Remote_Object_Proxy_Impl,
+          public virtual _TAO_CORBA_TypedefDef_Remote_Proxy_Impl
+      {
+      public:
+        _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl (void);
+
+        virtual ~_TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl (void) { }
+        virtual CORBA_IDLType_ptr original_type_def (
+            CORBA_Object *_collocated_tao_target_,
+            CORBA::Environment &ACE_TRY_ENV
+          )
+          ACE_THROW_SPEC ((
+            CORBA::SystemException
+          ));
+
+        virtual void original_type_def (
+            CORBA_Object *_collocated_tao_target_,
+            CORBA_IDLType_ptr original_type_def,
+            CORBA::Environment &ACE_TRY_ENV
+          )
+          ACE_THROW_SPEC ((
+            CORBA::SystemException
+          ));
+
+
+      };
+
+      //
+      //             End Remote Proxy Impl. Declaration
+      ///////////////////////////////////////////////////////////////////////
+
+      // The Proxy Brokers are used by each interface to get
+      // the right proxy for performing a call. In the new
+      // collocation scheme, the proxy to be used can vary on
+      // a call by call basis.
+
+
+      ///////////////////////////////////////////////////////////////////////
+      //                 Base Proxy Broker Declaration
+      //
+
+            class TAO_IFR_Client_Export _TAO_CORBA_ValueBoxDef_Proxy_Broker
+      {
+      public:
+        virtual ~_TAO_CORBA_ValueBoxDef_Proxy_Broker (void);
+        virtual _TAO_CORBA_ValueBoxDef_Proxy_Impl &select_proxy (
+            CORBA_ValueBoxDef *object,
+            CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+          ) = 0;
+
+      protected:
+        _TAO_CORBA_ValueBoxDef_Proxy_Broker (void);
+
+      };
+
+      //
+      //              End Base Proxy Broker Declaration
+      ///////////////////////////////////////////////////////////////////////
+
+
+      ///////////////////////////////////////////////////////////////////////
+      //                 Remote Proxy Broker Declaration
+      //
+
+      class TAO_IFR_Client_Export _TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker
+        : public virtual _TAO_CORBA_ValueBoxDef_Proxy_Broker
+      {
+      public:
+        _TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker (void);
+
+        virtual ~_TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker (void);
+
+        virtual _TAO_CORBA_ValueBoxDef_Proxy_Impl &select_proxy (
+            CORBA_ValueBoxDef *object,
+            CORBA_Environment &ACE_TRY_ENV
+          );
+
+        private:
+          _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl remote_proxy_impl_;
 
-class TAO_IFR_Client_Export CORBA_ValueBoxDef: public virtual CORBA_TypedefDef
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_ValueBoxDef_ptr _ptr_type;
-  typedef CORBA_ValueBoxDef_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
+        public:
+          // This member function is used to get an handle to the unique instance
+          // of the Remote Proxy Broker that is available for a given
+          // interface.
+          static _TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker *the_TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker (void);
+        };
 
-  // the static operations
-  static CORBA_ValueBoxDef_ptr _duplicate (CORBA_ValueBoxDef_ptr obj);
-  static CORBA_ValueBoxDef_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_ValueBoxDef_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_ValueBoxDef_ptr _nil (void)
-    {
-      return (CORBA_ValueBoxDef_ptr)0;
-    }
-
-  static void _tao_any_destructor (void*);
-
-  virtual CORBA_IDLType_ptr original_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void original_type_def (
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
-
-private:
-  _TAO_CORBA_ValueBoxDef_Proxy_Broker *the_TAO_CORBA_ValueBoxDef_Proxy_Broker_;
-  
-protected:
-  CORBA_ValueBoxDef (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void CORBA_ValueBoxDef_setup_collocation (int collocated);
-    
-    CORBA_ValueBoxDef (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl;
-    friend class _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_CORBA_ValueBoxDef_Direct_Proxy_Impl;
-  
-  virtual ~CORBA_ValueBoxDef (void);
-private:
-  CORBA_ValueBoxDef (const CORBA_ValueBoxDef &);
-  void operator= (const CORBA_ValueBoxDef &);
-};
-
-
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_ValueBoxDef_Proxy_Impl : 
-  public virtual _TAO_CORBA_TypedefDef_Proxy_Impl
-{
-public:
-  virtual ~_TAO_CORBA_ValueBoxDef_Proxy_Impl (void) { }
-  
-    virtual CORBA_IDLType_ptr original_type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void original_type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-protected:
-  _TAO_CORBA_ValueBoxDef_Proxy_Impl (void);
-
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl : 
-  public virtual _TAO_CORBA_ValueBoxDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_CORBA_TypedefDef_Remote_Proxy_Impl
-  
-{
-public:
-  _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl (void) { }
-  
-    virtual CORBA_IDLType_ptr original_type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void original_type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-};
-
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
-
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_ValueBoxDef_Proxy_Broker
-{
-public:
-  virtual ~_TAO_CORBA_ValueBoxDef_Proxy_Broker (void);
-  virtual _TAO_CORBA_ValueBoxDef_Proxy_Impl &select_proxy (
-    CORBA_ValueBoxDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
-
-protected:
-  _TAO_CORBA_ValueBoxDef_Proxy_Broker (void);
-  
-};
-
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
-
-class TAO_IFR_Client_Export _TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_ValueBoxDef_Proxy_Broker
-{
-public: 
-  _TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_CORBA_ValueBoxDef_Proxy_Impl &select_proxy (
-    CORBA_ValueBoxDef *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
-
-private:
-  _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
-
-public:
-  static _TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker *the_TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker (void);
-};
-
-
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+        //
+        //              End Remote Proxy Broker Declaration
+        ///////////////////////////////////////////////////////////////////////
 
 
 #endif /* end #if !defined */
 
-// Proxy Broker Factory function pointer declarations.
-
-extern TAO_IFR_Client_Export
-_TAO_CORBA_FixedDef_Proxy_Broker *
-(*_TAO_CORBA_FixedDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-_TAO_CORBA_ValueMemberDef_Proxy_Broker *
-(*_TAO_CORBA_ValueMemberDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-_TAO_CORBA_ValueDef_Proxy_Broker *
-(*_TAO_CORBA_ValueDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-_TAO_CORBA_ValueBoxDef_Proxy_Broker *
-(*_TAO_CORBA_ValueBoxDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-// Any operators for interface CORBA_FixedDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_FixedDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_FixedDef *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ValueMember &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ValueMember*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ValueMember *&); // deprecated
+        // Proxy Broker Factory function pointer declarations.
+
+        extern TAO_IFR_Client_Export
+        _TAO_CORBA_FixedDef_Proxy_Broker *
+        (*_TAO_CORBA_FixedDef_Proxy_Broker_Factory_function_pointer) (
+            CORBA::Object_ptr obj
+          );
+
+        extern TAO_IFR_Client_Export
+        _TAO_CORBA_ValueMemberDef_Proxy_Broker *
+        (*_TAO_CORBA_ValueMemberDef_Proxy_Broker_Factory_function_pointer) (
+            CORBA::Object_ptr obj
+          );
+
+        extern TAO_IFR_Client_Export
+        _TAO_CORBA_ValueDef_Proxy_Broker *
+        (*_TAO_CORBA_ValueDef_Proxy_Broker_Factory_function_pointer) (
+            CORBA::Object_ptr obj
+          );
+
+        extern TAO_IFR_Client_Export
+        _TAO_CORBA_ValueBoxDef_Proxy_Broker *
+        (*_TAO_CORBA_ValueBoxDef_Proxy_Broker_Factory_function_pointer) (
+            CORBA::Object_ptr obj
+          );
+
+                        // Any operators for interface CORBA_FixedDef
+        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_FixedDef_ptr);
+        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_FixedDef *&);
+        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ValueMember &); // copying version
+        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ValueMember*); // noncopying version
+        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ValueMember *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_ValueMember *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ValueMemberSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ValueMemberSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ValueMemberSeq *&); // deprecated
+                TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ValueMemberSeq &); // copying version
+        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ValueMemberSeq*); // noncopying version
+        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ValueMemberSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_ValueMemberSeq *&);
-// Any operators for interface CORBA_ValueMemberDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ValueMemberDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ValueMemberDef *&);
-// Any operators for interface CORBA_ValueDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ValueDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ValueDef *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ValueDef::FullValueDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ValueDef::FullValueDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ValueDef::FullValueDescription *&); // deprecated
+        // Any operators for interface CORBA_ValueMemberDef
+        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ValueMemberDef_ptr);
+        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ValueMemberDef *&);
+        // Any operators for interface CORBA_ValueDef
+        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ValueDef_ptr);
+        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ValueDef *&);
+        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ValueDef::FullValueDescription &); // copying version
+        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ValueDef::FullValueDescription*); // noncopying version
+        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ValueDef::FullValueDescription *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_ValueDef::FullValueDescription *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ValueDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ValueDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ValueDescription *&); // deprecated
+        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ValueDescription &); // copying version
+        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ValueDescription*); // noncopying version
+        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ValueDescription *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_ValueDescription *&);
-// Any operators for interface CORBA_ValueBoxDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ValueBoxDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ValueBoxDef *&);
+        // Any operators for interface CORBA_ValueBoxDef
+        TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ValueBoxDef_ptr);
+        TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ValueBoxDef *&);
 
-#ifndef __ACE_INLINE__
+        #ifndef __ACE_INLINE__
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_FixedDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_FixedDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ValueMember &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ValueMember &);
+                TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_FixedDef_ptr );
+        TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_FixedDef_ptr &);
+        TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ValueMember &);
+        TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ValueMember &);
 
 #if !defined _TAO_CDR_OP_CORBA_ValueMemberSeq_H_
-#define _TAO_CDR_OP_CORBA_ValueMemberSeq_H_
+        #define _TAO_CDR_OP_CORBA_ValueMemberSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA_ValueMemberSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA_ValueMemberSeq &
-  );
+            TAO_OutputCDR &,
+            const CORBA_ValueMemberSeq &
+          );
+        TAO_IFR_Client_Export CORBA::Boolean operator>> (
+            TAO_InputCDR &,
+            CORBA_ValueMemberSeq &
+          );
 
 #endif /* _TAO_CDR_OP_CORBA_ValueMemberSeq_H_ */
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ValueMemberDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ValueMemberDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ValueDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ValueDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ValueDef::FullValueDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ValueDef::FullValueDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ValueDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ValueDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ValueBoxDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ValueBoxDef_ptr &);
-
-#endif /* __ACE_INLINE__ */
+        TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ValueMemberDef_ptr );
+        TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ValueMemberDef_ptr &);
+        TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ValueDef_ptr );
+        TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ValueDef_ptr &);
+        TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ValueDef::FullValueDescription &);
+        TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ValueDef::FullValueDescription &);
+        TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ValueDescription &);
+        TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ValueDescription &);
+        TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ValueBoxDef_ptr );
+        TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ValueBoxDef_ptr &);
+
+        #endif /* __ACE_INLINE__ */
 
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.i b/TAO/tao/IFR_Client/IFR_ExtendedC.i
index 3cd99189195..b30c9cdc2a9 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.i
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.i
@@ -232,176 +232,176 @@ CORBA_ValueMember_out::operator-> (void)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_VALUEMEMBERSEQ_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_VALUEMEMBERSEQ_CI_
 
-  // = Static operations.
-  ACE_INLINE CORBA_ValueMember *
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::allocbuf (CORBA::ULong size)
-  // Allocate storage for the sequence.
-  {
-    CORBA_ValueMember *retval = 0;
-    ACE_NEW_RETURN (retval, CORBA_ValueMember[size], 0);
-    return retval;
-  }
-  
-  ACE_INLINE void _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::freebuf (CORBA_ValueMember *buffer)
-  // Free the sequence.
-  {
-    delete [] buffer;
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (void) // Default constructor.
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA_ValueMember *data,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (const _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq &rhs)
-  // Copy constructor.
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    if (rhs.buffer_ != 0)
-    {
-      CORBA_ValueMember *tmp1 = _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::allocbuf (this->maximum_);
-      CORBA_ValueMember * const tmp2 = ACE_reinterpret_cast (CORBA_ValueMember * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp1[i] = tmp2[i];
-      
-      this->buffer_ = tmp1;
-    }
-    else
-    {
-      this->buffer_ = 0;
-    }
-  }
-  
-  ACE_INLINE _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq &
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::operator= (const _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq &rhs)
-  // Assignment operator.
+// = Static operations.
+ACE_INLINE CORBA_ValueMember *
+_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::allocbuf (CORBA::ULong size)
+// Allocate storage for the sequence.
+{
+  CORBA_ValueMember *retval = 0;
+  ACE_NEW_RETURN (retval, CORBA_ValueMember[size], 0);
+  return retval;
+}
+
+ACE_INLINE void _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::freebuf (CORBA_ValueMember *buffer)
+// Free the sequence.
+{
+  delete [] buffer;
+}
+
+ACE_INLINE
+_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (void) // Default constructor.
+{
+}
+
+ACE_INLINE
+_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (CORBA::ULong maximum,
+  CORBA::ULong length,
+  CORBA_ValueMember *data,
+  CORBA::Boolean release)
+: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+{
+}
+
+ACE_INLINE
+_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (const _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq &rhs)
+// Copy constructor.
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
   {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-      {
-        // free the old buffer
-        CORBA_ValueMember *tmp = ACE_reinterpret_cast (CORBA_ValueMember *, this->buffer_);
-        _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    CORBA_ValueMember *tmp1 = ACE_reinterpret_cast (CORBA_ValueMember *, this->buffer_);
+    CORBA_ValueMember *tmp1 = _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::allocbuf (this->maximum_);
     CORBA_ValueMember * const tmp2 = ACE_reinterpret_cast (CORBA_ValueMember * ACE_CAST_CONST, rhs.buffer_);
     
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
     
-    return *this;
+    this->buffer_ = tmp1;
   }
-  
-  // = Accessors.
-  ACE_INLINE CORBA_ValueMember &
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::operator[] (CORBA::ULong i)
-  // operator []
+  else
   {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA_ValueMember* tmp = ACE_reinterpret_cast(CORBA_ValueMember*,this->buffer_);
-    return tmp[i];
+    this->buffer_ = 0;
   }
+}
+
+ACE_INLINE _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq &
+_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::operator= (const _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq &rhs)
+// Assignment operator.
+{
+  if (this == &rhs)
+    return *this;
   
-  ACE_INLINE const CORBA_ValueMember &
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::operator[] (CORBA::ULong i) const
-  // operator []
+  if (this->release_)
   {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA_ValueMember * const tmp = ACE_reinterpret_cast (CORBA_ValueMember* ACE_CAST_CONST, this->buffer_);
-    return tmp[i];
+    if (this->maximum_ < rhs.maximum_)
+    {
+      // free the old buffer
+      CORBA_ValueMember *tmp = ACE_reinterpret_cast (CORBA_ValueMember *, this->buffer_);
+      _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::freebuf (tmp);
+      this->buffer_ = _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::allocbuf (rhs.maximum_);
+    }
   }
+  else
+    this->buffer_ = _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::allocbuf (rhs.maximum_);
+  
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  CORBA_ValueMember *tmp1 = ACE_reinterpret_cast (CORBA_ValueMember *, this->buffer_);
+  CORBA_ValueMember * const tmp2 = ACE_reinterpret_cast (CORBA_ValueMember * ACE_CAST_CONST, rhs.buffer_);
   
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    tmp1[i] = tmp2[i];
   
-  ACE_INLINE CORBA_ValueMember *
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::get_buffer (CORBA::Boolean orphan)
+  return *this;
+}
+
+// = Accessors.
+ACE_INLINE CORBA_ValueMember &
+_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::operator[] (CORBA::ULong i)
+// operator []
+{
+  ACE_ASSERT (i < this->maximum_);
+  CORBA_ValueMember* tmp = ACE_reinterpret_cast(CORBA_ValueMember*,this->buffer_);
+  return tmp[i];
+}
+
+ACE_INLINE const CORBA_ValueMember &
+_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::operator[] (CORBA::ULong i) const
+// operator []
+{
+  ACE_ASSERT (i < this->maximum_);
+  CORBA_ValueMember * const tmp = ACE_reinterpret_cast (CORBA_ValueMember* ACE_CAST_CONST, this->buffer_);
+  return tmp[i];
+}
+
+// Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+ACE_INLINE CORBA_ValueMember *
+_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::get_buffer (CORBA::Boolean orphan)
+{
+  CORBA_ValueMember *result = 0;
+  if (orphan == 0)
   {
-    CORBA_ValueMember *result = 0;
-    if (orphan == 0)
+    // We retain ownership.
+    if (this->buffer_ == 0)
     {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::allocbuf (this->length_);
-        this->buffer_ = result;
-        this->release_ = 1;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA_ValueMember*, this->buffer_);
-      }
+      result = _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::allocbuf (this->length_);
+      this->buffer_ = result;
+      this->release_ = 1;
     }
-    else // if (orphan == 1)
+    else
     {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA_ValueMember*,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
+      result = ACE_reinterpret_cast (CORBA_ValueMember*, this->buffer_);
     }
-    return result;
   }
-  
-  ACE_INLINE const CORBA_ValueMember *
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const CORBA_ValueMember * ACE_CAST_CONST, this->buffer_);
-  }
-  
-  ACE_INLINE void
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::replace (CORBA::ULong max,
-  CORBA::ULong length,
-  CORBA_ValueMember *data,
-  CORBA::Boolean release)
+  else // if (orphan == 1)
   {
-    this->maximum_ = max;
-    this->length_ = length;
-    if (this->buffer_ && this->release_ == 1)
+    if (this->release_ != 0)
     {
-      CORBA_ValueMember *tmp = ACE_reinterpret_cast(CORBA_ValueMember*,this->buffer_);
-      _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::freebuf (tmp);
+      // We set the state back to default and relinquish
+      // ownership.
+      result = ACE_reinterpret_cast(CORBA_ValueMember*,this->buffer_);
+      this->maximum_ = 0;
+      this->length_ = 0;
+      this->buffer_ = 0;
+      this->release_ = 0;
     }
-    this->buffer_ = data;
-    this->release_ = release;
   }
-  
+  return result;
+}
+
+ACE_INLINE const CORBA_ValueMember *
+_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::get_buffer (void) const
+{
+  return ACE_reinterpret_cast(const CORBA_ValueMember * ACE_CAST_CONST, this->buffer_);
+}
+
+ACE_INLINE void
+_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::replace (CORBA::ULong max,
+CORBA::ULong length,
+CORBA_ValueMember *data,
+CORBA::Boolean release)
+{
+  this->maximum_ = max;
+  this->length_ = length;
+  if (this->buffer_ && this->release_ == 1)
+  {
+    CORBA_ValueMember *tmp = ACE_reinterpret_cast(CORBA_ValueMember*,this->buffer_);
+    _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::freebuf (tmp);
+  }
+  this->buffer_ = data;
+  this->release_ = release;
+}
+
 #endif /* end #if !defined */
 
 
diff --git a/TAO/tao/IFR_Client/Makefile b/TAO/tao/IFR_Client/Makefile
index c69d266abff..1f34d0c640e 100644
--- a/TAO/tao/IFR_Client/Makefile
+++ b/TAO/tao/IFR_Client/Makefile
@@ -189,13 +189,13 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
  $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/Encodable.h \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/ORB.h \
@@ -328,18 +328,19 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
  $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
  IFR_BaseC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/RequestInfo_Util.h \
  $(TAO_ROOT)/tao/ClientRequestInfo.h \
  $(TAO_ROOT)/tao/StringSeqC.h \
  $(TAO_ROOT)/tao/StringSeqC.i \
  $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/RequestInfo_Util.h
+ $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
+ $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
 
 .obj/IFR_BasicC.o .obj/IFR_BasicC.so .shobj/IFR_BasicC.o .shobj/IFR_BasicC.so: IFR_BasicC.cpp IFR_BasicC.h \
- $(ACE_ROOT)/ace/pre.h \
- IFR_BaseC.h ifr_client_export.h \
+ $(ACE_ROOT)/ace/pre.h IFR_BaseC.h \
+ ifr_client_export.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
@@ -473,13 +474,13 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
  $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/Encodable.h \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/ORB.h \
@@ -612,18 +613,19 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
  $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
  IFR_BaseC.i IFR_BasicC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/RequestInfo_Util.h \
  $(TAO_ROOT)/tao/ClientRequestInfo.h \
  $(TAO_ROOT)/tao/StringSeqC.h \
  $(TAO_ROOT)/tao/StringSeqC.i \
  $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/RequestInfo_Util.h
+ $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
+ $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
 
 .obj/IFR_ExtendedC.o .obj/IFR_ExtendedC.so .shobj/IFR_ExtendedC.o .shobj/IFR_ExtendedC.so: IFR_ExtendedC.cpp IFR_ExtendedC.h \
- $(ACE_ROOT)/ace/pre.h \
- IFR_BasicC.h IFR_BaseC.h ifr_client_export.h \
+ $(ACE_ROOT)/ace/pre.h IFR_BasicC.h \
+ IFR_BaseC.h ifr_client_export.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
@@ -757,13 +759,13 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
  $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/Encodable.h \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/ORB.h \
@@ -896,14 +898,15 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
  $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
  IFR_BaseC.i IFR_BasicC.i IFR_ExtendedC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/RequestInfo_Util.h \
  $(TAO_ROOT)/tao/ClientRequestInfo.h \
  $(TAO_ROOT)/tao/StringSeqC.h \
  $(TAO_ROOT)/tao/StringSeqC.i \
  $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/RequestInfo_Util.h
+ $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
+ $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
 
 .obj/IFR_ComponentsC.o .obj/IFR_ComponentsC.so .shobj/IFR_ComponentsC.o .shobj/IFR_ComponentsC.so: IFR_ComponentsC.cpp IFR_ComponentsC.h \
  $(ACE_ROOT)/ace/pre.h \
@@ -1042,13 +1045,13 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
  $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/Encodable.h \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/ORB.h \
@@ -1181,14 +1184,15 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
  $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
  IFR_BaseC.i IFR_BasicC.i IFR_ExtendedC.i IFR_ComponentsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/RequestInfo_Util.h \
  $(TAO_ROOT)/tao/ClientRequestInfo.h \
  $(TAO_ROOT)/tao/StringSeqC.h \
  $(TAO_ROOT)/tao/StringSeqC.i \
  $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/RequestInfo_Util.h
+ $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
+ $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
 
 .obj/IFR_Client_Adapter_Impl.o .obj/IFR_Client_Adapter_Impl.so .shobj/IFR_Client_Adapter_Impl.o .shobj/IFR_Client_Adapter_Impl.so: IFR_Client_Adapter_Impl.cpp \
  IFR_Client_Adapter_Impl.h \
@@ -1351,13 +1355,13 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
  $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/Encodable.h \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/ORB.h \
@@ -1468,8 +1472,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
  $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
  IFR_BaseC.i IFR_BasicC.i IFR_ExtendedC.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index 1c1f16cc81f..023414f0098 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -505,6 +505,11 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr)
   for (size_t j = 0; j < this->endpoint_count_; ++j)
     this->addrs_[j].set_port_number (port, 1);
 
+  (void) this->base_acceptor_.acceptor().enable (ACE_CLOEXEC);
+  // This avoids having child processes acquire the listen socket thereby
+  // denying the server the opportunity to restart on a well-known endpoint.
+  // This does not affect the aberrent behavior on Win32 platforms. 
+
   if (TAO_debug_level > 5)
     {
       for (size_t i = 0; i < this->endpoint_count_; ++i)
diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp
index 7e0dca03670..cdc62d61fe7 100644
--- a/TAO/tao/Invocation.cpp
+++ b/TAO/tao/Invocation.cpp
@@ -90,7 +90,6 @@ TAO_GIOP_Invocation::TAO_GIOP_Invocation (void)
     orb_core_ (0),
     transport_ (0),
     endpoint_selector_ (0),
-    is_selector_initialized_ (0),
     inconsistent_policies_ (0),
     profile_ (0),
     endpoint_ (0),
@@ -124,7 +123,6 @@ TAO_GIOP_Invocation::TAO_GIOP_Invocation (TAO_Stub *stub,
     orb_core_ (orb_core),
     transport_ (0),
     endpoint_selector_ (0),
-    is_selector_initialized_ (0),
     inconsistent_policies_ (0),
     profile_ (0),
     endpoint_ (0),
@@ -183,14 +181,13 @@ TAO_GIOP_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
     }
 
   // Initialize endpoint selection strategy.
-  if (!this->is_selector_initialized_)
+  if (this->endpoint_selector_ == 0)
     {
       this->endpoint_selector_ =
-        this->orb_core_->endpoint_selector_factory ()->get_selector (this,
-                                                                     ACE_TRY_ENV);
+        this->orb_core_->endpoint_selector_factory ()->get_selector (
+          this,
+          ACE_TRY_ENV);
       ACE_CHECK;
-
-      this->is_selector_initialized_ = 1;
     }
 
   if (this->max_wait_time_ == 0)
@@ -596,6 +593,39 @@ TAO_GIOP_Invocation::location_forward (CORBA::Object_ptr forward,
   return TAO_INVOKE_RESTART;
 }
 
+void
+TAO_GIOP_Invocation::location_forward_i (TAO_Stub *stubobj,
+                                         CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Add the profiles in the given stub object to the list of forward
+  // profiles.
+  if (stubobj == 0)
+    ACE_THROW (CORBA::INTERNAL ());
+
+  // Initialize endpoint selection strategy.
+  if (this->endpoint_selector_ == 0)
+    {
+      this->endpoint_selector_ =
+        this->orb_core_->endpoint_selector_factory ()->get_selector (
+          this,
+          ACE_TRY_ENV);
+      ACE_CHECK;
+    }
+
+  // Modify the state as appropriate to include new forwarding
+  // profiles.
+  this->endpoint_selector_->forward (this,
+                                     stubobj->base_profiles (),
+                                     ACE_TRY_ENV);
+  ACE_CHECK;
+
+  this->received_location_forward_ = 1;
+
+  this->restart_flag_ = 1;
+}
+
+
 #if (TAO_HAS_RT_CORBA == 1)
 #include "tao/RT_Stub.h"
 #endif /* TAO_HAS_RT_CORBA */
diff --git a/TAO/tao/Invocation.h b/TAO/tao/Invocation.h
index 6765a082413..ee32b494b26 100644
--- a/TAO/tao/Invocation.h
+++ b/TAO/tao/Invocation.h
@@ -267,10 +267,6 @@ protected:
   /// use for invocation.
   TAO_Invocation_Endpoint_Selector *endpoint_selector_;
 
-  /// Flag indicating whether <endpoint_selector_> has been
-  /// initialized.
-  int is_selector_initialized_;
-
   /// Store information used by endpoint_selector_ for making endpoint
   /// selection decisions. This is a hack. The state should be kept in
   /// the selector, but to do this, we'd need to dynamically allocate
diff --git a/TAO/tao/Invocation.i b/TAO/tao/Invocation.i
index d9d49785e5c..4f72cbd350e 100644
--- a/TAO/tao/Invocation.i
+++ b/TAO/tao/Invocation.i
@@ -71,29 +71,6 @@ TAO_GIOP_Invocation::get_inconsistent_policies (void)
   return this->inconsistent_policies_._retn ();
 }
 
-ACE_INLINE void
-TAO_GIOP_Invocation::location_forward_i (TAO_Stub *stubobj,
-                                         CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  /**
-   * Add the profiles in the given stub object to the list of forward
-   * profiles.
-   */
-  if (stubobj == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  // Modify the state as appropriate to include new forwarding profiles.
-  this->endpoint_selector_->forward (this,
-                                     stubobj->base_profiles (),
-                                     ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->received_location_forward_ = 1;
-
-  this->restart_flag_ = 1;
-}
-
 ACE_INLINE TAO_Stub *
 TAO_GIOP_Invocation::stub (void)
 {
diff --git a/TAO/tao/MessagingC.cpp b/TAO/tao/MessagingC.cpp
index c85f54922cd..63d33dd81f0 100644
--- a/TAO/tao/MessagingC.cpp
+++ b/TAO/tao/MessagingC.cpp
@@ -25,9 +25,12 @@
 
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
-#include "tao/ClientRequestInfo.h"
+#include "tao/PortableInterceptor.h"
+
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
+#include "tao/ClientRequestInfo.h"
+#include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 #if defined (__BORLANDC__)
@@ -42,19 +45,19 @@ static const CORBA::Long _oc_Messaging_RebindMode[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x62696e64), 
-  ACE_NTOHL (0x4d6f6465), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f5265),
+  ACE_NTOHL (0x62696e64),
+  ACE_NTOHL (0x4d6f6465),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Messaging/RebindMode:1.0
   11,
-  ACE_NTOHL (0x52656269), 
-  ACE_NTOHL (0x6e644d6f), 
+  ACE_NTOHL (0x52656269),
+  ACE_NTOHL (0x6e644d6f),
   ACE_NTOHL (0x64650000),  // name = RebindMode
   CORBA::tk_short,
 
@@ -89,18 +92,18 @@ static const CORBA::Long _oc_Messaging_SyncScope[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   36,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5379), 
-  ACE_NTOHL (0x6e635363), 
-  ACE_NTOHL (0x6f70653a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f5379),
+  ACE_NTOHL (0x6e635363),
+  ACE_NTOHL (0x6f70653a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Messaging/SyncScope:1.0
   10,
-  ACE_NTOHL (0x53796e63), 
-  ACE_NTOHL (0x53636f70), 
+  ACE_NTOHL (0x53796e63),
+  ACE_NTOHL (0x53636f70),
   ACE_NTOHL (0x65000000),  // name = SyncScope
   CORBA::tk_short,
 
@@ -147,19 +150,19 @@ static const CORBA::Long _oc_Messaging_RoutingType[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f526f), 
-  ACE_NTOHL (0x7574696e), 
-  ACE_NTOHL (0x67547970), 
-  ACE_NTOHL (0x653a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f526f),
+  ACE_NTOHL (0x7574696e),
+  ACE_NTOHL (0x67547970),
+  ACE_NTOHL (0x653a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/RoutingType:1.0
   12,
-  ACE_NTOHL (0x526f7574), 
-  ACE_NTOHL (0x696e6754), 
+  ACE_NTOHL (0x526f7574),
+  ACE_NTOHL (0x696e6754),
   ACE_NTOHL (0x79706500),  // name = RoutingType
   CORBA::tk_short,
 
@@ -194,32 +197,32 @@ static const CORBA::Long _oc_Messaging_Timeout[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   34,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5469), 
-  ACE_NTOHL (0x6d656f75), 
-  ACE_NTOHL (0x743a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f5469),
+  ACE_NTOHL (0x6d656f75),
+  ACE_NTOHL (0x743a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/Timeout:1.0
   8,
-  ACE_NTOHL (0x54696d65), 
+  ACE_NTOHL (0x54696d65),
   ACE_NTOHL (0x6f757400),  // name = Timeout
   CORBA::tk_alias, // typecode kind for typedefs
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x42617365), 
-    ACE_NTOHL (0x2f54696d), 
-    ACE_NTOHL (0x65543a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x54696d65),
+    ACE_NTOHL (0x42617365),
+    ACE_NTOHL (0x2f54696d),
+    ACE_NTOHL (0x65543a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
     6,
-    ACE_NTOHL (0x54696d65), 
+    ACE_NTOHL (0x54696d65),
     ACE_NTOHL (0x54000000),  // name = TimeT
     CORBA::tk_ulonglong,
 
@@ -243,18 +246,18 @@ static const CORBA::Long _oc_Messaging_Priority[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5072), 
-  ACE_NTOHL (0x696f7269), 
-  ACE_NTOHL (0x74793a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f5072),
+  ACE_NTOHL (0x696f7269),
+  ACE_NTOHL (0x74793a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/Priority:1.0
   9,
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x5072696f),
+  ACE_NTOHL (0x72697479),
   ACE_NTOHL (0x0),  // name = Priority
   CORBA::tk_short,
 
@@ -277,18 +280,18 @@ static const CORBA::Long _oc_Messaging_Ordering[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f4f72), 
-  ACE_NTOHL (0x64657269), 
-  ACE_NTOHL (0x6e673a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f4f72),
+  ACE_NTOHL (0x64657269),
+  ACE_NTOHL (0x6e673a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/Ordering:1.0
   9,
-  ACE_NTOHL (0x4f726465), 
-  ACE_NTOHL (0x72696e67), 
+  ACE_NTOHL (0x4f726465),
+  ACE_NTOHL (0x72696e67),
   ACE_NTOHL (0x0),  // name = Ordering
   CORBA::tk_ushort,
 
@@ -379,7 +382,7 @@ Messaging::RebindPolicy_var::operator const ::Messaging::RebindPolicy_ptr &() co
   return this->ptr_;
 }
 
-Messaging::RebindPolicy_var::operator ::Messaging::RebindPolicy_ptr &() // cast 
+Messaging::RebindPolicy_var::operator ::Messaging::RebindPolicy_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -537,6 +540,7 @@ Messaging::RebindPolicy_ptr Messaging::RebindPolicy::_unchecked_narrow (
 {
   if (CORBA::is_nil (obj))
     return RebindPolicy::_nil ();
+
   return
       ACE_reinterpret_cast
         (
@@ -582,7 +586,7 @@ void *Messaging::RebindPolicy::_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;
@@ -650,7 +654,7 @@ Messaging::SyncScopePolicy_var::operator const ::Messaging::SyncScopePolicy_ptr
   return this->ptr_;
 }
 
-Messaging::SyncScopePolicy_var::operator ::Messaging::SyncScopePolicy_ptr &() // cast 
+Messaging::SyncScopePolicy_var::operator ::Messaging::SyncScopePolicy_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -807,6 +811,7 @@ Messaging::SyncScopePolicy_ptr Messaging::SyncScopePolicy::_unchecked_narrow (
 {
   if (CORBA::is_nil (obj))
     return SyncScopePolicy::_nil ();
+
   return
       ACE_reinterpret_cast
         (
@@ -852,7 +857,7 @@ void *Messaging::SyncScopePolicy::_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;
@@ -875,20 +880,20 @@ static const CORBA::Long _oc_Messaging_PriorityRange[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5072), 
-  ACE_NTOHL (0x696f7269), 
-  ACE_NTOHL (0x74795261), 
-  ACE_NTOHL (0x6e67653a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f5072),
+  ACE_NTOHL (0x696f7269),
+  ACE_NTOHL (0x74795261),
+  ACE_NTOHL (0x6e67653a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Messaging/PriorityRange:1.0
   14,
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x52616e67), 
+  ACE_NTOHL (0x5072696f),
+  ACE_NTOHL (0x72697479),
+  ACE_NTOHL (0x52616e67),
   ACE_NTOHL (0x65000000),  // name = PriorityRange
   2, // member count
   4,
@@ -897,18 +902,18 @@ static const CORBA::Long _oc_Messaging_PriorityRange[] =
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x4d657373), 
-    ACE_NTOHL (0x6167696e), 
-    ACE_NTOHL (0x672f5072), 
-    ACE_NTOHL (0x696f7269), 
-    ACE_NTOHL (0x74793a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x4d657373),
+    ACE_NTOHL (0x6167696e),
+    ACE_NTOHL (0x672f5072),
+    ACE_NTOHL (0x696f7269),
+    ACE_NTOHL (0x74793a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/Priority:1.0
     9,
-    ACE_NTOHL (0x5072696f), 
-    ACE_NTOHL (0x72697479), 
+    ACE_NTOHL (0x5072696f),
+    ACE_NTOHL (0x72697479),
     ACE_NTOHL (0x0),  // name = Priority
     CORBA::tk_short,
 
@@ -919,18 +924,18 @@ static const CORBA::Long _oc_Messaging_PriorityRange[] =
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x4d657373), 
-    ACE_NTOHL (0x6167696e), 
-    ACE_NTOHL (0x672f5072), 
-    ACE_NTOHL (0x696f7269), 
-    ACE_NTOHL (0x74793a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x4d657373),
+    ACE_NTOHL (0x6167696e),
+    ACE_NTOHL (0x672f5072),
+    ACE_NTOHL (0x696f7269),
+    ACE_NTOHL (0x74793a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/Priority:1.0
     9,
-    ACE_NTOHL (0x5072696f), 
-    ACE_NTOHL (0x72697479), 
+    ACE_NTOHL (0x5072696f),
+    ACE_NTOHL (0x72697479),
     ACE_NTOHL (0x0),  // name = Priority
     CORBA::tk_short,
 
@@ -1005,7 +1010,7 @@ Messaging::RequestPriorityPolicy_var::operator const ::Messaging::RequestPriorit
   return this->ptr_;
 }
 
-Messaging::RequestPriorityPolicy_var::operator ::Messaging::RequestPriorityPolicy_ptr &() // cast 
+Messaging::RequestPriorityPolicy_var::operator ::Messaging::RequestPriorityPolicy_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1163,6 +1168,7 @@ Messaging::RequestPriorityPolicy_ptr Messaging::RequestPriorityPolicy::_unchecke
 {
   if (CORBA::is_nil (obj))
     return RequestPriorityPolicy::_nil ();
+
   return
       ACE_reinterpret_cast
         (
@@ -1208,7 +1214,7 @@ void *Messaging::RequestPriorityPolicy::_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;
@@ -1272,7 +1278,7 @@ Messaging::ReplyPriorityPolicy_var::operator const ::Messaging::ReplyPriorityPol
   return this->ptr_;
 }
 
-Messaging::ReplyPriorityPolicy_var::operator ::Messaging::ReplyPriorityPolicy_ptr &() // cast 
+Messaging::ReplyPriorityPolicy_var::operator ::Messaging::ReplyPriorityPolicy_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1430,6 +1436,7 @@ Messaging::ReplyPriorityPolicy_ptr Messaging::ReplyPriorityPolicy::_unchecked_na
 {
   if (CORBA::is_nil (obj))
     return ReplyPriorityPolicy::_nil ();
+
   return
       ACE_reinterpret_cast
         (
@@ -1475,7 +1482,7 @@ void *Messaging::ReplyPriorityPolicy::_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;
@@ -1543,7 +1550,7 @@ Messaging::RequestStartTimePolicy_var::operator const ::Messaging::RequestStartT
   return this->ptr_;
 }
 
-Messaging::RequestStartTimePolicy_var::operator ::Messaging::RequestStartTimePolicy_ptr &() // cast 
+Messaging::RequestStartTimePolicy_var::operator ::Messaging::RequestStartTimePolicy_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1701,6 +1708,7 @@ Messaging::RequestStartTimePolicy_ptr Messaging::RequestStartTimePolicy::_unchec
 {
   if (CORBA::is_nil (obj))
     return RequestStartTimePolicy::_nil ();
+
   return
       ACE_reinterpret_cast
         (
@@ -1746,7 +1754,7 @@ void *Messaging::RequestStartTimePolicy::_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;
@@ -1814,7 +1822,7 @@ Messaging::RequestEndTimePolicy_var::operator const ::Messaging::RequestEndTimeP
   return this->ptr_;
 }
 
-Messaging::RequestEndTimePolicy_var::operator ::Messaging::RequestEndTimePolicy_ptr &() // cast 
+Messaging::RequestEndTimePolicy_var::operator ::Messaging::RequestEndTimePolicy_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1972,6 +1980,7 @@ Messaging::RequestEndTimePolicy_ptr Messaging::RequestEndTimePolicy::_unchecked_
 {
   if (CORBA::is_nil (obj))
     return RequestEndTimePolicy::_nil ();
+
   return
       ACE_reinterpret_cast
         (
@@ -2017,7 +2026,7 @@ void *Messaging::RequestEndTimePolicy::_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;
@@ -2085,7 +2094,7 @@ Messaging::ReplyStartTimePolicy_var::operator const ::Messaging::ReplyStartTimeP
   return this->ptr_;
 }
 
-Messaging::ReplyStartTimePolicy_var::operator ::Messaging::ReplyStartTimePolicy_ptr &() // cast 
+Messaging::ReplyStartTimePolicy_var::operator ::Messaging::ReplyStartTimePolicy_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -2243,6 +2252,7 @@ Messaging::ReplyStartTimePolicy_ptr Messaging::ReplyStartTimePolicy::_unchecked_
 {
   if (CORBA::is_nil (obj))
     return ReplyStartTimePolicy::_nil ();
+
   return
       ACE_reinterpret_cast
         (
@@ -2288,7 +2298,7 @@ void *Messaging::ReplyStartTimePolicy::_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;
@@ -2356,7 +2366,7 @@ Messaging::ReplyEndTimePolicy_var::operator const ::Messaging::ReplyEndTimePolic
   return this->ptr_;
 }
 
-Messaging::ReplyEndTimePolicy_var::operator ::Messaging::ReplyEndTimePolicy_ptr &() // cast 
+Messaging::ReplyEndTimePolicy_var::operator ::Messaging::ReplyEndTimePolicy_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -2514,6 +2524,7 @@ Messaging::ReplyEndTimePolicy_ptr Messaging::ReplyEndTimePolicy::_unchecked_narr
 {
   if (CORBA::is_nil (obj))
     return ReplyEndTimePolicy::_nil ();
+
   return
       ACE_reinterpret_cast
         (
@@ -2559,7 +2570,7 @@ void *Messaging::ReplyEndTimePolicy::_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;
@@ -2627,7 +2638,7 @@ Messaging::RelativeRequestTimeoutPolicy_var::operator const ::Messaging::Relativ
   return this->ptr_;
 }
 
-Messaging::RelativeRequestTimeoutPolicy_var::operator ::Messaging::RelativeRequestTimeoutPolicy_ptr &() // cast 
+Messaging::RelativeRequestTimeoutPolicy_var::operator ::Messaging::RelativeRequestTimeoutPolicy_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -2785,6 +2796,7 @@ Messaging::RelativeRequestTimeoutPolicy_ptr Messaging::RelativeRequestTimeoutPol
 {
   if (CORBA::is_nil (obj))
     return RelativeRequestTimeoutPolicy::_nil ();
+
   return
       ACE_reinterpret_cast
         (
@@ -2830,7 +2842,7 @@ void *Messaging::RelativeRequestTimeoutPolicy::_tao_QueryInterface (ptr_arith_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;
@@ -2898,7 +2910,7 @@ Messaging::RelativeRoundtripTimeoutPolicy_var::operator const ::Messaging::Relat
   return this->ptr_;
 }
 
-Messaging::RelativeRoundtripTimeoutPolicy_var::operator ::Messaging::RelativeRoundtripTimeoutPolicy_ptr &() // cast 
+Messaging::RelativeRoundtripTimeoutPolicy_var::operator ::Messaging::RelativeRoundtripTimeoutPolicy_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -3056,6 +3068,7 @@ Messaging::RelativeRoundtripTimeoutPolicy_ptr Messaging::RelativeRoundtripTimeou
 {
   if (CORBA::is_nil (obj))
     return RelativeRoundtripTimeoutPolicy::_nil ();
+
   return
       ACE_reinterpret_cast
         (
@@ -3101,7 +3114,7 @@ void *Messaging::RelativeRoundtripTimeoutPolicy::_tao_QueryInterface (ptr_arith_
   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;
@@ -3124,22 +3137,22 @@ static const CORBA::Long _oc_Messaging_RoutingTypeRange[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   43,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f526f), 
-  ACE_NTOHL (0x7574696e), 
-  ACE_NTOHL (0x67547970), 
-  ACE_NTOHL (0x6552616e), 
-  ACE_NTOHL (0x67653a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f526f),
+  ACE_NTOHL (0x7574696e),
+  ACE_NTOHL (0x67547970),
+  ACE_NTOHL (0x6552616e),
+  ACE_NTOHL (0x67653a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/RoutingTypeRange:1.0
   17,
-  ACE_NTOHL (0x526f7574), 
-  ACE_NTOHL (0x696e6754), 
-  ACE_NTOHL (0x79706552), 
-  ACE_NTOHL (0x616e6765), 
+  ACE_NTOHL (0x526f7574),
+  ACE_NTOHL (0x696e6754),
+  ACE_NTOHL (0x79706552),
+  ACE_NTOHL (0x616e6765),
   ACE_NTOHL (0x0),  // name = RoutingTypeRange
   2, // member count
   4,
@@ -3148,19 +3161,19 @@ static const CORBA::Long _oc_Messaging_RoutingTypeRange[] =
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x4d657373), 
-    ACE_NTOHL (0x6167696e), 
-    ACE_NTOHL (0x672f526f), 
-    ACE_NTOHL (0x7574696e), 
-    ACE_NTOHL (0x67547970), 
-    ACE_NTOHL (0x653a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x4d657373),
+    ACE_NTOHL (0x6167696e),
+    ACE_NTOHL (0x672f526f),
+    ACE_NTOHL (0x7574696e),
+    ACE_NTOHL (0x67547970),
+    ACE_NTOHL (0x653a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/RoutingType:1.0
     12,
-    ACE_NTOHL (0x526f7574), 
-    ACE_NTOHL (0x696e6754), 
+    ACE_NTOHL (0x526f7574),
+    ACE_NTOHL (0x696e6754),
     ACE_NTOHL (0x79706500),  // name = RoutingType
     CORBA::tk_short,
 
@@ -3171,19 +3184,19 @@ static const CORBA::Long _oc_Messaging_RoutingTypeRange[] =
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x4d657373), 
-    ACE_NTOHL (0x6167696e), 
-    ACE_NTOHL (0x672f526f), 
-    ACE_NTOHL (0x7574696e), 
-    ACE_NTOHL (0x67547970), 
-    ACE_NTOHL (0x653a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x4d657373),
+    ACE_NTOHL (0x6167696e),
+    ACE_NTOHL (0x672f526f),
+    ACE_NTOHL (0x7574696e),
+    ACE_NTOHL (0x67547970),
+    ACE_NTOHL (0x653a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/RoutingType:1.0
     12,
-    ACE_NTOHL (0x526f7574), 
-    ACE_NTOHL (0x696e6754), 
+    ACE_NTOHL (0x526f7574),
+    ACE_NTOHL (0x696e6754),
     ACE_NTOHL (0x79706500),  // name = RoutingType
     CORBA::tk_short,
 
@@ -3258,7 +3271,7 @@ Messaging::RoutingPolicy_var::operator const ::Messaging::RoutingPolicy_ptr &()
   return this->ptr_;
 }
 
-Messaging::RoutingPolicy_var::operator ::Messaging::RoutingPolicy_ptr &() // cast 
+Messaging::RoutingPolicy_var::operator ::Messaging::RoutingPolicy_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -3416,6 +3429,7 @@ Messaging::RoutingPolicy_ptr Messaging::RoutingPolicy::_unchecked_narrow (
 {
   if (CORBA::is_nil (obj))
     return RoutingPolicy::_nil ();
+
   return
       ACE_reinterpret_cast
         (
@@ -3461,7 +3475,7 @@ void *Messaging::RoutingPolicy::_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;
@@ -3529,7 +3543,7 @@ Messaging::MaxHopsPolicy_var::operator const ::Messaging::MaxHopsPolicy_ptr &()
   return this->ptr_;
 }
 
-Messaging::MaxHopsPolicy_var::operator ::Messaging::MaxHopsPolicy_ptr &() // cast 
+Messaging::MaxHopsPolicy_var::operator ::Messaging::MaxHopsPolicy_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -3687,6 +3701,7 @@ Messaging::MaxHopsPolicy_ptr Messaging::MaxHopsPolicy::_unchecked_narrow (
 {
   if (CORBA::is_nil (obj))
     return MaxHopsPolicy::_nil ();
+
   return
       ACE_reinterpret_cast
         (
@@ -3732,7 +3747,7 @@ void *Messaging::MaxHopsPolicy::_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;
@@ -3800,7 +3815,7 @@ Messaging::QueueOrderPolicy_var::operator const ::Messaging::QueueOrderPolicy_pt
   return this->ptr_;
 }
 
-Messaging::QueueOrderPolicy_var::operator ::Messaging::QueueOrderPolicy_ptr &() // cast 
+Messaging::QueueOrderPolicy_var::operator ::Messaging::QueueOrderPolicy_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -3958,6 +3973,7 @@ Messaging::QueueOrderPolicy_ptr Messaging::QueueOrderPolicy::_unchecked_narrow (
 {
   if (CORBA::is_nil (obj))
     return QueueOrderPolicy::_nil ();
+
   return
       ACE_reinterpret_cast
         (
@@ -4003,7 +4019,7 @@ void *Messaging::QueueOrderPolicy::_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;
@@ -4020,46 +4036,46 @@ static const CORBA::Long _oc_Messaging_PolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x56616c75), 
-  ACE_NTOHL (0x653a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f506f),
+  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x56616c75),
+  ACE_NTOHL (0x653a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/PolicyValue:1.0
   12,
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63795661), 
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63795661),
   ACE_NTOHL (0x6c756500),  // name = PolicyValue
   2, // member count
   6,
-  ACE_NTOHL (0x70747970), 
+  ACE_NTOHL (0x70747970),
   ACE_NTOHL (0x65000000),  // name = ptype
   CORBA::tk_alias, // typecode kind for typedefs
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f506f), 
-    ACE_NTOHL (0x6c696379), 
-    ACE_NTOHL (0x54797065), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f506f),
+    ACE_NTOHL (0x6c696379),
+    ACE_NTOHL (0x54797065),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
     11,
-    ACE_NTOHL (0x506f6c69), 
-    ACE_NTOHL (0x63795479), 
+    ACE_NTOHL (0x506f6c69),
+    ACE_NTOHL (0x63795479),
     ACE_NTOHL (0x70650000),  // name = PolicyType
     CORBA::tk_ulong,
 
 
   7,
-  ACE_NTOHL (0x7076616c), 
+  ACE_NTOHL (0x7076616c),
   ACE_NTOHL (0x75650000),  // name = pvalue
   CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
@@ -4100,30 +4116,30 @@ void Messaging::PolicyValue::_tao_any_destructor (void *x)
 Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (void)
 {}
 Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (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)
 {}
 Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (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)
 {}
 Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &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)
 {}
 Messaging::PolicyValue::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
@@ -4139,7 +4155,7 @@ void Messaging::PolicyValue::_tao_seq_Octet::_tao_any_destructor (void *x)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_MESSAGING_POLICYVALUESEQ_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_MESSAGING_POLICYVALUESEQ_CS_
 
@@ -4148,43 +4164,43 @@ void Messaging::PolicyValue::_tao_seq_Octet::_tao_any_destructor (void *x)
   {
     Messaging::PolicyValue* tmp = 0;
     tmp = _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (length);
-    
+
     if (this->buffer_ != 0)
     {
       Messaging::PolicyValue *old = ACE_reinterpret_cast (Messaging::PolicyValue *,this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp[i] = old[i];
-      
+
       if (this->release_)
         _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (old);
-      
+
     }
     this->buffer_ = tmp;
   }
-  
+
   void
   Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
-    
+
     Messaging::PolicyValue *tmp = ACE_reinterpret_cast (Messaging::PolicyValue *,this->buffer_);
-    
+
     _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (tmp);
     this->buffer_ = 0;
-  } 
-  
+  }
+
   Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::~_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (void) // Dtor.
   {
     this->_deallocate_buffer ();
   }
-  
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_MESSAGING_POLICYVALUESEQ_CS_)
 #define _MESSAGING_POLICYVALUESEQ_CS_
@@ -4196,30 +4212,30 @@ void Messaging::PolicyValue::_tao_seq_Octet::_tao_any_destructor (void *x)
 Messaging::PolicyValueSeq::PolicyValueSeq (void)
 {}
 Messaging::PolicyValueSeq::PolicyValueSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<Messaging::PolicyValue>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 Messaging::PolicyValueSeq::PolicyValueSeq (CORBA::ULong max, CORBA::ULong length, Messaging::PolicyValue *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<Messaging::PolicyValue>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 Messaging::PolicyValueSeq::PolicyValueSeq (const PolicyValueSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<Messaging::PolicyValue>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 Messaging::PolicyValueSeq::~PolicyValueSeq (void) // dtor
@@ -4237,21 +4253,21 @@ static const CORBA::Long _oc_Messaging_PolicyValueSeq[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   41,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x56616c75), 
-  ACE_NTOHL (0x65536571), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f506f),
+  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x56616c75),
+  ACE_NTOHL (0x65536571),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Messaging/PolicyValueSeq:1.0
   15,
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63795661), 
-  ACE_NTOHL (0x6c756553), 
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63795661),
+  ACE_NTOHL (0x6c756553),
   ACE_NTOHL (0x65710000),  // name = PolicyValueSeq
   CORBA::tk_sequence, // typecode kind
   200, // encapsulation length
@@ -4260,46 +4276,46 @@ static const CORBA::Long _oc_Messaging_PolicyValueSeq[] =
     184, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       38,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x4d657373), 
-      ACE_NTOHL (0x6167696e), 
-      ACE_NTOHL (0x672f506f), 
-      ACE_NTOHL (0x6c696379), 
-      ACE_NTOHL (0x56616c75), 
-      ACE_NTOHL (0x653a312e), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x4d657373),
+      ACE_NTOHL (0x6167696e),
+      ACE_NTOHL (0x672f506f),
+      ACE_NTOHL (0x6c696379),
+      ACE_NTOHL (0x56616c75),
+      ACE_NTOHL (0x653a312e),
       ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/PolicyValue:1.0
       12,
-      ACE_NTOHL (0x506f6c69), 
-      ACE_NTOHL (0x63795661), 
+      ACE_NTOHL (0x506f6c69),
+      ACE_NTOHL (0x63795661),
       ACE_NTOHL (0x6c756500),  // name = PolicyValue
       2, // member count
       6,
-      ACE_NTOHL (0x70747970), 
+      ACE_NTOHL (0x70747970),
       ACE_NTOHL (0x65000000),  // name = ptype
       CORBA::tk_alias, // typecode kind for typedefs
       64, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f506f), 
-        ACE_NTOHL (0x6c696379), 
-        ACE_NTOHL (0x54797065), 
-        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f506f),
+        ACE_NTOHL (0x6c696379),
+        ACE_NTOHL (0x54797065),
+        ACE_NTOHL (0x3a312e30),
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
         11,
-        ACE_NTOHL (0x506f6c69), 
-        ACE_NTOHL (0x63795479), 
+        ACE_NTOHL (0x506f6c69),
+        ACE_NTOHL (0x63795479),
         ACE_NTOHL (0x70650000),  // name = PolicyType
         CORBA::tk_ulong,
 
 
       7,
-      ACE_NTOHL (0x7076616c), 
+      ACE_NTOHL (0x7076616c),
       ACE_NTOHL (0x75650000),  // name = pvalue
       CORBA::tk_sequence, // typecode kind
       12, // encapsulation length
@@ -4401,7 +4417,7 @@ Messaging::ExceptionHolder_init::~ExceptionHolder_init (void)
 {
 }
 
-const char* 
+const char*
 Messaging::ExceptionHolder_init::tao_repository_id (void)
 {
   return ExceptionHolder::_tao_obv_static_repository_id ();
@@ -4459,7 +4475,7 @@ Messaging::ReplyHandler_var::operator const ::Messaging::ReplyHandler_ptr &() co
   return this->ptr_;
 }
 
-Messaging::ReplyHandler_var::operator ::Messaging::ReplyHandler_ptr &() // cast 
+Messaging::ReplyHandler_var::operator ::Messaging::ReplyHandler_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -4597,7 +4613,7 @@ Messaging::ReplyHandler_out::operator-> (void)
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 Messaging::_TAO_ReplyHandler_Proxy_Impl::_TAO_ReplyHandler_Proxy_Impl (void)
@@ -4610,7 +4626,7 @@ Messaging::_TAO_ReplyHandler_Remote_Proxy_Impl::_TAO_ReplyHandler_Remote_Proxy_I
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -4712,11 +4728,13 @@ Messaging::ReplyHandler_ptr Messaging::ReplyHandler::_unchecked_narrow (
 {
   if (CORBA::is_nil (obj))
     return ReplyHandler::_nil ();
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
       if (stub)
         stub->_incr_refcnt ();
+
       ReplyHandler_ptr default_proxy = ReplyHandler::_nil ();
 
       if (
@@ -4731,14 +4749,14 @@ Messaging::ReplyHandler_ptr Messaging::ReplyHandler::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           ReplyHandler::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::Messaging::ReplyHandler (stub, 0, obj->_servant ()), ReplyHandler::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -4782,7 +4800,7 @@ void *Messaging::ReplyHandler::_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;
@@ -4797,20 +4815,20 @@ static const CORBA::Long _oc_Messaging_ReplyHandler[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x706c7948), 
-  ACE_NTOHL (0x616e646c), 
-  ACE_NTOHL (0x65723a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f5265),
+  ACE_NTOHL (0x706c7948),
+  ACE_NTOHL (0x616e646c),
+  ACE_NTOHL (0x65723a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/ReplyHandler:1.0
   13,
-  ACE_NTOHL (0x5265706c), 
-  ACE_NTOHL (0x7948616e), 
-  ACE_NTOHL (0x646c6572), 
+  ACE_NTOHL (0x5265706c),
+  ACE_NTOHL (0x7948616e),
+  ACE_NTOHL (0x646c6572),
   ACE_NTOHL (0x0),  // name = ReplyHandler
 };
 
@@ -4832,14 +4850,14 @@ TAO_NAMESPACE_END
 
 #if (TAO_HAS_AMI_CALLBACK == 1)
 
-CORBA::Boolean 
+CORBA::Boolean
 OBV_Messaging::ExceptionHolder::_tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &strm){
   return _tao_marshal_state (strm);
-  
+
 }
 CORBA::Boolean OBV_Messaging::ExceptionHolder::_tao_unmarshal__Messaging_ExceptionHolder (TAO_InputCDR &strm){
   return _tao_unmarshal_state (strm);
-  
+
 }
 // accessor to set the member
 void
@@ -4880,30 +4898,30 @@ OBV_Messaging::ExceptionHolder::byte_order (void) const
 Messaging::ExceptionHolder::_tao_seq_Octet::_tao_seq_Octet (void)
 {}
 Messaging::ExceptionHolder::_tao_seq_Octet::_tao_seq_Octet (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)
 {}
 Messaging::ExceptionHolder::_tao_seq_Octet::_tao_seq_Octet (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)
 {}
 Messaging::ExceptionHolder::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &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)
 {}
 Messaging::ExceptionHolder::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
@@ -4924,14 +4942,14 @@ OBV_Messaging::ExceptionHolder::marshaled_exception (const Messaging::ExceptionH
   this->_pd_marshaled_exception = val;
 }
 
-// readonly get method 
+// readonly get method
 const Messaging::ExceptionHolder::_tao_seq_Octet &
 OBV_Messaging::ExceptionHolder::marshaled_exception (void) const
 {
   return this->_pd_marshaled_exception;
 }
 
-// read/write get method 
+// read/write get method
 Messaging::ExceptionHolder::_tao_seq_Octet &
 OBV_Messaging::ExceptionHolder::marshaled_exception (void)
 {
@@ -4992,13 +5010,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::Priorit
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (Messaging::_tc_PriorityRange, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -5160,13 +5178,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::Routing
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (Messaging::_tc_RoutingTypeRange, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -5274,13 +5292,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::PolicyV
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (Messaging::_tc_PolicyValue, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -5365,13 +5383,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::PolicyV
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (Messaging::_tc_PolicyValueSeq, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -5420,7 +5438,7 @@ void operator<<= (CORBA::Any &_tao_any, Messaging::ReplyHandler_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        Messaging::_tc_ReplyHandler, 
+        Messaging::_tc_ReplyHandler,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -5436,13 +5454,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::ReplyHandler_
   {
     _tao_elem = Messaging::ReplyHandler::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (Messaging::_tc_ReplyHandler, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -5490,20 +5508,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>*, (Messaging::PolicyValue::_tao_seq_Octet *)&_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
@@ -5520,10 +5538,10 @@ 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))
@@ -5533,7 +5551,7 @@ CORBA::Boolean operator>> (
       strm.orb_core ()->resource_factory ()->
       input_cdr_allocator_type_locked () == 1)
       {
-        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);
@@ -5544,7 +5562,7 @@ CORBA::Boolean operator>> (
     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
@@ -5581,7 +5599,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/MessagingC.h b/TAO/tao/MessagingC.h
index 0b67e1e717b..8795ab51435 100644
--- a/TAO/tao/MessagingC.h
+++ b/TAO/tao/MessagingC.h
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_ORIG_MESSAGINGC_H_
-#define _TAO_IDL_ORIG_MESSAGINGC_H_
+#ifndef _TAO_IDL_MESSAGINGC_H_
+#define _TAO_IDL_MESSAGINGC_H_
 
 #include "ace/pre.h"
 #include "orbconf.h"
@@ -178,7 +178,7 @@ TAO_NAMESPACE  Messaging
     static RebindPolicy_ptr nil (void);
     static RebindPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
     static CORBA::Object * upcast (void *);
-  
+
   private:
     RebindPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -217,7 +217,7 @@ TAO_NAMESPACE  Messaging
 #if !defined (_MESSAGING_REBINDPOLICY_CH_)
 #define _MESSAGING_REBINDPOLICY_CH_
 
-class TAO_Export RebindPolicy: public virtual CORBA::Policy
+  class TAO_Export RebindPolicy: public virtual CORBA::Policy
   {
   public:
   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -313,7 +313,7 @@ class TAO_Export RebindPolicy: public virtual CORBA::Policy
     static SyncScopePolicy_ptr nil (void);
     static SyncScopePolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
     static CORBA::Object * upcast (void *);
-  
+
   private:
     SyncScopePolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -352,7 +352,7 @@ class TAO_Export RebindPolicy: public virtual CORBA::Policy
 #if !defined (_MESSAGING_SYNCSCOPEPOLICY_CH_)
 #define _MESSAGING_SYNCSCOPEPOLICY_CH_
 
-class TAO_Export SyncScopePolicy: public virtual CORBA::Policy
+  class TAO_Export SyncScopePolicy: public virtual CORBA::Policy
   {
   public:
   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -498,7 +498,7 @@ class TAO_Export SyncScopePolicy: public virtual CORBA::Policy
     static RequestPriorityPolicy_ptr nil (void);
     static RequestPriorityPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
     static CORBA::Object * upcast (void *);
-  
+
   private:
     RequestPriorityPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -537,7 +537,7 @@ class TAO_Export SyncScopePolicy: public virtual CORBA::Policy
 #if !defined (_MESSAGING_REQUESTPRIORITYPOLICY_CH_)
 #define _MESSAGING_REQUESTPRIORITYPOLICY_CH_
 
-class TAO_Export RequestPriorityPolicy: public virtual CORBA::Policy
+  class TAO_Export RequestPriorityPolicy: public virtual CORBA::Policy
   {
   public:
   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -629,7 +629,7 @@ class TAO_Export RequestPriorityPolicy: public virtual CORBA::Policy
     static ReplyPriorityPolicy_ptr nil (void);
     static ReplyPriorityPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
     static CORBA::Object * upcast (void *);
-  
+
   private:
     ReplyPriorityPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -668,7 +668,7 @@ class TAO_Export RequestPriorityPolicy: public virtual CORBA::Policy
 #if !defined (_MESSAGING_REPLYPRIORITYPOLICY_CH_)
 #define _MESSAGING_REPLYPRIORITYPOLICY_CH_
 
-class TAO_Export ReplyPriorityPolicy: public virtual CORBA::Policy
+  class TAO_Export ReplyPriorityPolicy: public virtual CORBA::Policy
   {
   public:
   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -764,7 +764,7 @@ class TAO_Export ReplyPriorityPolicy: public virtual CORBA::Policy
     static RequestStartTimePolicy_ptr nil (void);
     static RequestStartTimePolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
     static CORBA::Object * upcast (void *);
-  
+
   private:
     RequestStartTimePolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -803,7 +803,7 @@ class TAO_Export ReplyPriorityPolicy: public virtual CORBA::Policy
 #if !defined (_MESSAGING_REQUESTSTARTTIMEPOLICY_CH_)
 #define _MESSAGING_REQUESTSTARTTIMEPOLICY_CH_
 
-class TAO_Export RequestStartTimePolicy: public virtual CORBA::Policy
+  class TAO_Export RequestStartTimePolicy: public virtual CORBA::Policy
   {
   public:
   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -899,7 +899,7 @@ class TAO_Export RequestStartTimePolicy: public virtual CORBA::Policy
     static RequestEndTimePolicy_ptr nil (void);
     static RequestEndTimePolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
     static CORBA::Object * upcast (void *);
-  
+
   private:
     RequestEndTimePolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -938,7 +938,7 @@ class TAO_Export RequestStartTimePolicy: public virtual CORBA::Policy
 #if !defined (_MESSAGING_REQUESTENDTIMEPOLICY_CH_)
 #define _MESSAGING_REQUESTENDTIMEPOLICY_CH_
 
-class TAO_Export RequestEndTimePolicy: public virtual CORBA::Policy
+  class TAO_Export RequestEndTimePolicy: public virtual CORBA::Policy
   {
   public:
   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -1034,7 +1034,7 @@ class TAO_Export RequestEndTimePolicy: public virtual CORBA::Policy
     static ReplyStartTimePolicy_ptr nil (void);
     static ReplyStartTimePolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
     static CORBA::Object * upcast (void *);
-  
+
   private:
     ReplyStartTimePolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1073,7 +1073,7 @@ class TAO_Export RequestEndTimePolicy: public virtual CORBA::Policy
 #if !defined (_MESSAGING_REPLYSTARTTIMEPOLICY_CH_)
 #define _MESSAGING_REPLYSTARTTIMEPOLICY_CH_
 
-class TAO_Export ReplyStartTimePolicy: public virtual CORBA::Policy
+  class TAO_Export ReplyStartTimePolicy: public virtual CORBA::Policy
   {
   public:
   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -1169,7 +1169,7 @@ class TAO_Export ReplyStartTimePolicy: public virtual CORBA::Policy
     static ReplyEndTimePolicy_ptr nil (void);
     static ReplyEndTimePolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
     static CORBA::Object * upcast (void *);
-  
+
   private:
     ReplyEndTimePolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1208,7 +1208,7 @@ class TAO_Export ReplyStartTimePolicy: public virtual CORBA::Policy
 #if !defined (_MESSAGING_REPLYENDTIMEPOLICY_CH_)
 #define _MESSAGING_REPLYENDTIMEPOLICY_CH_
 
-class TAO_Export ReplyEndTimePolicy: public virtual CORBA::Policy
+  class TAO_Export ReplyEndTimePolicy: public virtual CORBA::Policy
   {
   public:
   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -1304,7 +1304,7 @@ class TAO_Export ReplyEndTimePolicy: public virtual CORBA::Policy
     static RelativeRequestTimeoutPolicy_ptr nil (void);
     static RelativeRequestTimeoutPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
     static CORBA::Object * upcast (void *);
-  
+
   private:
     RelativeRequestTimeoutPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1343,7 +1343,7 @@ class TAO_Export ReplyEndTimePolicy: public virtual CORBA::Policy
 #if !defined (_MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY_CH_)
 #define _MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY_CH_
 
-class TAO_Export RelativeRequestTimeoutPolicy: public virtual CORBA::Policy
+  class TAO_Export RelativeRequestTimeoutPolicy: public virtual CORBA::Policy
   {
   public:
   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -1439,7 +1439,7 @@ class TAO_Export RelativeRequestTimeoutPolicy: public virtual CORBA::Policy
     static RelativeRoundtripTimeoutPolicy_ptr nil (void);
     static RelativeRoundtripTimeoutPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
     static CORBA::Object * upcast (void *);
-  
+
   private:
     RelativeRoundtripTimeoutPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1478,7 +1478,7 @@ class TAO_Export RelativeRequestTimeoutPolicy: public virtual CORBA::Policy
 #if !defined (_MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY_CH_)
 #define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY_CH_
 
-class TAO_Export RelativeRoundtripTimeoutPolicy: public virtual CORBA::Policy
+  class TAO_Export RelativeRoundtripTimeoutPolicy: public virtual CORBA::Policy
   {
   public:
   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -1624,7 +1624,7 @@ class TAO_Export RelativeRoundtripTimeoutPolicy: public virtual CORBA::Policy
     static RoutingPolicy_ptr nil (void);
     static RoutingPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
     static CORBA::Object * upcast (void *);
-  
+
   private:
     RoutingPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1663,7 +1663,7 @@ class TAO_Export RelativeRoundtripTimeoutPolicy: public virtual CORBA::Policy
 #if !defined (_MESSAGING_ROUTINGPOLICY_CH_)
 #define _MESSAGING_ROUTINGPOLICY_CH_
 
-class TAO_Export RoutingPolicy: public virtual CORBA::Policy
+  class TAO_Export RoutingPolicy: public virtual CORBA::Policy
   {
   public:
   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -1759,7 +1759,7 @@ class TAO_Export RoutingPolicy: public virtual CORBA::Policy
     static MaxHopsPolicy_ptr nil (void);
     static MaxHopsPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
     static CORBA::Object * upcast (void *);
-  
+
   private:
     MaxHopsPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1798,7 +1798,7 @@ class TAO_Export RoutingPolicy: public virtual CORBA::Policy
 #if !defined (_MESSAGING_MAXHOPSPOLICY_CH_)
 #define _MESSAGING_MAXHOPSPOLICY_CH_
 
-class TAO_Export MaxHopsPolicy: public virtual CORBA::Policy
+  class TAO_Export MaxHopsPolicy: public virtual CORBA::Policy
   {
   public:
   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -1894,7 +1894,7 @@ class TAO_Export MaxHopsPolicy: public virtual CORBA::Policy
     static QueueOrderPolicy_ptr nil (void);
     static QueueOrderPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
     static CORBA::Object * upcast (void *);
-  
+
   private:
     QueueOrderPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1933,7 +1933,7 @@ class TAO_Export MaxHopsPolicy: public virtual CORBA::Policy
 #if !defined (_MESSAGING_QUEUEORDERPOLICY_CH_)
 #define _MESSAGING_QUEUEORDERPOLICY_CH_
 
-class TAO_Export QueueOrderPolicy: public virtual CORBA::Policy
+  class TAO_Export QueueOrderPolicy: public virtual CORBA::Policy
   {
   public:
   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -2480,7 +2480,7 @@ class TAO_Export QueueOrderPolicy: public virtual CORBA::Policy
     static ReplyHandler_ptr nil (void);
     static ReplyHandler_ptr narrow (CORBA::Object *, CORBA::Environment &);
     static CORBA::Object * upcast (void *);
-  
+
   private:
     ReplyHandler_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2519,13 +2519,13 @@ class TAO_Export QueueOrderPolicy: public virtual CORBA::Policy
 #if !defined (_MESSAGING_REPLYHANDLER_CH_)
 #define _MESSAGING_REPLYHANDLER_CH_
 
-// Forward Classes Declaration
+  // Forward Classes Declaration
   class _TAO_ReplyHandler_Proxy_Impl;
   class _TAO_ReplyHandler_Remote_Proxy_Impl;
   class _TAO_ReplyHandler_Proxy_Broker;
   class _TAO_ReplyHandler_Remote_Proxy_Broker;
 
-  class TAO_Export ReplyHandler : public virtual CORBA_Object
+  class TAO_Export ReplyHandler : public virtual CORBA::Object
   {
   public:
   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -2553,35 +2553,35 @@ class TAO_Export QueueOrderPolicy: public virtual CORBA::Policy
     static void _tao_any_destructor (void*);
 
     virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &ACE_TRY_ENV = 
+        const CORBA::Char *type_id,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   private:
     _TAO_ReplyHandler_Proxy_Broker *the_TAO_ReplyHandler_Proxy_Broker_;
-    
+
   protected:
     ReplyHandler (int collocated = 0);
-    
+
     protected:
       // This methods travese the inheritance tree and set the
       // parents piece of the given class in the right mode
       virtual void Messaging_ReplyHandler_setup_collocation (int collocated);
-      
+
       ReplyHandler (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
         );
-      
+
       friend class _TAO_ReplyHandler_Remote_Proxy_Impl;
       friend class _TAO_ReplyHandler_ThruPOA_Proxy_Impl;
       friend class _TAO_ReplyHandler_Direct_Proxy_Impl;
-    
+
     virtual ~ReplyHandler (void);
   private:
     ReplyHandler (const ReplyHandler &);
@@ -2675,7 +2675,7 @@ public:
 
   virtual _TAO_ReplyHandler_Proxy_Impl &select_proxy (
     ReplyHandler *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+    CORBA_Environment &ACE_TRY_ENV
   );
 
 private:
diff --git a/TAO/tao/MessagingC.i b/TAO/tao/MessagingC.i
index c0dfacad492..b987a600450 100644
--- a/TAO/tao/MessagingC.i
+++ b/TAO/tao/MessagingC.i
@@ -2012,12 +2012,12 @@ OBV_Messaging::ExceptionHolder::_tao_unmarshal_state (TAO_InputCDR &strm)
 
 }
 
-CORBA::Boolean TAO_Export 
+CORBA::Boolean TAO_Export
 operator<< (
     TAO_OutputCDR &,
     const Messaging::ReplyHandler_ptr
   );
-CORBA::Boolean TAO_Export 
+CORBA::Boolean TAO_Export
 operator>> (
     TAO_InputCDR &,
     Messaging::ReplyHandler_ptr &
diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp
index 2fe8a940a56..44fa7b24076 100644
--- a/TAO/tao/PolicyC.cpp
+++ b/TAO/tao/PolicyC.cpp
@@ -24,9 +24,11 @@
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
-#include "tao/ClientRequestInfo.h"
+
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
+#include "tao/ClientRequestInfo.h"
+#include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 #if defined (__BORLANDC__)
@@ -80,15 +82,15 @@ void CORBA_PolicyError::_tao_any_destructor (void *x)
 }
 
 // Copy constructor.
-CORBA_PolicyError::CORBA_PolicyError (const ::CORBA_PolicyError &_tao_excp)
+CORBA_PolicyError::CORBA_PolicyError (const ::CORBA::PolicyError &_tao_excp)
   : CORBA_UserException (_tao_excp._id ())
 {
   this->reason = _tao_excp.reason;
 }
 
 // Assignment operator.
-CORBA_PolicyError&
-CORBA_PolicyError::operator= (const ::CORBA_PolicyError &_tao_excp)
+CORBA::PolicyError&
+CORBA::PolicyError::operator= (const ::CORBA::PolicyError &_tao_excp)
 {
   this->CORBA_UserException::operator= (_tao_excp);
   this->reason = _tao_excp.reason;
@@ -96,8 +98,8 @@ CORBA_PolicyError::operator= (const ::CORBA_PolicyError &_tao_excp)
 }
 
 // Narrow.
-CORBA_PolicyError *
-CORBA_PolicyError::_downcast (CORBA::Exception *exc)
+CORBA::PolicyError *
+CORBA::PolicyError::_downcast (CORBA::Exception *exc)
 {
   if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PolicyError:1.0", exc->_id ()))
     {
@@ -109,12 +111,12 @@ CORBA_PolicyError::_downcast (CORBA::Exception *exc)
     }
 }
 
-void CORBA_PolicyError::_raise ()
+void CORBA::PolicyError::_raise ()
 {
   TAO_RAISE (*this);
 }
 
-void CORBA_PolicyError::_tao_encode (
+void CORBA::PolicyError::_tao_encode (
     TAO_OutputCDR &cdr,
     CORBA::Environment &ACE_TRY_ENV
   ) const
@@ -123,11 +125,11 @@ void CORBA_PolicyError::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-void CORBA_PolicyError::_tao_decode (
+void CORBA::PolicyError::_tao_decode (
     TAO_InputCDR &cdr,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -136,15 +138,15 @@ void CORBA_PolicyError::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 // TAO extension - the _alloc method.
-CORBA::Exception *CORBA_PolicyError::_alloc (void)
+CORBA::Exception *CORBA::PolicyError::_alloc (void)
 {
   CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::CORBA_PolicyError, 0);
+  ACE_NEW_RETURN (retval, ::CORBA::PolicyError, 0);
   return retval;
 }
 
@@ -156,74 +158,15 @@ CORBA_PolicyError::CORBA_PolicyError (
   this->reason = _tao_reason;
 }
 
-static const CORBA::Long _oc_CORBA_PolicyError[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  34,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x415f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x4572726f), 
-  ACE_NTOHL (0x723a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_PolicyError:1.0
-  18,
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x415f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x4572726f), 
-  ACE_NTOHL (0x72000000),  // name = CORBA_PolicyError
-  1, // member count
-  7,
-  ACE_NTOHL (0x72656173), 
-  ACE_NTOHL (0x6f6e0000),  // name = reason
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    38,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f506f), 
-    ACE_NTOHL (0x6c696379), 
-    ACE_NTOHL (0x4572726f), 
-    ACE_NTOHL (0x72436f64), 
-    ACE_NTOHL (0x653a312e), 
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/PolicyErrorCode:1.0
-    16,
-    ACE_NTOHL (0x506f6c69), 
-    ACE_NTOHL (0x63794572), 
-    ACE_NTOHL (0x726f7243), 
-    ACE_NTOHL (0x6f646500),  // name = PolicyErrorCode
-    CORBA::tk_short,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyError (
-    CORBA::tk_except,
-    sizeof (_oc_CORBA_PolicyError),
-    (char *) &_oc_CORBA_PolicyError,
-    0,
-    sizeof (CORBA_PolicyError)
-  );
-
-CORBA::TypeCode_ptr _tc_CORBA_PolicyError =
-  &_tc_TAO_tc_CORBA_PolicyError;
-
-
 // TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr CORBA_PolicyError::_type (void) const
+CORBA::TypeCode_ptr CORBA::PolicyError::_type (void) const
 {
-  return ::_tc_CORBA_PolicyError;
+  return ::CORBA::_tc_PolicyError;
 }
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CS_
 
@@ -232,43 +175,43 @@ CORBA::TypeCode_ptr CORBA_PolicyError::_type (void) const
   {
     CORBA::UShort* tmp = 0;
     tmp = _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (length);
-    
+
     if (this->buffer_ != 0)
     {
       CORBA::UShort *old = ACE_reinterpret_cast (CORBA::UShort *,this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp[i] = old[i];
-      
+
       if (this->release_)
         _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::freebuf (old);
-      
+
     }
     this->buffer_ = tmp;
   }
-  
+
   void
   CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
-    
+
     CORBA::UShort *tmp = ACE_reinterpret_cast (CORBA::UShort *,this->buffer_);
-    
+
     _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::freebuf (tmp);
     this->buffer_ = 0;
-  } 
-  
+  }
+
   CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::~_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (void) // Dtor.
   {
     this->_deallocate_buffer ();
   }
-  
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CS_)
 #define _CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CS_
@@ -280,30 +223,30 @@ CORBA::TypeCode_ptr CORBA_PolicyError::_type (void) const
 CORBA_InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (void)
 {}
 CORBA_InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::UShort>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 CORBA_InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (CORBA::ULong max, CORBA::ULong length, CORBA::UShort *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::UShort>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 CORBA_InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (const _tao_seq_UShort &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::UShort>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 CORBA_InvalidPolicies::_tao_seq_UShort::~_tao_seq_UShort (void) // dtor
@@ -378,7 +321,7 @@ void CORBA_InvalidPolicies::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -391,7 +334,7 @@ void CORBA_InvalidPolicies::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -411,73 +354,70 @@ CORBA_InvalidPolicies::CORBA_InvalidPolicies (
   this->indices = _tao_indices;
 }
 
-static const CORBA::Long _oc_CORBA_InvalidPolicies[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x415f496e), 
-  ACE_NTOHL (0x76616c69), 
-  ACE_NTOHL (0x64506f6c), 
-  ACE_NTOHL (0x69636965), 
-  ACE_NTOHL (0x733a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_InvalidPolicies:1.0
-  22,
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x415f496e), 
-  ACE_NTOHL (0x76616c69), 
-  ACE_NTOHL (0x64506f6c), 
-  ACE_NTOHL (0x69636965), 
-  ACE_NTOHL (0x73000000),  // name = CORBA_InvalidPolicies
-  1, // member count
-  8,
-  ACE_NTOHL (0x696e6469), 
-  ACE_NTOHL (0x63657300),  // name = indices
-  CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_ushort,
-
-    0U,
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr CORBA_InvalidPolicies::_type (void) const
+{
+  return ::CORBA::_tc_InvalidPolicies;
+}
 
-};
+CORBA::Policy_ptr
+tao_CORBA_Policy_duplicate (
+    CORBA::Policy_ptr p
+  )
+{
+  return CORBA::Policy::_duplicate (p);
+}
 
-static CORBA::TypeCode _tc_TAO_tc_CORBA_InvalidPolicies (
-    CORBA::tk_except,
-    sizeof (_oc_CORBA_InvalidPolicies),
-    (char *) &_oc_CORBA_InvalidPolicies,
-    0,
-    sizeof (CORBA_InvalidPolicies)
-  );
+void
+tao_CORBA_Policy_release (
+    CORBA::Policy_ptr p
+  )
+{
+  CORBA::release (p);
+}
 
-CORBA::TypeCode_ptr _tc_CORBA_InvalidPolicies =
-  &_tc_TAO_tc_CORBA_InvalidPolicies;
+CORBA::Policy_ptr
+tao_CORBA_Policy_nil (
+    void
+  )
+{
+  return CORBA::Policy::_nil ();
+}
 
+CORBA::Policy_ptr
+tao_CORBA_Policy_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA::Policy::_narrow (p, ACE_TRY_ENV);
+}
 
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr CORBA_InvalidPolicies::_type (void) const
+CORBA::Object *
+tao_CORBA_Policy_upcast (
+    void *src
+  )
 {
-  return ::_tc_CORBA_InvalidPolicies;
+  CORBA::Policy **tmp =
+    ACE_static_cast (CORBA::Policy **, src);
+  return *tmp;
 }
 
 // *************************************************************
-// Operations for class CORBA_Policy_var
+// Operations for class CORBA::Policy_var
 // *************************************************************
 
 CORBA_Policy_var::CORBA_Policy_var (void) // default constructor
   : ptr_ (CORBA_Policy::_nil ())
 {}
 
-::CORBA_Policy_ptr
+::CORBA::Policy_ptr
 CORBA_Policy_var::ptr (void) const
 {
   return this->ptr_;
 }
 
-CORBA_Policy_var::CORBA_Policy_var (const ::CORBA_Policy_var &p) // copy constructor
+CORBA_Policy_var::CORBA_Policy_var (const ::CORBA::Policy_var &p) // copy constructor
   : TAO_Base_var (),
     ptr_ (CORBA_Policy::_duplicate (p.ptr ()))
 {}
@@ -487,7 +427,7 @@ CORBA_Policy_var::~CORBA_Policy_var (void) // destructor
   CORBA::release (this->ptr_);
 }
 
-CORBA_Policy_var &
+CORBA::Policy_var &
 CORBA_Policy_var::operator= (CORBA_Policy_ptr p)
 {
   CORBA::release (this->ptr_);
@@ -495,66 +435,66 @@ CORBA_Policy_var::operator= (CORBA_Policy_ptr p)
   return *this;
 }
 
-CORBA_Policy_var &
-CORBA_Policy_var::operator= (const ::CORBA_Policy_var &p)
+CORBA::Policy_var &
+CORBA_Policy_var::operator= (const ::CORBA::Policy_var &p)
 {
   if (this != &p)
   {
     CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA_Policy::_duplicate (p.ptr ());
+    this->ptr_ = ::CORBA::Policy::_duplicate (p.ptr ());
   }
   return *this;
 }
 
-CORBA_Policy_var::operator const ::CORBA_Policy_ptr &() const // cast
+CORBA_Policy_var::operator const ::CORBA::Policy_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-CORBA_Policy_var::operator ::CORBA_Policy_ptr &() // cast 
+CORBA_Policy_var::operator ::CORBA::Policy_ptr &() // cast
 {
   return this->ptr_;
 }
 
-::CORBA_Policy_ptr
+::CORBA::Policy_ptr
 CORBA_Policy_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-::CORBA_Policy_ptr
+::CORBA::Policy_ptr
 CORBA_Policy_var::in (void) const
 {
   return this->ptr_;
 }
 
-::CORBA_Policy_ptr &
+::CORBA::Policy_ptr &
 CORBA_Policy_var::inout (void)
 {
   return this->ptr_;
 }
 
-::CORBA_Policy_ptr &
+::CORBA::Policy_ptr &
 CORBA_Policy_var::out (void)
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_Policy::_nil ();
+  this->ptr_ = ::CORBA::Policy::_nil ();
   return this->ptr_;
 }
 
-::CORBA_Policy_ptr
+::CORBA::Policy_ptr
 CORBA_Policy_var::_retn (void)
 {
   // yield ownership of managed obj reference
-  ::CORBA_Policy_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA_Policy::_nil ();
+  ::CORBA::Policy_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA::Policy::_nil ();
   return val;
 }
 
-::CORBA_Policy_ptr
+::CORBA::Policy_ptr
 CORBA_Policy_var::duplicate (CORBA_Policy_ptr p)
 {
-  return ::CORBA_Policy::_duplicate (p);
+  return ::CORBA::Policy::_duplicate (p);
 }
 
 void
@@ -563,19 +503,19 @@ CORBA_Policy_var::release (CORBA_Policy_ptr p)
   CORBA::release (p);
 }
 
-::CORBA_Policy_ptr
+::CORBA::Policy_ptr
 CORBA_Policy_var::nil (void)
 {
-  return ::CORBA_Policy::_nil ();
+  return ::CORBA::Policy::_nil ();
 }
 
-::CORBA_Policy_ptr
+::CORBA::Policy_ptr
 CORBA_Policy_var::narrow (
     CORBA::Object *p,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  return ::CORBA_Policy::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA::Policy::_narrow (p, ACE_TRY_ENV);
 }
 
 CORBA::Object *
@@ -585,21 +525,22 @@ CORBA_Policy_var::upcast (void *src)
     ACE_static_cast (CORBA_Policy **, src);
   return *tmp;
 }
+
 // *************************************************************
-// Operations for class CORBA_Policy_out
+// Operations for class CORBA::Policy_out
 // *************************************************************
 
 CORBA_Policy_out::CORBA_Policy_out (CORBA_Policy_ptr &p)
   : ptr_ (p)
 {
-  this->ptr_ = ::CORBA_Policy::_nil ();
+  this->ptr_ = ::CORBA::Policy::_nil ();
 }
 
 CORBA_Policy_out::CORBA_Policy_out (CORBA_Policy_var &p) // constructor from _var
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_Policy::_nil ();
+  this->ptr_ = ::CORBA::Policy::_nil ();
 }
 
 CORBA_Policy_out::CORBA_Policy_out (const ::CORBA_Policy_out &p) // copy constructor
@@ -607,38 +548,38 @@ CORBA_Policy_out::CORBA_Policy_out (const ::CORBA_Policy_out &p) // copy constru
 {}
 
 ::CORBA_Policy_out &
-CORBA_Policy_out::operator= (const ::CORBA_Policy_out &p)
+CORBA_Policy_out::operator= (const ::CORBA::Policy_out &p)
 {
   this->ptr_ = ACE_const_cast (CORBA_Policy_out&, p).ptr_;
   return *this;
 }
 
-CORBA_Policy_out &
-CORBA_Policy_out::operator= (const ::CORBA_Policy_var &p)
+CORBA::Policy_out &
+CORBA_Policy_out::operator= (const ::CORBA::Policy_var &p)
 {
-  this->ptr_ = ::CORBA_Policy::_duplicate (p.ptr ());
+  this->ptr_ = ::CORBA::Policy::_duplicate (p.ptr ());
   return *this;
 }
 
-CORBA_Policy_out &
+CORBA::Policy_out &
 CORBA_Policy_out::operator= (CORBA_Policy_ptr p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-CORBA_Policy_out::operator ::CORBA_Policy_ptr &() // cast
+CORBA_Policy_out::operator ::CORBA::Policy_ptr &() // cast
 {
   return this->ptr_;
 }
 
-::CORBA_Policy_ptr &
+::CORBA::Policy_ptr &
 CORBA_Policy_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-::CORBA_Policy_ptr
+::CORBA::Policy_ptr
 CORBA_Policy_out::operator-> (void)
 {
   return this->ptr_;
@@ -652,24 +593,24 @@ public:
   TAO_ClientRequestInfo_CORBA_Policy_policy_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -686,7 +627,7 @@ private:
 TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::TAO_ClientRequestInfo_CORBA_Policy_policy_type_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -699,7 +640,7 @@ TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::arguments (CORBA::Environmen
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -711,12 +652,12 @@ TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::exceptions (CORBA::Environme
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -725,17 +666,17 @@ TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::result (CORBA::Environment &
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::result (CORBA::PolicyType result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -745,41 +686,41 @@ public:
   TAO_ClientRequestInfo_CORBA_Policy_copy (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA_Policy_ptr result);
+  void result (CORBA::Policy_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_Policy_copy (const TAO_ClientRequestInfo_CORBA_Policy_copy &);
   void operator= (const TAO_ClientRequestInfo_CORBA_Policy_copy &);
 
-  CORBA_Policy_ptr _result;
+  CORBA::Policy_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_Policy_copy::TAO_ClientRequestInfo_CORBA_Policy_copy (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -792,7 +733,7 @@ TAO_ClientRequestInfo_CORBA_Policy_copy::arguments (CORBA::Environment &ACE_TRY_
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -804,12 +745,12 @@ TAO_ClientRequestInfo_CORBA_Policy_copy::exceptions (CORBA::Environment &ACE_TRY
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Policy_copy::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -818,17 +759,17 @@ TAO_ClientRequestInfo_CORBA_Policy_copy::result (CORBA::Environment &ACE_TRY_ENV
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
-TAO_ClientRequestInfo_CORBA_Policy_copy::result (CORBA_Policy_ptr result)
+void
+TAO_ClientRequestInfo_CORBA_Policy_copy::result (CORBA::Policy_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -838,24 +779,24 @@ public:
   TAO_ClientRequestInfo_CORBA_Policy_destroy (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -864,13 +805,13 @@ private:
   TAO_ClientRequestInfo_CORBA_Policy_destroy (const TAO_ClientRequestInfo_CORBA_Policy_destroy &);
   void operator= (const TAO_ClientRequestInfo_CORBA_Policy_destroy &);
 
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_Policy_destroy::TAO_ClientRequestInfo_CORBA_Policy_destroy (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Environment &
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
@@ -883,7 +824,7 @@ TAO_ClientRequestInfo_CORBA_Policy_destroy::arguments (CORBA::Environment &ACE_T
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -895,12 +836,12 @@ TAO_ClientRequestInfo_CORBA_Policy_destroy::exceptions (CORBA::Environment &ACE_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Policy_destroy::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -909,41 +850,41 @@ TAO_ClientRequestInfo_CORBA_Policy_destroy::result (CORBA::Environment &ACE_TRY_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
-_TAO_CORBA_Policy_Proxy_Impl::_TAO_CORBA_Policy_Proxy_Impl (void)
+CORBA_TAO_Policy_Proxy_Impl::CORBA_TAO_Policy_Proxy_Impl (void)
 {}
 
-_TAO_CORBA_Policy_Remote_Proxy_Impl::_TAO_CORBA_Policy_Remote_Proxy_Impl (void)
+CORBA_TAO_Policy_Remote_Proxy_Impl::CORBA_TAO_Policy_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
 
-CORBA::PolicyType _TAO_CORBA_Policy_Remote_Proxy_Impl::policy_type (
-    CORBA_Object *_collocated_tao_target_,
+CORBA::PolicyType CORBA_TAO_Policy_Remote_Proxy_Impl::policy_type (
+    CORBA::Object_ptr _collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  
+
   CORBA::PolicyType _tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_policy_type",
@@ -952,17 +893,21 @@ CORBA::PolicyType _TAO_CORBA_Policy_Remote_Proxy_Impl::policy_type (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Policy_policy_type_get ri (
         &_tao_call,
@@ -970,43 +915,66 @@ CORBA::PolicyType _TAO_CORBA_Policy_Remote_Proxy_Impl::policy_type (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN  (_tao_retval);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                 CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_retval)
@@ -1016,93 +984,74 @@ CORBA::PolicyType _TAO_CORBA_Policy_Remote_Proxy_Impl::policy_type (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA::PolicyType  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA::PolicyType _tao_retval_info = _tao_retval;
+          ri.result (_tao_retval_info);
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN  (_tao_retval);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_retval;
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN  (_tao_retval);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_retval;
 }
 
-CORBA_Policy_ptr _TAO_CORBA_Policy_Remote_Proxy_Impl::copy (
-    CORBA_Object *_collocated_tao_target_,
+CORBA::Policy_ptr CORBA_TAO_Policy_Remote_Proxy_Impl::copy (
+    CORBA::Object_ptr _collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  
-  CORBA_Policy_ptr _tao_retval = CORBA_Policy::_nil ();
-  CORBA_Policy_var _tao_safe_retval (_tao_retval);
-  
-  
+
+  CORBA::Policy_ptr _tao_retval = CORBA::Policy::_nil ();
+  CORBA::Policy_var _tao_safe_retval (_tao_retval);
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "copy",
@@ -1111,17 +1060,21 @@ CORBA_Policy_ptr _TAO_CORBA_Policy_Remote_Proxy_Impl::copy (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Policy_copy ri (
         &_tao_call,
@@ -1129,43 +1082,66 @@ CORBA_Policy_ptr _TAO_CORBA_Policy_Remote_Proxy_Impl::copy (
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                 CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+
+              continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -1175,93 +1151,74 @@ CORBA_Policy_ptr _TAO_CORBA_Policy_Remote_Proxy_Impl::copy (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
-          TAO_INTERCEPTOR (
-              CORBA_Policy_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          CORBA::Policy_ptr _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
-void _TAO_CORBA_Policy_Remote_Proxy_Impl::destroy (
-    CORBA_Object *_collocated_tao_target_,
+void CORBA_TAO_Policy_Remote_Proxy_Impl::destroy (
+    CORBA::Object_ptr _collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "destroy",
@@ -1270,17 +1227,21 @@ void _TAO_CORBA_Policy_Remote_Proxy_Impl::destroy (
       istub->orb_core ()
     );
 
+  int _invoke_status;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Policy_destroy ri (
         &_tao_call,
@@ -1288,107 +1249,114 @@ void _TAO_CORBA_Policy_Remote_Proxy_Impl::destroy (
         ACE_TRY_ENV
       );
       ACE_CHECK;
-      
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+
+#if TAO_HAS_INTERCEPTORS == 1
+
       ACE_TRY
         {
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+
 #endif /* TAO_HAS_INTERCEPTORS */
-        
+
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
+
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
                 CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
+                ACE_TRY_CHECK;
+              )
+
+              continue;
+            }
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -1396,37 +1364,37 @@ void _TAO_CORBA_Policy_Remote_Proxy_Impl::destroy (
 //           Remote & Base  Proxy Broker Implementation
 //
 
-_TAO_CORBA_Policy_Proxy_Broker::_TAO_CORBA_Policy_Proxy_Broker (void)
+CORBA_TAO_Policy_Proxy_Broker::CORBA_TAO_Policy_Proxy_Broker (void)
 {
 }
 
-_TAO_CORBA_Policy_Proxy_Broker::~_TAO_CORBA_Policy_Proxy_Broker (void)
+CORBA_TAO_Policy_Proxy_Broker::~CORBA_TAO_Policy_Proxy_Broker (void)
 {
 }
 
-_TAO_CORBA_Policy_Proxy_Broker * (*_TAO_CORBA_Policy_Proxy_Broker_Factory_function_pointer) (
+CORBA_TAO_Policy_Proxy_Broker * (*CORBA_CORBA_TAO_Policy_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-_TAO_CORBA_Policy_Remote_Proxy_Broker *
-_TAO_CORBA_Policy_Remote_Proxy_Broker::the_TAO_CORBA_Policy_Remote_Proxy_Broker (void)
+CORBA_TAO_Policy_Remote_Proxy_Broker *
+CORBA_TAO_Policy_Remote_Proxy_Broker::the_CORBA_TAO_Policy_Remote_Proxy_Broker (void)
 {
-  static ::_TAO_CORBA_Policy_Remote_Proxy_Broker remote_proxy_broker;
+  static CORBA_TAO_Policy_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-_TAO_CORBA_Policy_Remote_Proxy_Broker::_TAO_CORBA_Policy_Remote_Proxy_Broker (void)
+CORBA_TAO_Policy_Remote_Proxy_Broker::CORBA_TAO_Policy_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_CORBA_Policy_Remote_Proxy_Broker::~_TAO_CORBA_Policy_Remote_Proxy_Broker (void)
+CORBA_TAO_Policy_Remote_Proxy_Broker::~CORBA_TAO_Policy_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_CORBA_Policy_Proxy_Impl&
-_TAO_CORBA_Policy_Remote_Proxy_Broker::select_proxy (
-  ::CORBA_Policy *,
+CORBA_TAO_Policy_Proxy_Impl&
+CORBA_TAO_Policy_Remote_Proxy_Broker::select_proxy (
+  ::CORBA::Policy *,
   CORBA::Environment &
 )
 {
@@ -1453,11 +1421,11 @@ void
 CORBA_Policy::CORBA_Policy_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_CORBA_Policy_Proxy_Broker_ =
-      ::_TAO_CORBA_Policy_Proxy_Broker_Factory_function_pointer (this);
+    this->the_CORBA_TAO_Policy_Proxy_Broker_ =
+      ::CORBA_CORBA_TAO_Policy_Proxy_Broker_Factory_function_pointer (this);
   else
-    this->the_TAO_CORBA_Policy_Proxy_Broker_ =
-      ::_TAO_CORBA_Policy_Remote_Proxy_Broker::the_TAO_CORBA_Policy_Remote_Proxy_Broker ();
+    this->the_CORBA_TAO_Policy_Proxy_Broker_ =
+      CORBA_TAO_Policy_Remote_Proxy_Broker::the_CORBA_TAO_Policy_Remote_Proxy_Broker ();
 }
 
 void CORBA_Policy::_tao_any_destructor (void *x)
@@ -1466,7 +1434,7 @@ void CORBA_Policy::_tao_any_destructor (void *x)
   CORBA::release (tmp);
 }
 
-CORBA_Policy_ptr CORBA_Policy::_narrow (
+CORBA::Policy_ptr CORBA_Policy::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -1483,40 +1451,42 @@ CORBA_Policy_ptr CORBA_Policy::_narrow (
   return CORBA_Policy::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-CORBA_Policy_ptr CORBA_Policy::_unchecked_narrow (
+CORBA::Policy_ptr CORBA_Policy::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_Policy::_nil ();
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
       if (stub)
         stub->_incr_refcnt ();
+
       CORBA_Policy_ptr default_proxy = CORBA_Policy::_nil ();
 
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&_TAO_CORBA_Policy_Proxy_Broker_Factory_function_pointer != 0
+          obj->_is_collocated () &&CORBA_CORBA_TAO_Policy_Proxy_Broker_Factory_function_pointer != 0
         )
       {
         ACE_NEW_RETURN (
           default_proxy,
-          ::CORBA_Policy (
+          ::CORBA::Policy (
             stub,
             1,
             obj->_servant ()),
-            
+
           CORBA_Policy::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
-        ACE_NEW_RETURN (default_proxy, ::CORBA_Policy (stub, 0, obj->_servant ()), CORBA_Policy::_nil ());
+        ACE_NEW_RETURN (default_proxy, ::CORBA::Policy (stub, 0, obj->_servant ()), CORBA_Policy::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -1532,7 +1502,7 @@ CORBA_Policy_ptr CORBA_Policy::_unchecked_narrow (
           );
 }
 
-CORBA_Policy_ptr
+CORBA::Policy_ptr
 CORBA_Policy::_duplicate (CORBA_Policy_ptr obj)
 {
   if (!CORBA::is_nil (obj))
@@ -1550,7 +1520,7 @@ CORBA::Boolean CORBA_Policy::_is_a (const CORBA::Char *value, CORBA::Environment
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-void *CORBA_Policy::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA::Policy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
@@ -1560,7 +1530,7 @@ void *CORBA_Policy::_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;
@@ -1590,83 +1560,52 @@ CORBA::PolicyType CORBA_Policy::policy_type (
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_Policy_Proxy_Impl &proxy = 
-    this->the_TAO_CORBA_Policy_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  CORBA_TAO_Policy_Proxy_Impl &proxy =
+    this->the_CORBA_TAO_Policy_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.policy_type (
       this,
       ACE_TRY_ENV
     );
 }
 
-CORBA_Policy_ptr CORBA_Policy::copy (
+CORBA::Policy_ptr CORBA_Policy::copy (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_Policy_Proxy_Impl &proxy = 
-    this->the_TAO_CORBA_Policy_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  CORBA_TAO_Policy_Proxy_Impl &proxy =
+    this->the_CORBA_TAO_Policy_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.copy (
       this,
       ACE_TRY_ENV
     );
 }
 
-void CORBA_Policy::destroy (
+void CORBA::Policy::destroy (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_Policy_Proxy_Impl &proxy = 
-    this->the_TAO_CORBA_Policy_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  CORBA_TAO_Policy_Proxy_Impl &proxy =
+    this->the_CORBA_TAO_Policy_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   proxy.destroy (
       this,
       ACE_TRY_ENV
     );
 }
 
-static const CORBA::Long _oc_CORBA_Policy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  29,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x415f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA_Policy:1.0
-  13,
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x415f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x0),  // name = CORBA_Policy
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_Policy (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_Policy),
-    (char *) &_oc_CORBA_Policy,
-    0,
-    sizeof (CORBA_Policy)
-  );
-
-CORBA::TypeCode_ptr _tc_CORBA_Policy =
-  &_tc_TAO_tc_CORBA_Policy;
-
-
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CS_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CS_
 
@@ -1674,24 +1613,24 @@ CORBA::TypeCode_ptr _tc_CORBA_Policy =
   void
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_allocate_buffer (CORBA::ULong length)
   {
-    CORBA_Policy **tmp = 0;
+    CORBA::Policy **tmp = 0;
     tmp = _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (length);
-    
+
     if (this->buffer_ != 0)
     {
-      CORBA_Policy **old = ACE_reinterpret_cast (CORBA_Policy**, this->buffer_);
+      CORBA::Policy **old = ACE_reinterpret_cast (CORBA::Policy**, this->buffer_);
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
           if (!this->release_)
             {
-              tmp[i] = CORBA_Policy::_duplicate (old[i]);
+              tmp[i] = CORBA::Policy::_duplicate (old[i]);
             }
           else
             {
               tmp[i] = old[i];
             }
         }
-      
+
       if (this->release_)
         {
           delete[] old;
@@ -1699,99 +1638,99 @@ CORBA::TypeCode_ptr _tc_CORBA_Policy =
     }
     this->buffer_ = tmp;
   }
-  
+
   void
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
-    CORBA_Policy **tmp = ACE_reinterpret_cast (CORBA_Policy**, this->buffer_);
+    CORBA::Policy **tmp = ACE_reinterpret_cast (CORBA::Policy**, this->buffer_);
 
     for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA_Policy::_nil ();
-    }
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = CORBA::Policy::_nil ();
+      }
 
     _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::freebuf (tmp);
     this->buffer_ = 0;
   }
-  
+
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::~_TAO_Unbounded_Object_Sequence_CORBA_PolicyList (void)
   {
     this->_deallocate_buffer ();
   }
-  
+
   void
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
   {
-    CORBA_Policy **tmp = ACE_reinterpret_cast (CORBA_Policy**, this->buffer_);
-    
+    CORBA::Policy **tmp = ACE_reinterpret_cast (CORBA::Policy**, this->buffer_);
+
     for (CORBA::ULong i = nl; i < ol; ++i)
       {
         CORBA::release (tmp[i]);
-        tmp[i] = CORBA_Policy::_nil ();
+        tmp[i] = CORBA::Policy::_nil ();
       }
   }
 
-  void 
+  void
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_downcast (
       void* target,
       CORBA_Object *src,
       CORBA_Environment &ACE_TRY_ENV
     )
   {
-    CORBA_Policy **tmp = ACE_static_cast (CORBA_Policy**, target);
-    *tmp = CORBA_Policy::_narrow (src, ACE_TRY_ENV);
+    CORBA::Policy **tmp = ACE_static_cast (CORBA::Policy**, target);
+    *tmp = CORBA::Policy::_narrow (src, ACE_TRY_ENV);
     ACE_CHECK;
   }
 
   CORBA_Object*
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_upcast (void *src) const
   {
-    CORBA_Policy **tmp = ACE_static_cast (CORBA_Policy**, src);
+    CORBA::Policy **tmp = ACE_static_cast (CORBA::Policy**, src);
     return *tmp;
   }
-  
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_POLICYLIST_CS_)
 #define _CORBA_POLICYLIST_CS_
 
 // *************************************************************
-// CORBA_PolicyList
+// CORBA::PolicyList
 // *************************************************************
 
 CORBA_PolicyList::CORBA_PolicyList (void)
 {}
 CORBA_PolicyList::CORBA_PolicyList (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA_Policy,CORBA_Policy_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  TAO_Unbounded_Object_Sequence<CORBA::Policy,CORBA::Policy_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
-CORBA_PolicyList::CORBA_PolicyList (CORBA::ULong max, CORBA::ULong length, CORBA_Policy_ptr *buffer, CORBA::Boolean release)
-  : 
+CORBA_PolicyList::CORBA_PolicyList (CORBA::ULong max, CORBA::ULong length, CORBA::Policy_ptr *buffer, CORBA::Boolean release)
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA_Policy,CORBA_Policy_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  TAO_Unbounded_Object_Sequence<CORBA::Policy,CORBA::Policy_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 CORBA_PolicyList::CORBA_PolicyList (const CORBA_PolicyList &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA_Policy,CORBA_Policy_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  TAO_Unbounded_Object_Sequence<CORBA::Policy,CORBA::Policy_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 CORBA_PolicyList::~CORBA_PolicyList (void) // dtor
@@ -1805,64 +1744,8 @@ void CORBA_PolicyList::_tao_any_destructor (void *x)
 
 #endif /* end #if !defined */
 
-static const CORBA::Long _oc_CORBA_PolicyList[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x415f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x4c697374), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA_PolicyList:1.0
-  17,
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x415f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x4c697374), 
-  ACE_NTOHL (0x0),  // name = CORBA_PolicyList
-  CORBA::tk_sequence, // typecode kind
-  76, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    60, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      29,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x415f506f), 
-      ACE_NTOHL (0x6c696379), 
-      ACE_NTOHL (0x3a312e30), 
-      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA_Policy:1.0
-      13,
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x415f506f), 
-      ACE_NTOHL (0x6c696379), 
-      ACE_NTOHL (0x0),  // name = CORBA_Policy
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyList (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_PolicyList),
-    (char *) &_oc_CORBA_PolicyList,
-    0,
-    sizeof (CORBA_PolicyList)
-  );
-
-CORBA::TypeCode_ptr _tc_CORBA_PolicyList =
-  &_tc_TAO_tc_CORBA_PolicyList;
-
-
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CS_
 
@@ -1871,78 +1754,78 @@ CORBA::TypeCode_ptr _tc_CORBA_PolicyList =
   {
     CORBA::ULong* tmp = 0;
     tmp = _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (length);
-    
+
     if (this->buffer_ != 0)
     {
       CORBA::ULong *old = ACE_reinterpret_cast (CORBA::ULong *,this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp[i] = old[i];
-      
+
       if (this->release_)
         _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::freebuf (old);
-      
+
     }
     this->buffer_ = tmp;
   }
-  
+
   void
   _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
-    
+
     CORBA::ULong *tmp = ACE_reinterpret_cast (CORBA::ULong *,this->buffer_);
-    
+
     _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::freebuf (tmp);
     this->buffer_ = 0;
-  } 
-  
+  }
+
   _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::~_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (void) // Dtor.
   {
     this->_deallocate_buffer ();
   }
-  
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_POLICYTYPESEQ_CS_)
 #define _CORBA_POLICYTYPESEQ_CS_
 
 // *************************************************************
-// CORBA_PolicyTypeSeq
+// CORBA::PolicyTypeSeq
 // *************************************************************
 
 CORBA_PolicyTypeSeq::CORBA_PolicyTypeSeq (void)
 {}
 CORBA_PolicyTypeSeq::CORBA_PolicyTypeSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::ULong>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 CORBA_PolicyTypeSeq::CORBA_PolicyTypeSeq (CORBA::ULong max, CORBA::ULong length, CORBA::ULong *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::ULong>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 CORBA_PolicyTypeSeq::CORBA_PolicyTypeSeq (const CORBA_PolicyTypeSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::ULong>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 CORBA_PolicyTypeSeq::~CORBA_PolicyTypeSeq (void) // dtor
@@ -1956,62 +1839,48 @@ void CORBA_PolicyTypeSeq::_tao_any_destructor (void *x)
 
 #endif /* end #if !defined */
 
-static const CORBA::Long _oc_CORBA_PolicyTypeSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  36,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x415f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x54797065), 
-  ACE_NTOHL (0x5365713a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_PolicyTypeSeq:1.0
-  20,
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x415f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x54797065), 
-  ACE_NTOHL (0x53657100),  // name = CORBA_PolicyTypeSeq
-  CORBA::tk_sequence, // typecode kind
-  80, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_alias, // typecode kind for typedefs
-    64, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      33,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f506f), 
-      ACE_NTOHL (0x6c696379), 
-      ACE_NTOHL (0x54797065), 
-      ACE_NTOHL (0x3a312e30), 
-      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
-      11,
-      ACE_NTOHL (0x506f6c69), 
-      ACE_NTOHL (0x63795479), 
-      ACE_NTOHL (0x70650000),  // name = PolicyType
-      CORBA::tk_ulong,
-
-
-    0U,
+CORBA_PolicyManager_ptr
+tao_CORBA_PolicyManager_duplicate (
+    CORBA_PolicyManager_ptr p
+  )
+{
+  return CORBA_PolicyManager::_duplicate (p);
+}
+
+void
+tao_CORBA_PolicyManager_release (
+    CORBA_PolicyManager_ptr p
+  )
+{
+  CORBA::release (p);
+}
 
-};
+CORBA_PolicyManager_ptr
+tao_CORBA_PolicyManager_nil (
+    void
+  )
+{
+  return CORBA_PolicyManager::_nil ();
+}
 
-static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyTypeSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_PolicyTypeSeq),
-    (char *) &_oc_CORBA_PolicyTypeSeq,
-    0,
-    sizeof (CORBA_PolicyTypeSeq)
-  );
+CORBA_PolicyManager_ptr
+tao_CORBA_PolicyManager_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA_PolicyManager::_narrow (p, ACE_TRY_ENV);
+}
 
-CORBA::TypeCode_ptr _tc_CORBA_PolicyTypeSeq =
-  &_tc_TAO_tc_CORBA_PolicyTypeSeq;
+CORBA::Object *
+tao_CORBA_PolicyManager_upcast (
+    void *src
+  )
+{
+  CORBA_PolicyManager **tmp =
+    ACE_static_cast (CORBA_PolicyManager **, src);
+  return *tmp;
+}
 
 // *************************************************************
 // Operations for class CORBA_PolicyManager_var
@@ -2061,7 +1930,7 @@ CORBA_PolicyManager_var::operator const ::CORBA_PolicyManager_ptr &() const // c
   return this->ptr_;
 }
 
-CORBA_PolicyManager_var::operator ::CORBA_PolicyManager_ptr &() // cast 
+CORBA_PolicyManager_var::operator ::CORBA_PolicyManager_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -2135,6 +2004,7 @@ CORBA_PolicyManager_var::upcast (void *src)
     ACE_static_cast (CORBA_PolicyManager **, src);
   return *tmp;
 }
+
 // *************************************************************
 // Operations for class CORBA_PolicyManager_out
 // *************************************************************
@@ -2209,7 +2079,7 @@ CORBA_PolicyManager_ptr CORBA_PolicyManager::_narrow (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  return CORBA_PolicyManager::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA::PolicyManager::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
 CORBA_PolicyManager_ptr CORBA_PolicyManager::_unchecked_narrow (
@@ -2219,6 +2089,7 @@ CORBA_PolicyManager_ptr CORBA_PolicyManager::_unchecked_narrow (
 {
   if (CORBA::is_nil (obj))
     return CORBA_PolicyManager::_nil ();
+
   return
       ACE_reinterpret_cast
         (
@@ -2252,7 +2123,7 @@ void *CORBA_PolicyManager::_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;
@@ -2263,6 +2134,48 @@ const char* CORBA_PolicyManager::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/PolicyManager:1.0";
 }
 
+CORBA::PolicyCurrent_ptr
+tao_CORBA_PolicyCurrent_duplicate (
+    CORBA::PolicyCurrent_ptr p
+  )
+{
+  return CORBA::PolicyCurrent::_duplicate (p);
+}
+
+void
+tao_CORBA_PolicyCurrent_release (
+    CORBA::PolicyCurrent_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA::PolicyCurrent_ptr
+tao_CORBA_PolicyCurrent_nil (
+    void
+  )
+{
+  return CORBA_PolicyCurrent::_nil ();
+}
+
+CORBA_PolicyCurrent_ptr
+tao_CORBA_PolicyCurrent_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA_PolicyCurrent::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_CORBA_PolicyCurrent_upcast (
+    void *src
+  )
+{
+  CORBA_PolicyCurrent **tmp =
+    ACE_static_cast (CORBA_PolicyCurrent **, src);
+  return *tmp;
+}
 
 // *************************************************************
 // Operations for class CORBA_PolicyCurrent_var
@@ -2312,7 +2225,7 @@ CORBA_PolicyCurrent_var::operator const ::CORBA_PolicyCurrent_ptr &() const // c
   return this->ptr_;
 }
 
-CORBA_PolicyCurrent_var::operator ::CORBA_PolicyCurrent_ptr &() // cast 
+CORBA_PolicyCurrent_var::operator ::CORBA_PolicyCurrent_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -2386,6 +2299,7 @@ CORBA_PolicyCurrent_var::upcast (void *src)
     ACE_static_cast (CORBA_PolicyCurrent **, src);
   return *tmp;
 }
+
 // *************************************************************
 // Operations for class CORBA_PolicyCurrent_out
 // *************************************************************
@@ -2470,6 +2384,7 @@ CORBA_PolicyCurrent_ptr CORBA_PolicyCurrent::_unchecked_narrow (
 {
   if (CORBA::is_nil (obj))
     return CORBA_PolicyCurrent::_nil ();
+
   return
       ACE_reinterpret_cast
         (
@@ -2520,14 +2435,14 @@ void *CORBA_PolicyCurrent::_tao_QueryInterface (ptr_arith_t type)
         void *,
         ACE_static_cast
           (
-            CORBA_Current_ptr,
+            CORBA::Current_ptr,
             this
           )
       );
   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;
@@ -2538,101 +2453,61 @@ const char* CORBA_PolicyCurrent::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/PolicyCurrent:1.0";
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::SetOverrideType _tao_elem)
-{
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
-      CORBA::_tc_SetOverrideType,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::SetOverrideType &_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_SetOverrideType, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      return 0; // not equivalent
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
-      );
-    if (stream >> _tao_elem)
-    {
-      return 1;
-    }
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const CORBA_PolicyError &_tao_elem) // copying
+void operator<<= (CORBA::Any &_tao_any, const CORBA::PolicyError &_tao_elem) // copying
 {
   TAO_OutputCDR stream;
   stream << _tao_elem;
   _tao_any._tao_replace (
-      _tc_CORBA_PolicyError,
+      CORBA::_tc_PolicyError,
       TAO_ENCAP_BYTE_ORDER,
       stream.begin ()
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA_PolicyError *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA::PolicyError *_tao_elem) // non copying
 {
   TAO_OutputCDR stream;
   stream << *_tao_elem;
   _tao_any._tao_replace (
-      _tc_CORBA_PolicyError,
+      CORBA::_tc_PolicyError,
       TAO_ENCAP_BYTE_ORDER,
       stream.begin (),
       1,
       _tao_elem,
-      CORBA_PolicyError::_tao_any_destructor
+      CORBA::PolicyError::_tao_any_destructor
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_PolicyError *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PolicyError *&_tao_elem)
 {
   return _tao_any >>= ACE_const_cast(
-      const CORBA_PolicyError*&,
+      const CORBA::PolicyError*&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_PolicyError *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::PolicyError *&_tao_elem)
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (_tc_CORBA_PolicyError, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_PolicyError, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
-      _tao_elem = (CORBA_PolicyError *)_tao_any.value ();
+      _tao_elem = (CORBA::PolicyError *)_tao_any.value ();
       return 1;
     }
     else
     {
-      CORBA_PolicyError *tmp;
-      ACE_NEW_RETURN (tmp, CORBA_PolicyError, 0);
+      CORBA::PolicyError *tmp;
+      ACE_NEW_RETURN (tmp, CORBA::PolicyError, 0);
       TAO_InputCDR stream (
           _tao_any._tao_get_cdr (),
           _tao_any._tao_byte_order ()
@@ -2647,10 +2522,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_PolicyError
       if (stream >> *tmp)
       {
         ((CORBA::Any *)&_tao_any)->_tao_replace (
-            _tc_CORBA_PolicyError,
+            CORBA::_tc_PolicyError,
             1,
             tmp,
-            CORBA_PolicyError::_tao_any_destructor
+            CORBA::PolicyError::_tao_any_destructor
           );
         _tao_elem = tmp;
         return 1;
@@ -2673,7 +2548,7 @@ void operator<<= (CORBA::Any &_tao_any, const CORBA_InvalidPolicies &_tao_elem)
   TAO_OutputCDR stream;
   stream << _tao_elem;
   _tao_any._tao_replace (
-      _tc_CORBA_InvalidPolicies,
+      CORBA::_tc_InvalidPolicies,
       TAO_ENCAP_BYTE_ORDER,
       stream.begin ()
     );
@@ -2684,7 +2559,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_InvalidPolicies *_tao_elem) // non
   TAO_OutputCDR stream;
   stream << *_tao_elem;
   _tao_any._tao_replace (
-      _tc_CORBA_InvalidPolicies,
+      CORBA::_tc_InvalidPolicies,
       TAO_ENCAP_BYTE_ORDER,
       stream.begin (),
       1,
@@ -2707,13 +2582,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_InvalidPolic
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (_tc_CORBA_InvalidPolicies, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_InvalidPolicies, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = (CORBA_InvalidPolicies *)_tao_any.value ();
@@ -2737,7 +2612,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_InvalidPolic
       if (stream >> *tmp)
       {
         ((CORBA::Any *)&_tao_any)->_tao_replace (
-            _tc_CORBA_InvalidPolicies,
+            CORBA::_tc_InvalidPolicies,
             1,
             tmp,
             CORBA_InvalidPolicies::_tao_any_destructor
@@ -2758,35 +2633,35 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_InvalidPolic
   return 0;
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA_Policy_ptr _tao_elem)
+void operator<<= (CORBA::Any &_tao_any, CORBA::Policy_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        _tc_CORBA_Policy, 
+        CORBA::_tc_Policy,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
-        CORBA_Policy::_duplicate (_tao_elem),
-        CORBA_Policy::_tao_any_destructor
+        CORBA::Policy::_duplicate (_tao_elem),
+        CORBA::Policy::_tao_any_destructor
       );
   }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_Policy_ptr &_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Policy_ptr &_tao_elem)
 {
   ACE_TRY_NEW_ENV
   {
-    _tao_elem = CORBA_Policy::_nil ();
+    _tao_elem = CORBA::Policy::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (_tc_CORBA_Policy, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_Policy, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -2794,94 +2669,94 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_Policy_ptr &_tao_e
     if (stream >> _tao_elem)
     {
       ((CORBA::Any *)&_tao_any)->_tao_replace (
-          _tc_CORBA_Policy,
+          CORBA::_tc_Policy,
           1,
           _tao_elem,
-          CORBA_Policy::_tao_any_destructor
+          CORBA::Policy::_tao_any_destructor
         );
       return 1;
     }
   }
   ACE_CATCHANY
   {
-    _tao_elem = CORBA_Policy::_nil ();
+    _tao_elem = CORBA::Policy::_nil ();
     return 0;
   }
   ACE_ENDTRY;
-  _tao_elem = CORBA_Policy::_nil ();
+  _tao_elem = CORBA::Policy::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA_Policy,CORBA_Policy_var>;
+    template class TAO_Object_Manager<CORBA::Policy,CORBA::Policy_var>;
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA_Policy,CORBA_Policy_var>
+  #  pragma instantiate TAO_Object_Manager<CORBA::Policy,CORBA::Policy_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 void operator<<= (
     CORBA::Any &_tao_any,
-    const CORBA_PolicyList &_tao_elem
+    const CORBA::PolicyList &_tao_elem
   ) // copying
 {
   TAO_OutputCDR stream;
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        _tc_CORBA_PolicyList,
+        CORBA::_tc_PolicyList,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin ()
       );
   }
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA_PolicyList *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA::PolicyList *_tao_elem) // non copying
 {
   TAO_OutputCDR stream;
   stream << *_tao_elem;
   _tao_any._tao_replace (
-      _tc_CORBA_PolicyList,
+      CORBA::_tc_PolicyList,
       TAO_ENCAP_BYTE_ORDER,
       stream.begin (),
       1,
       _tao_elem,
-      CORBA_PolicyList::_tao_any_destructor
+      CORBA::PolicyList::_tao_any_destructor
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_PolicyList *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PolicyList *&_tao_elem)
 {
   return _tao_any >>= ACE_const_cast(
-      const CORBA_PolicyList*&,
+      const CORBA::PolicyList*&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_PolicyList *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::PolicyList *&_tao_elem)
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (_tc_CORBA_PolicyList, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_PolicyList, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
-          const CORBA_PolicyList*,
+          const CORBA::PolicyList*,
           _tao_any.value ()
         );
       return 1;
     }
     else
     {
-      CORBA_PolicyList *tmp;
-      ACE_NEW_RETURN (tmp, CORBA_PolicyList, 0);
+      CORBA::PolicyList *tmp;
+      ACE_NEW_RETURN (tmp, CORBA::PolicyList, 0);
       TAO_InputCDR stream (
           _tao_any._tao_get_cdr (),
           _tao_any._tao_byte_order ()
@@ -2889,10 +2764,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_PolicyList *
       if (stream >> *tmp)
       {
         ((CORBA::Any *)&_tao_any)->_tao_replace (
-            _tc_CORBA_PolicyList,
+            CORBA::_tc_PolicyList,
             1,
             ACE_static_cast (void *, tmp),
-            CORBA_PolicyList::_tao_any_destructor
+            CORBA::PolicyList::_tao_any_destructor
           );
         _tao_elem = tmp;
         return 1;
@@ -2912,67 +2787,67 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_PolicyList *
 
 void operator<<= (
     CORBA::Any &_tao_any,
-    const CORBA_PolicyTypeSeq &_tao_elem
+    const CORBA::PolicyTypeSeq &_tao_elem
   ) // copying
 {
   TAO_OutputCDR stream;
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        _tc_CORBA_PolicyTypeSeq,
+        CORBA::_tc_PolicyTypeSeq,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin ()
       );
   }
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA_PolicyTypeSeq *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA::PolicyTypeSeq *_tao_elem) // non copying
 {
   TAO_OutputCDR stream;
   stream << *_tao_elem;
   _tao_any._tao_replace (
-      _tc_CORBA_PolicyTypeSeq,
+      CORBA::_tc_PolicyTypeSeq,
       TAO_ENCAP_BYTE_ORDER,
       stream.begin (),
       1,
       _tao_elem,
-      CORBA_PolicyTypeSeq::_tao_any_destructor
+      CORBA::PolicyTypeSeq::_tao_any_destructor
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_PolicyTypeSeq *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PolicyTypeSeq *&_tao_elem)
 {
   return _tao_any >>= ACE_const_cast(
-      const CORBA_PolicyTypeSeq*&,
+      const CORBA::PolicyTypeSeq*&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_PolicyTypeSeq *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::PolicyTypeSeq *&_tao_elem)
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (_tc_CORBA_PolicyTypeSeq, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_PolicyTypeSeq, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
-          const CORBA_PolicyTypeSeq*,
+          const CORBA::PolicyTypeSeq*,
           _tao_any.value ()
         );
       return 1;
     }
     else
     {
-      CORBA_PolicyTypeSeq *tmp;
-      ACE_NEW_RETURN (tmp, CORBA_PolicyTypeSeq, 0);
+      CORBA::PolicyTypeSeq *tmp;
+      ACE_NEW_RETURN (tmp, CORBA::PolicyTypeSeq, 0);
       TAO_InputCDR stream (
           _tao_any._tao_get_cdr (),
           _tao_any._tao_byte_order ()
@@ -2980,10 +2855,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_PolicyTypeSe
       if (stream >> *tmp)
       {
         ((CORBA::Any *)&_tao_any)->_tao_replace (
-            _tc_CORBA_PolicyTypeSeq,
+            CORBA::_tc_PolicyTypeSeq,
             1,
             ACE_static_cast (void *, tmp),
-            CORBA_PolicyTypeSeq::_tao_any_destructor
+            CORBA::PolicyTypeSeq::_tao_any_destructor
           );
         _tao_elem = tmp;
         return 1;
@@ -3001,6 +2876,46 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_PolicyTypeSe
   return 0;
 }
 
+void operator<<= (CORBA::Any &_tao_any, CORBA::SetOverrideType _tao_elem)
+{
+  TAO_OutputCDR stream;
+  stream << _tao_elem;
+  _tao_any._tao_replace (
+      CORBA::_tc_SetOverrideType,
+      TAO_ENCAP_BYTE_ORDER,
+      stream.begin ()
+    );
+}
+
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::SetOverrideType &_tao_elem)
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::TypeCode_var type = _tao_any.type ();
+
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_SetOverrideType, ACE_TRY_ENV);
+    ACE_TRY_CHECK;
+
+    if (!result)
+      return 0; // not equivalent
+
+    TAO_InputCDR stream (
+        _tao_any._tao_get_cdr (),
+        _tao_any._tao_byte_order ()
+      );
+    if (stream >> _tao_elem)
+    {
+      return 1;
+    }
+  }
+  ACE_CATCHANY
+  {
+    return 0;
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
     template class TAO_Object_Manager<CORBA_PolicyManager,CORBA_PolicyManager_var>;
@@ -3043,8 +2958,13 @@ 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;
+    // Add a check to the length of the sequence
+    // to make sure it does not exceed the length
+    // of the stream. (See bug 58.)
+    if (_tao_seq_len > strm.length())
+      return 0;
     // retrieve all the elements
     return strm.read_ushort_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
   }
@@ -3055,7 +2975,7 @@ CORBA::Boolean operator>> (
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA_Policy_ptr _tao_objref
+    const CORBA::Policy_ptr _tao_objref
   )
 {
   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
@@ -3064,7 +2984,7 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CORBA_Policy_ptr &_tao_objref
+    CORBA::Policy_ptr &_tao_objref
   )
 {
   ACE_TRY_NEW_ENV
@@ -3074,7 +2994,7 @@ CORBA::Boolean operator>> (
       return 0;
     // narrow to the right type
     _tao_objref =
-      CORBA_Policy::_unchecked_narrow (
+      CORBA::Policy::_unchecked_narrow (
           obj.in (),
           ACE_TRY_ENV
         );
@@ -3091,7 +3011,7 @@ CORBA::Boolean operator>> (
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA_PolicyList &_tao_sequence
+    const CORBA::PolicyList &_tao_sequence
   )
 {
   if (strm << _tao_sequence.length ())
@@ -3109,7 +3029,7 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CORBA_PolicyList &_tao_sequence
+    CORBA::PolicyList &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len;
@@ -3118,8 +3038,13 @@ 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;
+    // Add a check to the length of the sequence
+    // to make sure it does not exceed the length
+    // of the stream. (See bug 58.)
+    if (_tao_seq_len > strm.length())
+      return 0;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
@@ -3133,7 +3058,7 @@ CORBA::Boolean operator>> (
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA_PolicyTypeSeq &_tao_sequence
+    const CORBA::PolicyTypeSeq &_tao_sequence
   )
 {
   if (strm << _tao_sequence.length ())
@@ -3146,7 +3071,7 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CORBA_PolicyTypeSeq &_tao_sequence
+    CORBA::PolicyTypeSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len;
@@ -3155,8 +3080,13 @@ 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;
+    // Add a check to the length of the sequence
+    // to make sure it does not exceed the length
+    // of the stream. (See bug 58.)
+    if (_tao_seq_len > strm.length())
+      return 0;
     // retrieve all the elements
     return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
   }
diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h
index f3e07b3349b..4856f040a24 100644
--- a/TAO/tao/PolicyC.h
+++ b/TAO/tao/PolicyC.h
@@ -23,19 +23,20 @@
 #define _TAO_IDL_ORIG_POLICYC_H_
 
 #include "ace/pre.h"
-#include "tao/CurrentC.h"
+
+#include "TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "TAO_Export.h"
 #include "Encodable.h"
 #include "Exception.h"
 #include "Environment.h"
 #include "Sequence.h"
 #include "CDR.h"
 #include "Remote_Object_Proxy_Impl.h"
+#include "CurrentC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -66,45 +67,43 @@
 class TAO_Export CORBA_PolicyError : public CORBA::UserException
 {
 public:
-  CORBA::PolicyErrorCode reason;
-
-  CORBA_PolicyError (void);
-  // Default constructor.
-  
-  CORBA_PolicyError (const CORBA_PolicyError &);
-  // Copy constructor.
-  
-  ~CORBA_PolicyError (void);
-  // Destructor.
-  
-  static void _tao_any_destructor (void*);
-  
-  CORBA_PolicyError &operator= (const CORBA_PolicyError &);
-  
-  virtual void _raise (void);
-
-  virtual void _tao_encode (
-      TAO_OutputCDR &,
-      CORBA::Environment &
-    ) const;
-  
-  virtual void _tao_decode (
-      TAO_InputCDR &,
-      CORBA::Environment &
-    );
-  
-  static CORBA_PolicyError *_downcast (CORBA::Exception *);
+    CORBA::PolicyErrorCode reason;
 
-  CORBA_PolicyError (
-      CORBA::PolicyErrorCode _tao_reason
-    );
-  
-  // = TAO extension.
-  static CORBA::Exception *_alloc (void);
-  virtual CORBA::TypeCode_ptr _type (void) const;
-}; // Exception CORBA_PolicyError.
+    CORBA_PolicyError (void);
+    // Default constructor.
+
+    CORBA_PolicyError (const CORBA_PolicyError &);
+    // Copy constructor.
 
-extern TAO_Export CORBA::TypeCode_ptr  _tc_CORBA_PolicyError;
+    ~CORBA_PolicyError (void);
+    // Destructor.
+
+    static void _tao_any_destructor (void*);
+
+    CORBA_PolicyError &operator= (const CORBA_PolicyError &);
+
+    virtual void _raise (void);
+
+    virtual void _tao_encode (
+        TAO_OutputCDR &,
+        CORBA::Environment &
+      ) const;
+
+    virtual void _tao_decode (
+        TAO_InputCDR &,
+        CORBA::Environment &
+      );
+
+    static CORBA_PolicyError *_downcast (CORBA::Exception *);
+
+    CORBA_PolicyError (
+        CORBA::PolicyErrorCode _tao_reason
+      );
+
+    // = TAO extension.
+    static CORBA::Exception *_alloc (void);
+    virtual CORBA::TypeCode_ptr _type (void) const;
+  }; // Exception CORBA::PolicyError.
 
 
 #endif /* end #if !defined */
@@ -113,185 +112,173 @@ extern TAO_Export CORBA::TypeCode_ptr  _tc_CORBA_PolicyError;
 #if !defined (_CORBA_INVALIDPOLICIES_CH_)
 #define _CORBA_INVALIDPOLICIES_CH_
 
-class TAO_Export CORBA_InvalidPolicies : public CORBA::UserException
-{
-public:
+  class TAO_Export CORBA_InvalidPolicies : public CORBA::UserException
+  {
+  public:
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CH_
 
-    class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-      
-      _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (void); // Default constructor.
-      _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (CORBA::ULong maximum); 
-      _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (CORBA::ULong maximum,
-        CORBA::ULong length,
-        CORBA::UShort *data,
-        CORBA::Boolean release = 0);
-      _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (const _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &rhs);
-      _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &operator= (const _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &rhs);
-      virtual ~_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (void); // Dtor.
-      // = Accessors.
-      CORBA::UShort &operator[] (CORBA::ULong i);
-      const CORBA::UShort &operator[] (CORBA::ULong i) const;
-      // = Static operations.
-      static CORBA::UShort *allocbuf (CORBA::ULong size);
-      static void freebuf (CORBA::UShort *buffer);
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      // Implement the TAO_Base_Sequence methods (see Sequence.h)
-      
-      CORBA::UShort *get_buffer (CORBA::Boolean orphan = 0);
-      const CORBA::UShort *get_buffer (void) const;
-      void replace (CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::UShort *data,
-        CORBA::Boolean release);
-    };
+      class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort : public TAO_Unbounded_Base_Sequence
+      {
+      public:
+        // = Initialization and termination methods.
+
+        _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (void); // Default constructor.
+        _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (CORBA::ULong maximum);
+        _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (CORBA::ULong maximum,
+          CORBA::ULong length,
+          CORBA::UShort *data,
+          CORBA::Boolean release = 0);
+        _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (const _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &rhs);
+        _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &operator= (const _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &rhs);
+        virtual ~_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (void); // Dtor.
+        // = Accessors.
+        CORBA::UShort &operator[] (CORBA::ULong i);
+        const CORBA::UShort &operator[] (CORBA::ULong i) const;
+        // = Static operations.
+        static CORBA::UShort *allocbuf (CORBA::ULong size);
+        static void freebuf (CORBA::UShort *buffer);
+        virtual void _allocate_buffer (CORBA::ULong length);
+        virtual void _deallocate_buffer (void);
+        // Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+        CORBA::UShort *get_buffer (CORBA::Boolean orphan = 0);
+        const CORBA::UShort *get_buffer (void) const;
+        void replace (CORBA::ULong max,
+          CORBA::ULong length,
+          CORBA::UShort *data,
+          CORBA::Boolean release);
+      };
 
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
 #if !defined (_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CH_)
 #define _CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CH_
 
-  class _tao_seq_UShort;
-  class _tao_seq_UShort_var;
-  
-  // *************************************************************
-  // _tao_seq_UShort
-  // *************************************************************
-  
-  class TAO_Export _tao_seq_UShort : public 
+    class _tao_seq_UShort;
+    class _tao_seq_UShort_var;
+
+    // *************************************************************
+    // _tao_seq_UShort
+    // *************************************************************
+
+    class TAO_Export _tao_seq_UShort : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort
+      _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Sequence<CORBA::UShort>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  {
-  public:
-    _tao_seq_UShort (void); // default ctor
-    _tao_seq_UShort (CORBA::ULong max); // uses max size
-    _tao_seq_UShort (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      CORBA::UShort *buffer, 
-      CORBA::Boolean release = 0
-    );
-    _tao_seq_UShort (const _tao_seq_UShort &); // copy ctor
-    ~_tao_seq_UShort (void);
-    static void _tao_any_destructor (void*);
+      TAO_Unbounded_Sequence<CORBA::UShort>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+    {
+    public:
+      _tao_seq_UShort (void); // default ctor
+      _tao_seq_UShort (CORBA::ULong max); // uses max size
+      _tao_seq_UShort (
+        CORBA::ULong max,
+        CORBA::ULong length,
+        CORBA::UShort *buffer,
+        CORBA::Boolean release = 0
+      );
+      _tao_seq_UShort (const _tao_seq_UShort &); // copy ctor
+      ~_tao_seq_UShort (void);
+      static void _tao_any_destructor (void*);
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef _tao_seq_UShort_var _var_type;
+      typedef _tao_seq_UShort_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-  };
-  
+    };
+
 #endif /* end #if !defined */
 
 #if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef _tao_seq_UShort _indices_seq;
-#endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */
-
-    _tao_seq_UShort indices;
-
-  CORBA_InvalidPolicies (void);
-  // Default constructor.
-  
-  CORBA_InvalidPolicies (const CORBA_InvalidPolicies &);
-  // Copy constructor.
-  
-  ~CORBA_InvalidPolicies (void);
-  // Destructor.
-  
-  static void _tao_any_destructor (void*);
-  
-  CORBA_InvalidPolicies &operator= (const CORBA_InvalidPolicies &);
-  
-  virtual void _raise (void);
-
-  virtual void _tao_encode (
-      TAO_OutputCDR &,
-      CORBA::Environment &
-    ) const;
-  
-  virtual void _tao_decode (
-      TAO_InputCDR &,
-      CORBA::Environment &
-    );
-  
-  static CORBA_InvalidPolicies *_downcast (CORBA::Exception *);
+    typedef _tao_seq_UShort _indices_seq;
+  #endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */
 
-  CORBA_InvalidPolicies (
-      const _tao_seq_UShort & _tao_indices
-    );
-  
-  // = TAO extension.
-  static CORBA::Exception *_alloc (void);
-  virtual CORBA::TypeCode_ptr _type (void) const;
-}; // Exception CORBA_InvalidPolicies.
+          _tao_seq_UShort indices;
 
-extern TAO_Export CORBA::TypeCode_ptr  _tc_CORBA_InvalidPolicies;
+    CORBA_InvalidPolicies (void);
+    // Default constructor.
 
+    CORBA_InvalidPolicies (const CORBA_InvalidPolicies &);
+    // Copy constructor.
 
-#endif /* end #if !defined */
+    ~CORBA_InvalidPolicies (void);
+    // Destructor.
 
+    static void _tao_any_destructor (void*);
 
-#if !defined (_CORBA_POLICY___PTR_CH_)
-#define _CORBA_POLICY___PTR_CH_
+    CORBA_InvalidPolicies &operator= (const CORBA_InvalidPolicies &);
 
-class CORBA_Policy;
-typedef CORBA_Policy *CORBA_Policy_ptr;
+    virtual void _raise (void);
 
-#endif /* end #if !defined */
+    virtual void _tao_encode (
+        TAO_OutputCDR &,
+        CORBA::Environment &
+      ) const;
 
+    virtual void _tao_decode (
+        TAO_InputCDR &,
+        CORBA::Environment &
+      );
 
-#if !defined (_CORBA_POLICY___VAR_CH_)
-#define _CORBA_POLICY___VAR_CH_
+    static CORBA_InvalidPolicies *_downcast (CORBA::Exception *);
 
-class TAO_Export CORBA_Policy_var : public TAO_Base_var
-{
-public:
-  CORBA_Policy_var (void); // default constructor
-  CORBA_Policy_var (CORBA_Policy_ptr p) : ptr_ (p) {} 
-  CORBA_Policy_var (const CORBA_Policy_var &); // copy constructor
-  ~CORBA_Policy_var (void); // destructor
-  
-  CORBA_Policy_var &operator= (CORBA_Policy_ptr);
-  CORBA_Policy_var &operator= (const CORBA_Policy_var &);
-  CORBA_Policy_ptr operator-> (void) const;
-  
-  operator const CORBA_Policy_ptr &() const;
-  operator CORBA_Policy_ptr &();
-  // in, inout, out, _retn 
-  CORBA_Policy_ptr in (void) const;
-  CORBA_Policy_ptr &inout (void);
-  CORBA_Policy_ptr &out (void);
-  CORBA_Policy_ptr _retn (void);
-  CORBA_Policy_ptr ptr (void) const;
+    CORBA_InvalidPolicies (
+        const _tao_seq_UShort & _tao_indices
+      );
 
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static CORBA_Policy_ptr duplicate (CORBA_Policy_ptr);
-  static void release (CORBA_Policy_ptr);
-  static CORBA_Policy_ptr nil (void);
-  static CORBA_Policy_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
+    // = TAO extension.
+    static CORBA::Exception *_alloc (void);
+    virtual CORBA::TypeCode_ptr _type (void) const;
+  }; // Exception CORBA::InvalidPolicies.
 
-private:
-  CORBA_Policy_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_Policy_var (const TAO_Base_var &rhs);
-  CORBA_Policy_var &operator= (const TAO_Base_var &rhs);
-};
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_POLICY___VAR_CH_)
+#define _CORBA_POLICY___VAR_CH_
+
+  class TAO_Export CORBA_Policy_var : public TAO_Base_var
+  {
+  public:
+    CORBA_Policy_var (void); // default constructor
+    CORBA_Policy_var (CORBA_Policy_ptr p) : ptr_ (p) {}
+    CORBA_Policy_var (const CORBA_Policy_var &); // copy constructor
+    ~CORBA_Policy_var (void); // destructor
+
+    CORBA_Policy_var &operator= (CORBA_Policy_ptr);
+    CORBA_Policy_var &operator= (const CORBA_Policy_var &);
+    CORBA_Policy_ptr operator-> (void) const;
+
+    operator const CORBA_Policy_ptr &() const;
+    operator CORBA_Policy_ptr &();
+    // in, inout, out, _retn
+    CORBA_Policy_ptr in (void) const;
+    CORBA_Policy_ptr &inout (void);
+    CORBA_Policy_ptr &out (void);
+    CORBA_Policy_ptr _retn (void);
+    CORBA_Policy_ptr ptr (void) const;
+
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static CORBA_Policy_ptr duplicate (CORBA_Policy_ptr);
+    static void release (CORBA_Policy_ptr);
+    static CORBA_Policy_ptr nil (void);
+    static CORBA_Policy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+
+  private:
+    CORBA_Policy_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    CORBA_Policy_var (const TAO_Base_var &rhs);
+    CORBA_Policy_var &operator= (const TAO_Base_var &rhs);
+  };
 
 
 #endif /* end #if !defined */
@@ -300,22 +287,22 @@ private:
 #if !defined (_CORBA_POLICY___OUT_CH_)
 #define _CORBA_POLICY___OUT_CH_
 
-class TAO_Export CORBA_Policy_out
-{
-public:
-  CORBA_Policy_out (CORBA_Policy_ptr &);
-  CORBA_Policy_out (CORBA_Policy_var &);
-  CORBA_Policy_out (const CORBA_Policy_out &);
-  CORBA_Policy_out &operator= (const CORBA_Policy_out &);
-  CORBA_Policy_out &operator= (const CORBA_Policy_var &);
-  CORBA_Policy_out &operator= (CORBA_Policy_ptr);
-  operator CORBA_Policy_ptr &();
-  CORBA_Policy_ptr &ptr (void);
-  CORBA_Policy_ptr operator-> (void);
-  
-private:
-  CORBA_Policy_ptr &ptr_;
-};
+  class TAO_Export CORBA_Policy_out
+  {
+  public:
+    CORBA_Policy_out (CORBA_Policy_ptr &);
+    CORBA_Policy_out (CORBA_Policy_var &);
+    CORBA_Policy_out (const CORBA_Policy_out &);
+    CORBA_Policy_out &operator= (const CORBA_Policy_out &);
+    CORBA_Policy_out &operator= (const CORBA_Policy_var &);
+    CORBA_Policy_out &operator= (CORBA_Policy_ptr);
+    operator CORBA_Policy_ptr &();
+    CORBA_Policy_ptr &ptr (void);
+    CORBA_Policy_ptr operator-> (void);
+
+  private:
+    CORBA_Policy_ptr &ptr_;
+  };
 
 
 #endif /* end #if !defined */
@@ -324,102 +311,103 @@ private:
 #if !defined (_CORBA_POLICY_CH_)
 #define _CORBA_POLICY_CH_
 
-// Forward Classes Declaration
-class _TAO_CORBA_Policy_Proxy_Impl;
-class _TAO_CORBA_Policy_Remote_Proxy_Impl;
-class _TAO_CORBA_Policy_Proxy_Broker;
-class _TAO_CORBA_Policy_Remote_Proxy_Broker;
+  // Forward Classes Declaration
+  class CORBA_TAO_Policy_Proxy_Impl;
+  class CORBA_TAO_Policy_Remote_Proxy_Impl;
+  class CORBA_TAO_Policy_Proxy_Broker;
+  class CORBA_TAO_Policy_Remote_Proxy_Broker;
 
-class TAO_Export CORBA_Policy : public virtual CORBA_Object
-                              , public virtual TAO_Encodable
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_Policy_ptr _ptr_type;
-  typedef CORBA_Policy_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
+class TAO_Export CORBA_Policy
+  : public virtual CORBA_Object,
+    public virtual TAO_Encodable
+  {
+  public:
+  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    typedef CORBA_Policy_ptr _ptr_type;
+    typedef CORBA_Policy_var _var_type;
+  #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+    // the static operations
+    static CORBA_Policy_ptr _duplicate (CORBA_Policy_ptr obj);
+    static CORBA_Policy_ptr _narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
+    static CORBA_Policy_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
+    static CORBA_Policy_ptr _nil (void)
+      {
+        return (CORBA_Policy_ptr)0;
+      }
 
-  // the static operations
-  static CORBA_Policy_ptr _duplicate (CORBA_Policy_ptr obj);
-  static CORBA_Policy_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_Policy_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static CORBA_Policy_ptr _nil (void)
-    {
-      return (CORBA_Policy_ptr)0;
-    }
+    static void _tao_any_destructor (void*);
 
-  static void _tao_any_destructor (void*);
+    virtual CORBA::PolicyType policy_type (
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
 
-  virtual CORBA::PolicyType policy_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    virtual CORBA::Policy_ptr copy (
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
 
-  virtual CORBA_Policy_ptr copy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    virtual void destroy (
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    virtual CORBA::Boolean _is_a (
+        const CORBA::Char *type_id,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
+    virtual void *_tao_QueryInterface (ptr_arith_t type);
 
-  virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    virtual const char* _interface_repository_id (void) const;
 
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &);
+    virtual CORBA::Boolean _tao_decode (TAO_InputCDR &);
 
-  virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &);
-  virtual CORBA::Boolean _tao_decode (TAO_InputCDR &);
+  private:
+    CORBA_TAO_Policy_Proxy_Broker *the_CORBA_TAO_Policy_Proxy_Broker_;
 
-private:
-  _TAO_CORBA_Policy_Proxy_Broker *the_TAO_CORBA_Policy_Proxy_Broker_;
-  
-protected:
-  CORBA_Policy (int collocated = 0);
-  
   protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void CORBA_Policy_setup_collocation (int collocated);
-    
-    CORBA_Policy (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_CORBA_Policy_Remote_Proxy_Impl;
-    friend class _TAO_CORBA_Policy_ThruPOA_Proxy_Impl;
-    friend class _TAO_CORBA_Policy_Direct_Proxy_Impl;
-  
-  virtual ~CORBA_Policy (void);
-private:
-  CORBA_Policy (const CORBA_Policy &);
-  void operator= (const CORBA_Policy &);
-};
+    CORBA_Policy (int collocated = 0);
+
+    protected:
+      // This methods travese the inheritance tree and set the
+      // parents piece of the given class in the right mode
+      virtual void CORBA_Policy_setup_collocation (int collocated);
+
+      CORBA_Policy (
+        TAO_Stub *objref,
+        CORBA::Boolean _tao_collocated = 0,
+        TAO_Abstract_ServantBase *servant = 0
+        );
+
+      friend class CORBA_TAO_Policy_Remote_Proxy_Impl;
+      friend class CORBA_TAO_Policy_ThruPOA_Proxy_Impl;
+      friend class CORBA_TAO_Policy_Direct_Proxy_Impl;
+
+    virtual ~CORBA_Policy (void);
+  private:
+    CORBA_Policy (const CORBA_Policy &);
+    void operator= (const CORBA_Policy &);
+  };
 
 
 // The Proxy Implementations are used by each interface to
@@ -427,79 +415,79 @@ private:
 // an invocation logics.
 
 
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
-
-class TAO_Export _TAO_CORBA_Policy_Proxy_Impl : public virtual TAO_Object_Proxy_Impl
-{
-public:
-  virtual ~_TAO_CORBA_Policy_Proxy_Impl (void) { }
-  
-    virtual CORBA::PolicyType policy_type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA_Policy_ptr copy (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
+  ///////////////////////////////////////////////////////////////////////
+  //                    Base  Impl. Declaration
+  //
 
-  virtual void destroy (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
+  class TAO_Export CORBA_TAO_Policy_Proxy_Impl : public virtual TAO_Object_Proxy_Impl
+  {
+  public:
+    virtual ~CORBA_TAO_Policy_Proxy_Impl (void) { }
+
+        virtual CORBA::PolicyType policy_type (
+        CORBA::Object_ptr _collocated_tao_target_,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual CORBA::Policy_ptr copy (
+        CORBA::Object_ptr _collocated_tao_target_,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual void destroy (
+        CORBA::Object_ptr _collocated_tao_target_,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
 
 protected:
-  _TAO_CORBA_Policy_Proxy_Impl (void);
+    CORBA_TAO_Policy_Proxy_Impl (void);
 
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
+  };
+  //
+  //                Base  Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
 
 
 ///////////////////////////////////////////////////////////////////////
 //                    Remote  Impl. Declaration
 //
 
-class TAO_Export _TAO_CORBA_Policy_Remote_Proxy_Impl : 
-  public virtual _TAO_CORBA_Policy_Proxy_Impl,
+class TAO_Export CORBA_TAO_Policy_Remote_Proxy_Impl :
+  public virtual CORBA_TAO_Policy_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl
 {
 public:
-  _TAO_CORBA_Policy_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_CORBA_Policy_Remote_Proxy_Impl (void) { }
-  
-    virtual CORBA::PolicyType policy_type (
-      CORBA_Object *_collocated_tao_target_,
+  CORBA_TAO_Policy_Remote_Proxy_Impl (void);
+
+  virtual ~CORBA_TAO_Policy_Remote_Proxy_Impl (void) { }
+
+  virtual CORBA::PolicyType policy_type (
+      CORBA::Object_ptr _collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA_Policy_ptr copy (
-      CORBA_Object *_collocated_tao_target_,
+virtual CORBA::Policy_ptr copy (
+      CORBA::Object_ptr _collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual void destroy (
-      CORBA_Object *_collocated_tao_target_,
+virtual void destroy (
+      CORBA::Object_ptr _collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -514,74 +502,72 @@ public:
 
 
 // The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
+// the right proxy for performing a call. In the new
 // collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
+// a call by call basis.
 
 
 
 ///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
+//                 Base Proxy Broker Declaration
 //
 
-class TAO_Export _TAO_CORBA_Policy_Proxy_Broker
+class TAO_Export CORBA_TAO_Policy_Proxy_Broker
 {
 public:
-  virtual ~_TAO_CORBA_Policy_Proxy_Broker (void);
-  virtual _TAO_CORBA_Policy_Proxy_Impl &select_proxy (
+  virtual ~CORBA_TAO_Policy_Proxy_Broker (void);
+  virtual CORBA_TAO_Policy_Proxy_Impl &select_proxy (
     CORBA_Policy *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+    CORBA_Environment &ACE_TRY_ENV
   ) = 0;
 
 protected:
-  _TAO_CORBA_Policy_Proxy_Broker (void);
-  
+  CORBA_TAO_Policy_Proxy_Broker (void);
+
 };
 
 //
-//              End Base Proxy Broker Declaration 
+//              End Base Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
 ///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
+//                 Remote Proxy Broker Declaration
 //
 
-class TAO_Export _TAO_CORBA_Policy_Remote_Proxy_Broker : public virtual _TAO_CORBA_Policy_Proxy_Broker
+class TAO_Export CORBA_TAO_Policy_Remote_Proxy_Broker : public virtual CORBA_TAO_Policy_Proxy_Broker
 {
-public: 
-  _TAO_CORBA_Policy_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_CORBA_Policy_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_CORBA_Policy_Proxy_Impl &select_proxy (
+public:
+  CORBA_TAO_Policy_Remote_Proxy_Broker (void);
+
+  virtual ~CORBA_TAO_Policy_Remote_Proxy_Broker (void);
+
+  virtual CORBA_TAO_Policy_Proxy_Impl &select_proxy (
     CORBA_Policy *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+    CORBA_Environment &ACE_TRY_ENV
   );
 
 private:
-  _TAO_CORBA_Policy_Remote_Proxy_Impl remote_proxy_impl_;
+  CORBA_TAO_Policy_Remote_Proxy_Impl remote_proxy_impl_;
 // This member function is used to get an handle to the unique instance
 // of the Remote Proxy Broker that is available for a given
 // interface.
 
 public:
-  static _TAO_CORBA_Policy_Remote_Proxy_Broker *the_TAO_CORBA_Policy_Remote_Proxy_Broker (void);
+  static CORBA_TAO_Policy_Remote_Proxy_Broker *the_CORBA_TAO_Policy_Remote_Proxy_Broker (void);
 };
 
 
 //
-//              End Remote Proxy Broker Declaration 
+//              End Remote Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
 #endif /* end #if !defined */
 
-extern TAO_Export CORBA::TypeCode_ptr  _tc_CORBA_Policy;
-
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CH_
 
@@ -589,7 +575,7 @@ extern TAO_Export CORBA::TypeCode_ptr  _tc_CORBA_Policy;
   {
   public:
     // = Initialization and termination methods.
-    
+
     _TAO_Unbounded_Object_Sequence_CORBA_PolicyList (void);
     _TAO_Unbounded_Object_Sequence_CORBA_PolicyList (CORBA::ULong maximum);
     _TAO_Unbounded_Object_Sequence_CORBA_PolicyList (CORBA::ULong maximum,
@@ -599,7 +585,7 @@ extern TAO_Export CORBA::TypeCode_ptr  _tc_CORBA_Policy;
     _TAO_Unbounded_Object_Sequence_CORBA_PolicyList(const _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &rhs);
     virtual ~_TAO_Unbounded_Object_Sequence_CORBA_PolicyList (void);
     _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &operator= (const _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &rhs);
-    TAO_Object_Manager<CORBA_Policy,CORBA_Policy_var> operator[] (CORBA::ULong index) const;
+    TAO_Object_Manager<CORBA::Policy,CORBA::Policy_var> operator[] (CORBA::ULong index) const;
     static CORBA_Policy **allocbuf (CORBA::ULong nelems);
     static void freebuf (CORBA_Policy **buffer);
     // The Base_Sequence functions, please see tao/Sequence.h
@@ -611,42 +597,39 @@ extern TAO_Export CORBA::TypeCode_ptr  _tc_CORBA_Policy;
     virtual void _downcast (
         void* target,
         CORBA_Object *src,
-        CORBA_Environment &ACE_TRY_ENV = 
+        CORBA_Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     virtual CORBA_Object* _upcast (void *src) const;
-    
+
   };
 
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_POLICYLIST_CH_)
 #define _CORBA_POLICYLIST_CH_
 
-class CORBA_PolicyList;
-class CORBA_PolicyList_var;
-
 // *************************************************************
-// CORBA_PolicyList
+// PolicyList
 // *************************************************************
 
-class TAO_Export CORBA_PolicyList : public 
+class TAO_Export CORBA_PolicyList : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<CORBA_Policy,CORBA_Policy_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 {
 public:
   CORBA_PolicyList (void); // default ctor
   CORBA_PolicyList (CORBA::ULong max); // uses max size
   CORBA_PolicyList (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    CORBA_Policy_ptr *buffer, 
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA_Policy_ptr *buffer,
     CORBA::Boolean release = 0
   );
   CORBA_PolicyList (const CORBA_PolicyList &); // copy ctor
@@ -666,7 +649,7 @@ public:
 #define _CORBA_POLICYLIST___VAR_CH_
 
 // *************************************************************
-// class CORBA_PolicyList_var
+// class CORBA::PolicyList_var
 // *************************************************************
 
 class TAO_Export CORBA_PolicyList_var
@@ -676,20 +659,20 @@ public:
   CORBA_PolicyList_var (CORBA_PolicyList *);
   CORBA_PolicyList_var (const CORBA_PolicyList_var &); // copy constructor
   ~CORBA_PolicyList_var (void); // destructor
-  
+
   CORBA_PolicyList_var &operator= (CORBA_PolicyList *);
   CORBA_PolicyList_var &operator= (const CORBA_PolicyList_var &);
   CORBA_PolicyList *operator-> (void);
   const CORBA_PolicyList *operator-> (void) const;
-  
+
   operator const CORBA_PolicyList &() const;
   operator CORBA_PolicyList &();
   operator CORBA_PolicyList &() const;
   operator CORBA_PolicyList *&(); // variable-size base types only
-  
+
   TAO_Object_Manager<CORBA_Policy, CORBA_Policy_var> operator[] (CORBA::ULong index);
-  
-  // in, inout, out, _retn 
+
+  // in, inout, out, _retn
   const CORBA_PolicyList &in (void) const;
   CORBA_PolicyList &inout (void);
   CORBA_PolicyList *&out (void);
@@ -719,7 +702,7 @@ public:
   CORBA_PolicyList *&ptr (void);
   CORBA_PolicyList *operator-> (void);
   TAO_Object_Manager<CORBA_Policy, CORBA_Policy_var> operator[] (CORBA::ULong index);
-  
+
 private:
   CORBA_PolicyList *&ptr_;
   // assignment from T_var not allowed
@@ -729,11 +712,9 @@ private:
 
 #endif /* end #if !defined */
 
-extern TAO_Export CORBA::TypeCode_ptr  _tc_CORBA_PolicyList;
-
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CH_
 
@@ -741,9 +722,9 @@ extern TAO_Export CORBA::TypeCode_ptr  _tc_CORBA_PolicyList;
   {
   public:
     // = Initialization and termination methods.
-    
+
     _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (void); // Default constructor.
-    _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (CORBA::ULong maximum); 
+    _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (CORBA::ULong maximum);
     _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (CORBA::ULong maximum,
       CORBA::ULong length,
       CORBA::ULong *data,
@@ -760,7 +741,7 @@ extern TAO_Export CORBA::TypeCode_ptr  _tc_CORBA_PolicyList;
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    
+
     CORBA::ULong *get_buffer (CORBA::Boolean orphan = 0);
     const CORBA::ULong *get_buffer (void) const;
     void replace (CORBA::ULong max,
@@ -772,7 +753,7 @@ extern TAO_Export CORBA::TypeCode_ptr  _tc_CORBA_PolicyList;
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_POLICYTYPESEQ_CH_)
 #define _CORBA_POLICYTYPESEQ_CH_
@@ -781,23 +762,23 @@ class CORBA_PolicyTypeSeq;
 class CORBA_PolicyTypeSeq_var;
 
 // *************************************************************
-// CORBA_PolicyTypeSeq
+// PolicyTypeSeq
 // *************************************************************
 
-class TAO_Export CORBA_PolicyTypeSeq : public 
+class TAO_Export CORBA_PolicyTypeSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::ULong>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 {
 public:
   CORBA_PolicyTypeSeq (void); // default ctor
   CORBA_PolicyTypeSeq (CORBA::ULong max); // uses max size
   CORBA_PolicyTypeSeq (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    CORBA::ULong *buffer, 
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::ULong *buffer,
     CORBA::Boolean release = 0
   );
   CORBA_PolicyTypeSeq (const CORBA_PolicyTypeSeq &); // copy ctor
@@ -817,7 +798,7 @@ public:
 #define _CORBA_POLICYTYPESEQ___VAR_CH_
 
 // *************************************************************
-// class CORBA_PolicyTypeSeq_var
+// class CORBA::PolicyTypeSeq_var
 // *************************************************************
 
 class TAO_Export CORBA_PolicyTypeSeq_var
@@ -828,21 +809,21 @@ public:
   CORBA_PolicyTypeSeq_var (const CORBA_PolicyTypeSeq_var &); // copy constructor
   CORBA_PolicyTypeSeq_var (const CORBA_PolicyTypeSeq &); // fixed-size base types only
   ~CORBA_PolicyTypeSeq_var (void); // destructor
-  
+
   CORBA_PolicyTypeSeq_var &operator= (CORBA_PolicyTypeSeq *);
   CORBA_PolicyTypeSeq_var &operator= (const CORBA_PolicyTypeSeq_var &);
   CORBA_PolicyTypeSeq_var &operator= (const CORBA_PolicyTypeSeq &); // fixed-size base types only
   CORBA_PolicyTypeSeq *operator-> (void);
   const CORBA_PolicyTypeSeq *operator-> (void) const;
-  
+
   operator const CORBA_PolicyTypeSeq &() const;
   operator CORBA_PolicyTypeSeq &();
   operator CORBA_PolicyTypeSeq &() const;
-  
+
   CORBA::PolicyType & operator[] (CORBA::ULong index);
   const CORBA::PolicyType & operator[] (CORBA::ULong index) const;
-  
-  // in, inout, out, _retn 
+
+  // in, inout, out, _retn
   const CORBA_PolicyTypeSeq &in (void) const;
   CORBA_PolicyTypeSeq &inout (void);
   CORBA_PolicyTypeSeq *&out (void);
@@ -872,7 +853,7 @@ public:
   CORBA_PolicyTypeSeq *&ptr (void);
   CORBA_PolicyTypeSeq *operator-> (void);
   CORBA::PolicyType & operator[] (CORBA::ULong index);
-  
+
 private:
   CORBA_PolicyTypeSeq *&ptr_;
   // assignment from T_var not allowed
@@ -882,17 +863,6 @@ private:
 
 #endif /* end #if !defined */
 
-extern TAO_Export CORBA::TypeCode_ptr  _tc_CORBA_PolicyTypeSeq;
-
-
-#if !defined (_CORBA_POLICYMANAGER___PTR_CH_)
-#define _CORBA_POLICYMANAGER___PTR_CH_
-
-class CORBA_PolicyManager;
-typedef CORBA_PolicyManager *CORBA_PolicyManager_ptr;
-
-#endif /* end #if !defined */
-
 
 #if !defined (_CORBA_POLICYMANAGER___VAR_CH_)
 #define _CORBA_POLICYMANAGER___VAR_CH_
@@ -901,17 +871,17 @@ class TAO_Export CORBA_PolicyManager_var : public TAO_Base_var
 {
 public:
   CORBA_PolicyManager_var (void); // default constructor
-  CORBA_PolicyManager_var (CORBA_PolicyManager_ptr p) : ptr_ (p) {} 
+  CORBA_PolicyManager_var (CORBA_PolicyManager_ptr p) : ptr_ (p) {}
   CORBA_PolicyManager_var (const CORBA_PolicyManager_var &); // copy constructor
   ~CORBA_PolicyManager_var (void); // destructor
-  
+
   CORBA_PolicyManager_var &operator= (CORBA_PolicyManager_ptr);
   CORBA_PolicyManager_var &operator= (const CORBA_PolicyManager_var &);
   CORBA_PolicyManager_ptr operator-> (void) const;
-  
+
   operator const CORBA_PolicyManager_ptr &() const;
   operator CORBA_PolicyManager_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   CORBA_PolicyManager_ptr in (void) const;
   CORBA_PolicyManager_ptr &inout (void);
   CORBA_PolicyManager_ptr &out (void);
@@ -952,7 +922,7 @@ public:
   operator CORBA_PolicyManager_ptr &();
   CORBA_PolicyManager_ptr &ptr (void);
   CORBA_PolicyManager_ptr operator-> (void);
-  
+
 private:
   CORBA_PolicyManager_ptr &ptr_;
 };
@@ -964,7 +934,7 @@ private:
 #if !defined (_CORBA_POLICYMANAGER_CH_)
 #define _CORBA_POLICYMANAGER_CH_
 
-class TAO_Export CORBA_PolicyManager : public virtual CORBA_Object
+class TAO_Export CORBA_PolicyManager : public virtual CORBA::Object
 {
 public:
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -976,12 +946,12 @@ public:
   static CORBA_PolicyManager_ptr _duplicate (CORBA_PolicyManager_ptr obj);
   static CORBA_PolicyManager_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static CORBA_PolicyManager_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static CORBA_PolicyManager_ptr _nil (void)
@@ -989,9 +959,9 @@ public:
       return (CORBA_PolicyManager_ptr)0;
     }
 
-  virtual CORBA_PolicyList * get_policy_overrides (
-      const CORBA_PolicyTypeSeq & ts,
-      CORBA::Environment &ACE_TRY_ENV = 
+  virtual CORBA::PolicyList * get_policy_overrides (
+      const CORBA::PolicyTypeSeq & ts,
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -999,23 +969,23 @@ public:
     )) = 0;
 
   virtual void set_policy_overrides (
-      const CORBA_PolicyList & policies,
+      const CORBA::PolicyList & policies,
       CORBA::SetOverrideType set_add,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
-      CORBA_InvalidPolicies
+      CORBA::InvalidPolicies
     )) = 0;
 
   virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
+
   virtual const char* _interface_repository_id (void) const;
 
 protected:
   CORBA_PolicyManager ();
-  
+
   virtual ~CORBA_PolicyManager (void);
 private:
   CORBA_PolicyManager (const CORBA_PolicyManager &);
@@ -1026,15 +996,6 @@ private:
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_POLICYCURRENT___PTR_CH_)
-#define _CORBA_POLICYCURRENT___PTR_CH_
-
-class CORBA_PolicyCurrent;
-typedef CORBA_PolicyCurrent *CORBA_PolicyCurrent_ptr;
-
-#endif /* end #if !defined */
-
-
 #if !defined (_CORBA_POLICYCURRENT___VAR_CH_)
 #define _CORBA_POLICYCURRENT___VAR_CH_
 
@@ -1042,17 +1003,17 @@ class TAO_Export CORBA_PolicyCurrent_var : public TAO_Base_var
 {
 public:
   CORBA_PolicyCurrent_var (void); // default constructor
-  CORBA_PolicyCurrent_var (CORBA_PolicyCurrent_ptr p) : ptr_ (p) {} 
+  CORBA_PolicyCurrent_var (CORBA_PolicyCurrent_ptr p) : ptr_ (p) {}
   CORBA_PolicyCurrent_var (const CORBA_PolicyCurrent_var &); // copy constructor
   ~CORBA_PolicyCurrent_var (void); // destructor
-  
+
   CORBA_PolicyCurrent_var &operator= (CORBA_PolicyCurrent_ptr);
   CORBA_PolicyCurrent_var &operator= (const CORBA_PolicyCurrent_var &);
   CORBA_PolicyCurrent_ptr operator-> (void) const;
-  
+
   operator const CORBA_PolicyCurrent_ptr &() const;
   operator CORBA_PolicyCurrent_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   CORBA_PolicyCurrent_ptr in (void) const;
   CORBA_PolicyCurrent_ptr &inout (void);
   CORBA_PolicyCurrent_ptr &out (void);
@@ -1093,7 +1054,7 @@ public:
   operator CORBA_PolicyCurrent_ptr &();
   CORBA_PolicyCurrent_ptr &ptr (void);
   CORBA_PolicyCurrent_ptr operator-> (void);
-  
+
 private:
   CORBA_PolicyCurrent_ptr &ptr_;
 };
@@ -1117,12 +1078,12 @@ public:
   static CORBA_PolicyCurrent_ptr _duplicate (CORBA_PolicyCurrent_ptr obj);
   static CORBA_PolicyCurrent_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static CORBA_PolicyCurrent_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static CORBA_PolicyCurrent_ptr _nil (void)
@@ -1131,12 +1092,12 @@ public:
     }
 
   virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
+
   virtual const char* _interface_repository_id (void) const;
 
 protected:
   CORBA_PolicyCurrent ();
-  
+
   virtual ~CORBA_PolicyCurrent (void);
 private:
   CORBA_PolicyCurrent (const CORBA_PolicyCurrent &);
@@ -1146,74 +1107,73 @@ private:
 
 #endif /* end #if !defined */
 
+
 // Proxy Broker Factory function pointer declarations.
 
 extern TAO_Export
-_TAO_CORBA_Policy_Proxy_Broker *
-(*_TAO_CORBA_Policy_Proxy_Broker_Factory_function_pointer) (
+CORBA_TAO_Policy_Proxy_Broker *
+(*CORBA_CORBA_TAO_Policy_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
+TAO_Export void operator<<= (CORBA::Any &, const CORBA::PolicyError &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyError*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyError *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::PolicyError *&);
+TAO_Export void operator<<= (CORBA::Any &, const CORBA::InvalidPolicies &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, CORBA::InvalidPolicies*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::InvalidPolicies *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::InvalidPolicies *&);
+// Any operators for interface CORBA::Policy
+TAO_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Policy *&);
+TAO_Export void operator<<= (CORBA::Any &, const CORBA::PolicyList &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyList*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyList *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::PolicyList *&);
+TAO_Export void operator<<= (CORBA::Any &, const CORBA::PolicyTypeSeq &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyTypeSeq*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyTypeSeq *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::PolicyTypeSeq *&);
 TAO_Export void operator<<= (CORBA::Any &, CORBA::SetOverrideType);
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::SetOverrideType &);
-TAO_Export void operator<<= (CORBA::Any &, const CORBA_PolicyError &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA_PolicyError*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_PolicyError *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_PolicyError *&);
-TAO_Export void operator<<= (CORBA::Any &, const CORBA_InvalidPolicies &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA_InvalidPolicies*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_InvalidPolicies *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_InvalidPolicies *&);
-// Any operators for interface CORBA_Policy
-TAO_Export void operator<<= (CORBA::Any &, CORBA_Policy_ptr);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_Policy *&);
-TAO_Export void operator<<= (CORBA::Any &, const CORBA_PolicyList &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA_PolicyList*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_PolicyList *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_PolicyList *&);
-TAO_Export void operator<<= (CORBA::Any &, const CORBA_PolicyTypeSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA_PolicyTypeSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_PolicyTypeSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_PolicyTypeSeq *&);
 
 #ifndef __ACE_INLINE__
 
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::SetOverrideType &); // 
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::SetOverrideType &);
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_PolicyError &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_PolicyError &);
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::PolicyError &);
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::PolicyError &);
 
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_InvalidPolicies &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_InvalidPolicies &);
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::InvalidPolicies &);
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::InvalidPolicies &);
 
 #if !defined _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_H_
 #define _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_H_
 
 TAO_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA_InvalidPolicies::_tao_seq_UShort &
+    const CORBA::InvalidPolicies::_tao_seq_UShort &
   );
 TAO_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA_InvalidPolicies::_tao_seq_UShort &
+    CORBA::InvalidPolicies::_tao_seq_UShort &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_H_ */
 
 
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_Policy_ptr );
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_Policy_ptr &);
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Policy_ptr );
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Policy_ptr &);
 
 #if !defined _TAO_CDR_OP_CORBA_PolicyList_H_
 #define _TAO_CDR_OP_CORBA_PolicyList_H_
 
 TAO_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA_PolicyList &
+    const CORBA::PolicyList &
   );
 TAO_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA_PolicyList &
+    CORBA::PolicyList &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_PolicyList_H_ */
@@ -1224,15 +1184,17 @@ TAO_Export CORBA::Boolean operator>> (
 
 TAO_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA_PolicyTypeSeq &
+    const CORBA::PolicyTypeSeq &
   );
 TAO_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA_PolicyTypeSeq &
+    CORBA::PolicyTypeSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_PolicyTypeSeq_H_ */
 
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::SetOverrideType &); //
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::SetOverrideType &);
 
 #endif /* __ACE_INLINE__ */
 
diff --git a/TAO/tao/PolicyC.i b/TAO/tao/PolicyC.i
index bbd5df5f2bd..ceb80909d8b 100644
--- a/TAO/tao/PolicyC.i
+++ b/TAO/tao/PolicyC.i
@@ -20,57 +20,57 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // *************************************************************
-// Inline operations for exception CORBA_PolicyError
+// Inline operations for exception CORBA::PolicyError
 // *************************************************************
 
 // *************************************************************
-// Inline operations for exception CORBA_InvalidPolicies
+// Inline operations for exception CORBA::InvalidPolicies
 // *************************************************************
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CI_
 
   // = Static operations.
   ACE_INLINE CORBA::UShort *
-  CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (CORBA::ULong size)
+  CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (CORBA::ULong size)
   // Allocate storage for the sequence.
   {
     CORBA::UShort *retval = 0;
     ACE_NEW_RETURN (retval, CORBA::UShort[size], 0);
     return retval;
   }
-  
-  ACE_INLINE void CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::freebuf (CORBA::UShort *buffer)
+
+  ACE_INLINE void CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::freebuf (CORBA::UShort *buffer)
   // Free the sequence.
   {
     delete [] buffer;
   }
-  
+
   ACE_INLINE
-  CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (void) // Default constructor.
+  CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (void) // Default constructor.
   {
   }
-  
+
   ACE_INLINE
-  CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (CORBA::ULong maximum) // Constructor using a maximum length value.
+  CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (CORBA::ULong maximum) // Constructor using a maximum length value.
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
-  CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (CORBA::ULong maximum,
+  CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (CORBA::ULong maximum,
     CORBA::ULong length,
     CORBA::UShort *data,
     CORBA::Boolean release)
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
   {
   }
-  
+
   ACE_INLINE
-  CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (const _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &rhs)
+  CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (const _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &rhs)
   // Copy constructor.
     : TAO_Unbounded_Base_Sequence (rhs)
   {
@@ -78,10 +78,10 @@
     {
       CORBA::UShort *tmp1 = _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (this->maximum_);
       CORBA::UShort * const tmp2 = ACE_reinterpret_cast (CORBA::UShort * ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp1[i] = tmp2[i];
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -89,14 +89,14 @@
       this->buffer_ = 0;
     }
   }
-  
-  ACE_INLINE CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &
-  CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::operator= (const _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &rhs)
+
+  ACE_INLINE CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &
+  CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::operator= (const _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &rhs)
   // Assignment operator.
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       if (this->maximum_ < rhs.maximum_)
@@ -109,41 +109,41 @@
     }
     else
       this->buffer_ = _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     CORBA::UShort *tmp1 = ACE_reinterpret_cast (CORBA::UShort *, this->buffer_);
     CORBA::UShort * const tmp2 = ACE_reinterpret_cast (CORBA::UShort * ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
-    
+
     return *this;
   }
-  
+
   // = Accessors.
   ACE_INLINE CORBA::UShort &
-  CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::operator[] (CORBA::ULong i)
+  CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::operator[] (CORBA::ULong i)
   // operator []
   {
     ACE_ASSERT (i < this->maximum_);
     CORBA::UShort* tmp = ACE_reinterpret_cast(CORBA::UShort*,this->buffer_);
     return tmp[i];
   }
-  
+
   ACE_INLINE const CORBA::UShort &
-  CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::operator[] (CORBA::ULong i) const
+  CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::operator[] (CORBA::ULong i) const
   // operator []
   {
     ACE_ASSERT (i < this->maximum_);
     CORBA::UShort * const tmp = ACE_reinterpret_cast (CORBA::UShort* ACE_CAST_CONST, this->buffer_);
     return tmp[i];
   }
-  
+
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
+
   ACE_INLINE CORBA::UShort *
-  CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::get_buffer (CORBA::Boolean orphan)
+  CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::get_buffer (CORBA::Boolean orphan)
   {
     CORBA::UShort *result = 0;
     if (orphan == 0)
@@ -175,15 +175,15 @@
     }
     return result;
   }
-  
+
   ACE_INLINE const CORBA::UShort *
-  CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::get_buffer (void) const
+  CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const CORBA::UShort * ACE_CAST_CONST, this->buffer_);
   }
-  
+
   ACE_INLINE void
-  CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::replace (CORBA::ULong max,
+  CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::replace (CORBA::ULong max,
   CORBA::ULong length,
   CORBA::UShort *data,
   CORBA::Boolean release)
@@ -198,58 +198,15 @@
     this->buffer_ = data;
     this->release_ = release;
   }
-  
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_POLICY___CI_)
 #define _CORBA_POLICY___CI_
 
-ACE_INLINE CORBA_Policy_ptr
-tao_CORBA_Policy_duplicate (
-    CORBA_Policy_ptr p
-  )
-{
-  return CORBA_Policy::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_CORBA_Policy_release (
-    CORBA_Policy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA_Policy_ptr
-tao_CORBA_Policy_nil (
-    void
-  )
-{
-  return CORBA_Policy::_nil ();
-}
-
-ACE_INLINE CORBA_Policy_ptr
-tao_CORBA_Policy_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return CORBA_Policy::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_CORBA_Policy_upcast (
-    void *src
-  )
-{
-  CORBA_Policy **tmp =
-    ACE_static_cast (CORBA_Policy **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 CORBA_Policy::CORBA_Policy (
     TAO_Stub *objref,
@@ -266,67 +223,67 @@ CORBA_Policy::CORBA_Policy (
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CI_
 
-  ACE_INLINE CORBA_Policy **
+  ACE_INLINE CORBA::Policy **
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (CORBA::ULong nelems)
   {
-    CORBA_Policy **buf = 0;
-    
-    ACE_NEW_RETURN (buf, CORBA_Policy*[nelems], 0);
-    
+    CORBA::Policy **buf = 0;
+
+    ACE_NEW_RETURN (buf, CORBA::Policy*[nelems], 0);
+
     for (CORBA::ULong i = 0; i < nelems; i++)
       {
-        buf[i] = CORBA_Policy::_nil ();
+        buf[i] = CORBA::Policy::_nil ();
       }
-    
+
     return buf;
   }
-  
-  ACE_INLINE void 
-  _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::freebuf (CORBA_Policy **buffer)
+
+  ACE_INLINE void
+  _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::freebuf (CORBA::Policy **buffer)
   {
     if (buffer == 0)
       return;
     delete[] buffer;
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList (void)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList (CORBA::ULong maximum)
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList (CORBA::ULong maximum,
     CORBA::ULong length,
-    CORBA_Policy* *value,
+    CORBA::Policy* *value,
     CORBA::Boolean release)
   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList(const _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &rhs)
     : TAO_Unbounded_Base_Sequence (rhs)
   {
     if (rhs.buffer_ != 0)
     {
-      CORBA_Policy **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (this->maximum_);
-      CORBA_Policy ** const tmp2 = ACE_reinterpret_cast (CORBA_Policy ** ACE_CAST_CONST, rhs.buffer_);
-      
+      CORBA::Policy **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (this->maximum_);
+      CORBA::Policy ** const tmp2 = ACE_reinterpret_cast (CORBA::Policy ** ACE_CAST_CONST, rhs.buffer_);
+
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         {
-          tmp1[i] = CORBA_Policy::_duplicate (tmp2[i]);
+          tmp1[i] = CORBA::Policy::_duplicate (tmp2[i]);
         }
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -334,21 +291,21 @@ CORBA_Policy::CORBA_Policy (
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::operator= (const _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &rhs)
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
-      CORBA_Policy **tmp = ACE_reinterpret_cast (CORBA_Policy **, this->buffer_);
-      
+      CORBA::Policy **tmp = ACE_reinterpret_cast (CORBA::Policy **, this->buffer_);
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
         CORBA::release (tmp[i]);
-        tmp[i] = CORBA_Policy::_nil ();
+        tmp[i] = CORBA::Policy::_nil ();
       }
       if (this->maximum_ < rhs.maximum_)
       {
@@ -358,33 +315,33 @@ CORBA_Policy::CORBA_Policy (
     }
     else
       this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    CORBA_Policy **tmp1 = ACE_reinterpret_cast (CORBA_Policy **, this->buffer_);
-    CORBA_Policy ** const tmp2 = ACE_reinterpret_cast (CORBA_Policy ** ACE_CAST_CONST, rhs.buffer_);
-    
+
+    CORBA::Policy **tmp1 = ACE_reinterpret_cast (CORBA::Policy **, this->buffer_);
+    CORBA::Policy ** const tmp2 = ACE_reinterpret_cast (CORBA::Policy ** ACE_CAST_CONST, rhs.buffer_);
+
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
       {
-        tmp1[i] = CORBA_Policy::_duplicate (tmp2[i]);
+        tmp1[i] = CORBA::Policy::_duplicate (tmp2[i]);
       }
-    
+
     return *this;
   }
-  
-  ACE_INLINE TAO_Object_Manager<CORBA_Policy,CORBA_Policy_var>
+
+  ACE_INLINE TAO_Object_Manager<CORBA::Policy,CORBA::Policy_var>
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::operator[] (CORBA::ULong index) const
   // read-write accessor
   {
     ACE_ASSERT (index < this->maximum_);
-    CORBA_Policy ** const tmp = ACE_reinterpret_cast (CORBA_Policy ** ACE_CAST_CONST, this->buffer_);
-    return TAO_Object_Manager<CORBA_Policy,CORBA_Policy_var> (tmp + index, this->release_);
+    CORBA::Policy ** const tmp = ACE_reinterpret_cast (CORBA::Policy ** ACE_CAST_CONST, this->buffer_);
+    return TAO_Object_Manager<CORBA::Policy,CORBA::Policy_var> (tmp + index, this->release_);
   }
-  
-  ACE_INLINE CORBA_Policy* *
+
+  ACE_INLINE CORBA::Policy* *
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::get_buffer (CORBA::Boolean orphan)
   {
-    CORBA_Policy **result = 0;
+    CORBA::Policy **result = 0;
     if (orphan == 0)
     {
       // We retain ownership.
@@ -396,7 +353,7 @@ CORBA_Policy::CORBA_Policy (
       }
       else
       {
-        result = ACE_reinterpret_cast (CORBA_Policy**, this->buffer_);
+        result = ACE_reinterpret_cast (CORBA::Policy**, this->buffer_);
       }
     }
     else // if (orphan == 1)
@@ -405,7 +362,7 @@ CORBA_Policy::CORBA_Policy (
       {
         // We set the state back to default and relinquish
         // ownership.
-        result = ACE_reinterpret_cast(CORBA_Policy**,this->buffer_);
+        result = ACE_reinterpret_cast(CORBA::Policy**,this->buffer_);
         this->maximum_ = 0;
         this->length_ = 0;
         this->buffer_ = 0;
@@ -414,18 +371,18 @@ CORBA_Policy::CORBA_Policy (
     }
     return result;
   }
-  
-  ACE_INLINE const CORBA_Policy* *
+
+  ACE_INLINE const CORBA::Policy* *
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::get_buffer (void) const
   {
-    return ACE_reinterpret_cast(const CORBA_Policy ** ACE_CAST_CONST, this->buffer_);
+    return ACE_reinterpret_cast(const CORBA::Policy ** ACE_CAST_CONST, this->buffer_);
   }
-  
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_POLICYLIST_CI_)
 #define _CORBA_POLICYLIST_CI_
@@ -481,7 +438,7 @@ CORBA_PolicyList_var::operator= (const ::CORBA_PolicyList_var &p)
         {
           CORBA_PolicyList *deep_copy =
             new CORBA_PolicyList (*p.ptr_);
-          
+
           if (deep_copy != 0)
             {
               CORBA_PolicyList *tmp = deep_copy;
@@ -491,7 +448,7 @@ CORBA_PolicyList_var::operator= (const ::CORBA_PolicyList_var &p)
             }
         }
     }
-  
+
   return *this;
 }
 
@@ -507,32 +464,32 @@ CORBA_PolicyList_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA_PolicyList_var::operator const ::CORBA_PolicyList &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-CORBA_PolicyList_var::operator ::CORBA_PolicyList &() // cast 
+ACE_INLINE
+CORBA_PolicyList_var::operator ::CORBA_PolicyList &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-CORBA_PolicyList_var::operator ::CORBA_PolicyList &() const // cast 
+ACE_INLINE
+CORBA_PolicyList_var::operator ::CORBA_PolicyList &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-CORBA_PolicyList_var::operator ::CORBA_PolicyList *&() // cast 
+CORBA_PolicyList_var::operator ::CORBA_PolicyList *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<CORBA_Policy, CORBA_Policy_var>
+ACE_INLINE TAO_Object_Manager<CORBA::Policy, CORBA::Policy_var>
 CORBA_PolicyList_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -550,7 +507,7 @@ CORBA_PolicyList_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::CORBA_PolicyList *&
 CORBA_PolicyList_var::out (void)
 {
@@ -611,7 +568,7 @@ CORBA_PolicyList_out::operator= (CORBA_PolicyList *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA_PolicyList_out::operator ::CORBA_PolicyList *&() // cast
 {
   return this->ptr_;
@@ -629,7 +586,7 @@ CORBA_PolicyList_out::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<CORBA_Policy, CORBA_Policy_var>
+ACE_INLINE TAO_Object_Manager<CORBA::Policy, CORBA::Policy_var>
 CORBA_PolicyList_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -640,7 +597,7 @@ CORBA_PolicyList_out::operator[] (CORBA::ULong index)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CI_
 
@@ -653,24 +610,24 @@ CORBA_PolicyList_out::operator[] (CORBA::ULong index)
     ACE_NEW_RETURN (retval, CORBA::ULong[size], 0);
     return retval;
   }
-  
+
   ACE_INLINE void _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::freebuf (CORBA::ULong *buffer)
   // Free the sequence.
   {
     delete [] buffer;
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (void) // Default constructor.
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -679,7 +636,7 @@ CORBA_PolicyList_out::operator[] (CORBA::ULong index)
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (const _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &rhs)
   // Copy constructor.
@@ -689,10 +646,10 @@ CORBA_PolicyList_out::operator[] (CORBA::ULong index)
     {
       CORBA::ULong *tmp1 = _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (this->maximum_);
       CORBA::ULong * const tmp2 = ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp1[i] = tmp2[i];
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -700,14 +657,14 @@ CORBA_PolicyList_out::operator[] (CORBA::ULong index)
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &
   _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::operator= (const _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &rhs)
   // Assignment operator.
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       if (this->maximum_ < rhs.maximum_)
@@ -720,18 +677,18 @@ CORBA_PolicyList_out::operator[] (CORBA::ULong index)
     }
     else
       this->buffer_ = _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     CORBA::ULong *tmp1 = ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
     CORBA::ULong * const tmp2 = ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
-    
+
     return *this;
   }
-  
+
   // = Accessors.
   ACE_INLINE CORBA::ULong &
   _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::operator[] (CORBA::ULong i)
@@ -741,7 +698,7 @@ CORBA_PolicyList_out::operator[] (CORBA::ULong index)
     CORBA::ULong* tmp = ACE_reinterpret_cast(CORBA::ULong*,this->buffer_);
     return tmp[i];
   }
-  
+
   ACE_INLINE const CORBA::ULong &
   _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::operator[] (CORBA::ULong i) const
   // operator []
@@ -750,9 +707,9 @@ CORBA_PolicyList_out::operator[] (CORBA::ULong index)
     CORBA::ULong * const tmp = ACE_reinterpret_cast (CORBA::ULong* ACE_CAST_CONST, this->buffer_);
     return tmp[i];
   }
-  
+
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
+
   ACE_INLINE CORBA::ULong *
   _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::get_buffer (CORBA::Boolean orphan)
   {
@@ -786,13 +743,13 @@ CORBA_PolicyList_out::operator[] (CORBA::ULong index)
     }
     return result;
   }
-  
+
   ACE_INLINE const CORBA::ULong *
   _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const CORBA::ULong * ACE_CAST_CONST, this->buffer_);
   }
-  
+
   ACE_INLINE void
   _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::replace (CORBA::ULong max,
   CORBA::ULong length,
@@ -809,17 +766,17 @@ CORBA_PolicyList_out::operator[] (CORBA::ULong index)
     this->buffer_ = data;
     this->release_ = release;
   }
-  
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_POLICYTYPESEQ_CI_)
 #define _CORBA_POLICYTYPESEQ_CI_
 
 // *************************************************************
-// Inline operations for class CORBA_PolicyTypeSeq_var
+// Inline operations for class CORBA::PolicyTypeSeq_var
 // *************************************************************
 
 ACE_INLINE
@@ -833,17 +790,17 @@ CORBA_PolicyTypeSeq_var::CORBA_PolicyTypeSeq_var (CORBA_PolicyTypeSeq *p)
 {}
 
 ACE_INLINE
-CORBA_PolicyTypeSeq_var::CORBA_PolicyTypeSeq_var (const ::CORBA_PolicyTypeSeq_var &p) // copy constructor
+CORBA_PolicyTypeSeq_var::CORBA_PolicyTypeSeq_var (const CORBA_PolicyTypeSeq_var &p) // copy constructor
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::CORBA_PolicyTypeSeq (*p.ptr_));
+    ACE_NEW (this->ptr_, CORBA_PolicyTypeSeq (*p.ptr_));
   else
     this->ptr_ = 0;
 }
 
 // fixed-size base types only
 ACE_INLINE
-CORBA_PolicyTypeSeq_var::CORBA_PolicyTypeSeq_var (const ::CORBA_PolicyTypeSeq &p)
+CORBA_PolicyTypeSeq_var::CORBA_PolicyTypeSeq_var (const CORBA_PolicyTypeSeq &p)
 {
   ACE_NEW (this->ptr_, ::CORBA_PolicyTypeSeq (p));
 }
@@ -876,7 +833,7 @@ CORBA_PolicyTypeSeq_var::operator= (const ::CORBA_PolicyTypeSeq_var &p)
         {
           CORBA_PolicyTypeSeq *deep_copy =
             new CORBA_PolicyTypeSeq (*p.ptr_);
-          
+
           if (deep_copy != 0)
             {
               CORBA_PolicyTypeSeq *tmp = deep_copy;
@@ -886,48 +843,48 @@ CORBA_PolicyTypeSeq_var::operator= (const ::CORBA_PolicyTypeSeq_var &p)
             }
         }
     }
-  
+
   return *this;
 }
 
 // fixed-size types only
 ACE_INLINE ::CORBA_PolicyTypeSeq_var &
-CORBA_PolicyTypeSeq_var::operator= (const ::CORBA_PolicyTypeSeq &p)
+CORBA_PolicyTypeSeq_var::operator= (const ::CORBA::PolicyTypeSeq &p)
 {
   if (this->ptr_ != &p)
   {
     delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::CORBA_PolicyTypeSeq (p), *this);
+    ACE_NEW_RETURN (this->ptr_, ::CORBA::PolicyTypeSeq (p), *this);
   }
   return *this;
 }
 
-ACE_INLINE const ::CORBA_PolicyTypeSeq *
+ACE_INLINE const ::CORBA::PolicyTypeSeq *
 CORBA_PolicyTypeSeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA_PolicyTypeSeq *
+ACE_INLINE ::CORBA::PolicyTypeSeq *
 CORBA_PolicyTypeSeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-CORBA_PolicyTypeSeq_var::operator const ::CORBA_PolicyTypeSeq &() const // cast
+ACE_INLINE
+CORBA_PolicyTypeSeq_var::operator const ::CORBA::PolicyTypeSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-CORBA_PolicyTypeSeq_var::operator ::CORBA_PolicyTypeSeq &() // cast 
+ACE_INLINE
+CORBA_PolicyTypeSeq_var::operator ::CORBA::PolicyTypeSeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-CORBA_PolicyTypeSeq_var::operator ::CORBA_PolicyTypeSeq &() const // cast 
+ACE_INLINE
+CORBA_PolicyTypeSeq_var::operator ::CORBA::PolicyTypeSeq &() const // cast
 {
   return *this->ptr_;
 }
@@ -944,20 +901,20 @@ CORBA_PolicyTypeSeq_var::operator[] (CORBA::ULong index) const
   return ACE_const_cast (const CORBA::PolicyType &, this->ptr_->operator[] (index));
 }
 
-ACE_INLINE const ::CORBA_PolicyTypeSeq &
+ACE_INLINE const ::CORBA::PolicyTypeSeq &
 CORBA_PolicyTypeSeq_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::CORBA_PolicyTypeSeq &
+ACE_INLINE ::CORBA::PolicyTypeSeq &
 CORBA_PolicyTypeSeq_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::CORBA_PolicyTypeSeq *&
+// mapping for variable size
+ACE_INLINE ::CORBA::PolicyTypeSeq *&
 CORBA_PolicyTypeSeq_var::out (void)
 {
   delete this->ptr_;
@@ -965,15 +922,15 @@ CORBA_PolicyTypeSeq_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA_PolicyTypeSeq *
+ACE_INLINE ::CORBA::PolicyTypeSeq *
 CORBA_PolicyTypeSeq_var::_retn (void)
 {
-  ::CORBA_PolicyTypeSeq *tmp = this->ptr_;
+  ::CORBA::PolicyTypeSeq *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE ::CORBA_PolicyTypeSeq *
+ACE_INLINE ::CORBA::PolicyTypeSeq *
 CORBA_PolicyTypeSeq_var::ptr (void) const
 {
   return this->ptr_;
@@ -1017,19 +974,19 @@ CORBA_PolicyTypeSeq_out::operator= (CORBA_PolicyTypeSeq *p)
   return *this;
 }
 
-ACE_INLINE 
-CORBA_PolicyTypeSeq_out::operator ::CORBA_PolicyTypeSeq *&() // cast
+ACE_INLINE
+CORBA_PolicyTypeSeq_out::operator ::CORBA::PolicyTypeSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA_PolicyTypeSeq *&
+ACE_INLINE ::CORBA::PolicyTypeSeq *&
 CORBA_PolicyTypeSeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA_PolicyTypeSeq *
+ACE_INLINE ::CORBA::PolicyTypeSeq *
 CORBA_PolicyTypeSeq_out::operator-> (void)
 {
   return this->ptr_;
@@ -1048,48 +1005,12 @@ CORBA_PolicyTypeSeq_out::operator[] (CORBA::ULong index)
 #if !defined (_CORBA_POLICYMANAGER___CI_)
 #define _CORBA_POLICYMANAGER___CI_
 
-ACE_INLINE CORBA_PolicyManager_ptr
-tao_CORBA_PolicyManager_duplicate (
-    CORBA_PolicyManager_ptr p
-  )
-{
-  return CORBA_PolicyManager::_duplicate (p);
-}
 
-ACE_INLINE void
-tao_CORBA_PolicyManager_release (
-    CORBA_PolicyManager_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA_PolicyManager_ptr
-tao_CORBA_PolicyManager_nil (
-    void
-  )
-{
-  return CORBA_PolicyManager::_nil ();
-}
+#endif /* end #if !defined */
 
-ACE_INLINE CORBA_PolicyManager_ptr
-tao_CORBA_PolicyManager_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return CORBA_PolicyManager::_narrow (p, ACE_TRY_ENV);
-}
 
-ACE_INLINE CORBA::Object *
-tao_CORBA_PolicyManager_upcast (
-    void *src
-  )
-{
-  CORBA_PolicyManager **tmp =
-    ACE_static_cast (CORBA_PolicyManager **, src);
-  return *tmp;
-}
+#if !defined (_CORBA_CURRENT___CI_)
+#define _CORBA_CURRENT___CI_
 
 
 #endif /* end #if !defined */
@@ -1098,72 +1019,10 @@ tao_CORBA_PolicyManager_upcast (
 #if !defined (_CORBA_POLICYCURRENT___CI_)
 #define _CORBA_POLICYCURRENT___CI_
 
-ACE_INLINE CORBA_PolicyCurrent_ptr
-tao_CORBA_PolicyCurrent_duplicate (
-    CORBA_PolicyCurrent_ptr p
-  )
-{
-  return CORBA_PolicyCurrent::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_CORBA_PolicyCurrent_release (
-    CORBA_PolicyCurrent_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA_PolicyCurrent_ptr
-tao_CORBA_PolicyCurrent_nil (
-    void
-  )
-{
-  return CORBA_PolicyCurrent::_nil ();
-}
-
-ACE_INLINE CORBA_PolicyCurrent_ptr
-tao_CORBA_PolicyCurrent_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return CORBA_PolicyCurrent::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_CORBA_PolicyCurrent_upcast (
-    void *src
-  )
-{
-  CORBA_PolicyCurrent **tmp =
-    ACE_static_cast (CORBA_PolicyCurrent **, src);
-  return *tmp;
-}
-
 
 #endif /* end #if !defined */
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::SetOverrideType &_tao_enumval)
-{
-  CORBA::ULong _tao_temp = _tao_enumval;
-  return strm << _tao_temp;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::SetOverrideType &_tao_enumval)
-{
-  CORBA::ULong _tao_temp = 0;
-  CORBA::Boolean _tao_result = strm >> _tao_temp;
-  
-  if (_tao_result == 1)
-    {
-      _tao_enumval = ACE_static_cast (CORBA::SetOverrideType, _tao_temp);
-    }
-  
-  return _tao_result;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_PolicyError &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::PolicyError &_tao_aggregate)
 {
   // first marshal the repository ID
   if (strm << _tao_aggregate._id ())
@@ -1180,7 +1039,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_PolicyErr
     return 0;
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm,CORBA_PolicyError &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm,CORBA::PolicyError &_tao_aggregate)
 {
   // now marshal the members
   if (
@@ -1197,16 +1056,16 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm,CORBA_PolicyError &_tao
 
 CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
-    const CORBA_InvalidPolicies::_tao_seq_UShort &
+    const CORBA::InvalidPolicies::_tao_seq_UShort &
   );
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
-    CORBA_InvalidPolicies::_tao_seq_UShort &
+    CORBA::InvalidPolicies::_tao_seq_UShort &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_I_ */
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_InvalidPolicies &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::InvalidPolicies &_tao_aggregate)
 {
   // first marshal the repository ID
   if (strm << _tao_aggregate._id ())
@@ -1223,7 +1082,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_InvalidPo
     return 0;
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm,CORBA_InvalidPolicies &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm,CORBA::InvalidPolicies &_tao_aggregate)
 {
   // now marshal the members
   if (
@@ -1234,14 +1093,14 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm,CORBA_InvalidPolicies &
     return 0;
 }
 
-CORBA::Boolean TAO_Export operator<< (
+TAO_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA_Policy_ptr
+    const CORBA::Policy_ptr
   );
 
-CORBA::Boolean TAO_Export operator>> (
+TAO_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA_Policy_ptr &
+    CORBA::Policy_ptr &
   );
 
 
@@ -1265,12 +1124,30 @@ CORBA::Boolean TAO_Export operator>> (
 
 CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
-    const CORBA_PolicyTypeSeq &
+    const CORBA::PolicyTypeSeq &
   );
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
-    CORBA_PolicyTypeSeq &
+    CORBA::PolicyTypeSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_PolicyTypeSeq_I_ */
 
+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::SetOverrideType &_tao_enumval)
+{
+  CORBA::ULong _tao_temp = _tao_enumval;
+  return strm << _tao_temp;
+}
+
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::SetOverrideType &_tao_enumval)
+{
+  CORBA::ULong _tao_temp = 0;
+  CORBA::Boolean _tao_result = strm >> _tao_temp;
+
+  if (_tao_result == 1)
+    {
+      _tao_enumval = ACE_static_cast (CORBA::SetOverrideType, _tao_temp);
+    }
+
+  return _tao_result;
+}
diff --git a/TAO/tao/PortableInterceptor.h b/TAO/tao/PortableInterceptor.h
index 730a87119af..8a759378997 100644
--- a/TAO/tao/PortableInterceptor.h
+++ b/TAO/tao/PortableInterceptor.h
@@ -6,11 +6,7 @@
  *
  *  $Id$
  *
- *   This file contains two helper classes to simplify the support of
- *   interceptors in tao_idl generated code.  All the helper classes
- *   implementations are in PortableInterceptor.i file.
- *
- *   A series of TAO_INTERCEPTOR* macros are also defined in the file.
+ *   A series of TAO_INTERCEPTOR* macros are defined in this file.
  *   These macros allows us to disable/enable support of interceptors
  *   easily.
  *
@@ -26,7 +22,7 @@
 
 #include "ace/pre.h"
 
-#include "corbafwd.h"
+#include "orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -46,157 +42,6 @@
 # define TAO_INTERCEPTOR_THROW_RETURN(X,Y) ACE_THROW_RETURN(X,Y)
 #endif /* TAO_HAS_INTERCEPTORS */
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-
-#include "PortableInterceptorC.h"
-#include "Interceptor_List.h"
-
-// Forward declarations
-class TAO_ClientRequestInfo;
-
-/**
- * @class TAO_ClientRequestInterceptor_Adapter
- *
- * @brief TAO_ClientRequestInterceptor_Adapter
- *
- * A convenient helper class to invoke registered client request
- * interceptor(s) in tao_idl generated code.
- */
-class TAO_Export TAO_ClientRequestInterceptor_Adapter
-{
-
-public:
-
-  TAO_ClientRequestInterceptor_Adapter (
-    TAO_ClientRequestInterceptor_List::TYPE &interceptors);
-
-  ~TAO_ClientRequestInterceptor_Adapter (void);
-
-  /**
-   * @name PortableInterceptor Client Side Interception Points
-   *
-   * Each of these methods corresponds to a client side interception
-   * point.  There are no "intermediate" interception points on the
-   * client side, only "starting" and "ending" interception points.
-   *
-   * @todo
-   * The "send_poll()" and "receive_other()" (for AMI)
-   * PortableInterceptor interception points are missing.
-   */
-  //@{
-  /// This method implements one of the "starting" client side
-  /// interception points.
-  void send_request (TAO_ClientRequestInfo *ri,
-                     CORBA::Environment &);
-
-  /// This method implements one of the "ending" client side
-  /// interception point.
-  void receive_reply (TAO_ClientRequestInfo *ri,
-                      CORBA::Environment &);
-
-  /// This method implements one of the "ending" client side
-  /// interception point.
-  void receive_exception (TAO_ClientRequestInfo *ri,
-                          CORBA::Environment &);
-
-  /// This method implements one of the "ending" client side
-  /// interception point.
-  void receive_other (TAO_ClientRequestInfo *ri,
-                      CORBA::Environment &);
-  //@}
-
-private:
-
-  /// Reference to the list of registered interceptors.
-  TAO_ClientRequestInterceptor_List::TYPE &interceptors_;
-
-  /// Cache the length of the interceptor list so that we don't have
-  /// to compute it at each stage of the current interception.
-  size_t len_;
-
-  /// The number of interceptors "pushed" onto the logical flow
-  /// stack.  This is used when unwinding the flow stack.
-  size_t stack_size_;
-
-};
-
-/**
- * @class TAO_ServerRequestInterceptor_Adapter
- *
- * @brief TAO_ServerRequestInterceptor_Adapter
- *
- * A convenient helper class to invoke registered server request
- * interceptor(s) in tao_idl generated code.
- */
-class TAO_Export TAO_ServerRequestInterceptor_Adapter
-{
-
-public:
-
-  TAO_ServerRequestInterceptor_Adapter (
-    TAO_ServerRequestInterceptor_List::TYPE &interceptors,
-    size_t &stack_size);
-
-  ~TAO_ServerRequestInterceptor_Adapter (void);
-
-  /**
-   * @name PortableInterceptor Client Side Interception Points
-   *
-   * Each of these methods corresponds to a client side interception
-   * point.
-   *
-   * @todo
-   * The "receive_request_service_contexts()" and "send_other()"
-   * PortableInterceptor interception points are missing.
-   */
-  //@{
-  /// This method implements the "starting" server side interception
-  /// point.
-  void receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr ri,
-    CORBA::Environment &);
-
-  /// This method an "intermediate" server side interception point.
-  void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
-                        CORBA::Environment &);
-
-  /// This method implements one of the "ending" server side
-  /// interception points.
-  void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri,
-                   CORBA::Environment &);
-
-  /// This method implements one of the "ending" server side
-  /// interception points.
-  void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri,
-                       CORBA::Environment &);
-
-  /// This method implements one of the "ending" server side
-  /// interception points.
-  void send_other (PortableInterceptor::ServerRequestInfo_ptr ri,
-                   CORBA::Environment &);
-  //@}
-
-private:
-
-  /// Reference to the list of registered interceptors.
-  TAO_ServerRequestInterceptor_List::TYPE &interceptors_;
-
-  /// Cache the length of the interceptor list so that we don't have
-  /// to compute it at each stage of the current interception.
-  size_t len_;
-
-  /// The number of interceptors "pushed" onto the logical flow
-  /// stack.  This is used when unwinding the flow stack.
-  size_t &stack_size_;
-
-};
-
-#if defined (__ACE_INLINE__)
-#include "PortableInterceptor.i"
-#endif /* defined INLINE */
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 #include "ace/post.h"
 
 #endif /* TAO_PORTABLE_INTERCEPTOR_H */
diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
index c6cfffcff75..7bc48f8e3e6 100644
--- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
+++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
@@ -9,12 +9,12 @@ TAO_Default_Servant_Dispatcher::~TAO_Default_Servant_Dispatcher (void)
 }
 
 void
-TAO_Default_Servant_Dispatcher::dispatch (TAO_Object_Adapter::Servant_Upcall &servant_upcall,
-                                          TAO_ServerRequest &req,
-                                          void *context,
-                                          CORBA::Environment &ACE_TRY_ENV)
+TAO_Default_Servant_Dispatcher::dispatch (
+  TAO_Object_Adapter::Servant_Upcall &servant_upcall,
+  TAO_ServerRequest &req,
+  CORBA::Environment &ACE_TRY_ENV)
 {
-    servant_upcall.servant ()->_dispatch (req,
-                                          context,
-                                          ACE_TRY_ENV);
+  servant_upcall.servant ()->_dispatch (req,
+                                        &servant_upcall,
+                                        ACE_TRY_ENV);
 }
diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h
index f1305288196..a28e413b9ca 100644
--- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h
+++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h
@@ -40,7 +40,6 @@ public:
   /// Dispatch the request to the servant.
   virtual void dispatch (TAO_Object_Adapter::Servant_Upcall &servant_upcall,
                          TAO_ServerRequest &req,
-                         void *context,
                          CORBA::Environment &ACE_TRY_ENV);
 };
 
diff --git a/TAO/tao/PortableServer/ImplRepoC.cpp b/TAO/tao/PortableServer/ImplRepoC.cpp
index 6bd3f0fc192..a675b0e8554 100644
--- a/TAO/tao/PortableServer/ImplRepoC.cpp
+++ b/TAO/tao/PortableServer/ImplRepoC.cpp
@@ -24,8 +24,11 @@
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
+
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
+#include "tao/ClientRequestInfo.h"
+#include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 #if defined (__BORLANDC__)
@@ -159,7 +162,7 @@ ImplementationRepository::ServerObject_var::upcast (void *src)
   return *tmp;
 }
 // *************************************************************
-// Inline operations for class ImplementationRepository::ServerObject_out
+// Operations for class ImplementationRepository::ServerObject_out
 // *************************************************************
 
 ImplementationRepository::ServerObject_out::ServerObject_out (ServerObject_ptr &p)
@@ -230,19 +233,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -311,19 +314,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -419,17 +422,21 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
       0,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping ri (
@@ -439,22 +446,31 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
       );
       ACE_CHECK;
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+          
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+#endif /* TAO_HAS_INTERCEPTORS */
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
           
           _tao_call.prepare_header (
@@ -462,6 +478,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
+          
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
@@ -469,71 +486,68 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
               
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
+          
           
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
@@ -560,17 +574,21 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
       0,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown ri (
@@ -580,22 +598,31 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
       );
       ACE_CHECK;
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
           
           _tao_call.prepare_header (
@@ -603,6 +630,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
+          
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
@@ -610,71 +638,68 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
               
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
+          
           
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 
@@ -1025,48 +1050,48 @@ TAO_NAMESPACE_END
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_
 
-  void
-  ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_allocate_buffer (CORBA::ULong length)
-  {
-    ImplementationRepository::EnvironmentVariable* tmp = 0;
-    tmp = _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      ImplementationRepository::EnvironmentVariable *old = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *,this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-      
-      if (this->release_)
-        _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (old);
-      
-    }
-    this->buffer_ = tmp;
-  }
+void
+ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_allocate_buffer (CORBA::ULong length)
+{
+  ImplementationRepository::EnvironmentVariable* tmp = 0;
+  tmp = _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (length);
   
-  void
-  ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_deallocate_buffer (void)
+  if (this->buffer_ != 0)
   {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
+    ImplementationRepository::EnvironmentVariable *old = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *,this->buffer_);
     
-    ImplementationRepository::EnvironmentVariable *tmp = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *,this->buffer_);
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
+      tmp[i] = old[i];
+    
+    if (this->release_)
+      _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (old);
     
-    _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (tmp);
-    this->buffer_ = 0;
-  } 
-  
-  ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::~_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void) // Dtor.
-  {
-    this->_deallocate_buffer ();
   }
+  this->buffer_ = tmp;
+}
+
+void
+ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    return;
   
+  ImplementationRepository::EnvironmentVariable *tmp = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *,this->buffer_);
   
+  _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (tmp);
+  this->buffer_ = 0;
+} 
+
+ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::~_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void) // Dtor.
+{
+  this->_deallocate_buffer ();
+}
+
+
 #endif /* end #if !defined */
 
 
@@ -1084,27 +1109,27 @@ ImplementationRepository::EnvironmentList::EnvironmentList (void)
 ImplementationRepository::EnvironmentList::EnvironmentList (CORBA::ULong max) // uses max size
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
+_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<ImplementationRepository::EnvironmentVariable>
+TAO_Unbounded_Sequence<ImplementationRepository::EnvironmentVariable>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 ImplementationRepository::EnvironmentList::EnvironmentList (CORBA::ULong max, CORBA::ULong length, ImplementationRepository::EnvironmentVariable *buffer, CORBA::Boolean release)
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
+_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<ImplementationRepository::EnvironmentVariable>
+TAO_Unbounded_Sequence<ImplementationRepository::EnvironmentVariable>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 ImplementationRepository::EnvironmentList::EnvironmentList (const EnvironmentList &seq) // copy ctor
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
+_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<ImplementationRepository::EnvironmentVariable>
+TAO_Unbounded_Sequence<ImplementationRepository::EnvironmentVariable>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
@@ -1649,48 +1674,48 @@ void ImplementationRepository::ServerInformation::_tao_any_destructor (void *x)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_
 
-  void
-  ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_allocate_buffer (CORBA::ULong length)
-  {
-    ImplementationRepository::ServerInformation* tmp = 0;
-    tmp = _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      ImplementationRepository::ServerInformation *old = ACE_reinterpret_cast (ImplementationRepository::ServerInformation *,this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-      
-      if (this->release_)
-        _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (old);
-      
-    }
-    this->buffer_ = tmp;
-  }
+void
+ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_allocate_buffer (CORBA::ULong length)
+{
+  ImplementationRepository::ServerInformation* tmp = 0;
+  tmp = _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (length);
   
-  void
-  ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_deallocate_buffer (void)
+  if (this->buffer_ != 0)
   {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
+    ImplementationRepository::ServerInformation *old = ACE_reinterpret_cast (ImplementationRepository::ServerInformation *,this->buffer_);
     
-    ImplementationRepository::ServerInformation *tmp = ACE_reinterpret_cast (ImplementationRepository::ServerInformation *,this->buffer_);
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
+      tmp[i] = old[i];
+    
+    if (this->release_)
+      _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (old);
     
-    _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (tmp);
-    this->buffer_ = 0;
-  } 
-  
-  ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::~_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void) // Dtor.
-  {
-    this->_deallocate_buffer ();
   }
+  this->buffer_ = tmp;
+}
+
+void
+ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    return;
   
+  ImplementationRepository::ServerInformation *tmp = ACE_reinterpret_cast (ImplementationRepository::ServerInformation *,this->buffer_);
   
+  _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (tmp);
+  this->buffer_ = 0;
+} 
+
+ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::~_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void) // Dtor.
+{
+  this->_deallocate_buffer ();
+}
+
+
 #endif /* end #if !defined */
 
 
@@ -1708,27 +1733,27 @@ ImplementationRepository::ServerInformationList::ServerInformationList (void)
 ImplementationRepository::ServerInformationList::ServerInformationList (CORBA::ULong max) // uses max size
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
+_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<ImplementationRepository::ServerInformation>
+TAO_Unbounded_Sequence<ImplementationRepository::ServerInformation>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 ImplementationRepository::ServerInformationList::ServerInformationList (CORBA::ULong max, CORBA::ULong length, ImplementationRepository::ServerInformation *buffer, CORBA::Boolean release)
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
+_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<ImplementationRepository::ServerInformation>
+TAO_Unbounded_Sequence<ImplementationRepository::ServerInformation>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 ImplementationRepository::ServerInformationList::ServerInformationList (const ServerInformationList &seq) // copy ctor
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
+_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<ImplementationRepository::ServerInformation>
+TAO_Unbounded_Sequence<ImplementationRepository::ServerInformation>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
@@ -2123,7 +2148,7 @@ ImplementationRepository::Administration_var::upcast (void *src)
   return *tmp;
 }
 // *************************************************************
-// Inline operations for class ImplementationRepository::Administration_out
+// Operations for class ImplementationRepository::Administration_out
 // *************************************************************
 
 ImplementationRepository::Administration_out::Administration_out (Administration_ptr &p)
@@ -2195,19 +2220,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -2240,11 +2265,13 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::a
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_server = parameter_list->length ();
-  parameter_list->length (length_server + 1);
-  (*parameter_list)[length_server].argument <<= server_;
-  (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
+  
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
   
   return safe_parameter_list._retn ();
 }
@@ -2304,19 +2331,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -2352,17 +2379,16 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::a
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_server = parameter_list->length ();
-  parameter_list->length (length_server + 1);
-  (*parameter_list)[length_server].argument <<= server_;
-  (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_options = parameter_list->length ();
-  parameter_list->length (length_options + 1);
-  (*parameter_list)[length_options].argument <<=  this->options_;
   
-  (*parameter_list)[length_options].mode = Dynamic::PARAM_IN;
+  parameter_list->length (2);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->options_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
   
   return safe_parameter_list._retn ();
 }
@@ -2421,19 +2447,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -2469,17 +2495,16 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server:
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_server = parameter_list->length ();
-  parameter_list->length (length_server + 1);
-  (*parameter_list)[length_server].argument <<= server_;
-  (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_options = parameter_list->length ();
-  parameter_list->length (length_options + 1);
-  (*parameter_list)[length_options].argument <<=  this->options_;
   
-  (*parameter_list)[length_options].mode = Dynamic::PARAM_IN;
+  parameter_list->length (2);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->options_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
   
   return safe_parameter_list._retn ();
 }
@@ -2522,19 +2547,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -2567,11 +2592,13 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::arg
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_server = parameter_list->length ();
-  parameter_list->length (length_server + 1);
-  (*parameter_list)[length_server].argument <<= server_;
-  (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
+  
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
   
   return safe_parameter_list._retn ();
 }
@@ -2629,19 +2656,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -2674,11 +2701,13 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::a
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_server = parameter_list->length ();
-  parameter_list->length (length_server + 1);
-  (*parameter_list)[length_server].argument <<= server_;
-  (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
+  
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
   
   return safe_parameter_list._retn ();
 }
@@ -2738,19 +2767,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -2791,22 +2820,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running:
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_server = parameter_list->length ();
-  parameter_list->length (length_server + 1);
-  (*parameter_list)[length_server].argument <<= server_;
-  (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_addr = parameter_list->length ();
-  parameter_list->length (length_addr + 1);
-  (*parameter_list)[length_addr].argument <<= addr_;
-  (*parameter_list)[length_addr].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_server_object = parameter_list->length ();
-  parameter_list->length (length_server_object + 1);
-  (*parameter_list)[length_server_object].argument <<=  this->server_object_;
   
-  (*parameter_list)[length_server_object].mode = Dynamic::PARAM_IN;
+  parameter_list->length (3);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= addr_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->server_object_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
   
   return safe_parameter_list._retn ();
 }
@@ -2874,19 +2900,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -2919,11 +2945,13 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_server = parameter_list->length ();
-  parameter_list->length (length_server + 1);
-  (*parameter_list)[length_server].argument <<= server_;
-  (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
+  
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
   
   return safe_parameter_list._retn ();
 }
@@ -2981,19 +3009,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -3026,11 +3054,13 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_find::arguments (C
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_server = parameter_list->length ();
-  parameter_list->length (length_server + 1);
-  (*parameter_list)[length_server].argument <<= server_;
-  (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
+  
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
   
   return safe_parameter_list._retn ();
 }
@@ -3089,19 +3119,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -3137,11 +3167,13 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_list::arguments (C
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_how_many = parameter_list->length ();
-  parameter_list->length (length_how_many + 1);
-  (*parameter_list)[length_how_many].argument <<= how_many_;
-  (*parameter_list)[length_how_many].mode = Dynamic::PARAM_IN;
+  
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= how_many_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
     
 
   return safe_parameter_list._retn ();
@@ -3220,17 +3252,21 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s
       1,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server ri (
@@ -3241,22 +3277,31 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s
       );
       ACE_CHECK;
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
           
           _tao_call.prepare_header (
@@ -3280,71 +3325,68 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
               
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
+          
           
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_server (
@@ -3379,17 +3421,21 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s
       1,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server ri (
@@ -3401,22 +3447,31 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s
       );
       ACE_CHECK;
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
           
           _tao_call.prepare_header (
@@ -3441,71 +3496,68 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
               
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
+          
           
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister_server (
@@ -3534,17 +3586,21 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
       1,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server ri (
@@ -3556,22 +3612,31 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
       );
       ACE_CHECK;
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
           
           _tao_call.prepare_header (
@@ -3596,71 +3661,68 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
               
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
+          
           
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_server (
@@ -3694,17 +3756,21 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser
       1,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server ri (
@@ -3715,22 +3781,31 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser
       );
       ACE_CHECK;
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
           
           _tao_call.prepare_header (
@@ -3754,71 +3829,68 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
               
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
+          
           
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_server (
@@ -3852,17 +3924,21 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s
       1,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server ri (
@@ -3873,22 +3949,31 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s
       );
       ACE_CHECK;
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
           
           _tao_call.prepare_header (
@@ -3912,71 +3997,68 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
               
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
+          
           
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_running (
@@ -4012,17 +4094,21 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
       1,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running ri (
@@ -4035,22 +4121,31 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
       );
       ACE_CHECK_RETURN (0);
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+          
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+#endif /* TAO_HAS_INTERCEPTORS */
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
           
           _tao_call.prepare_header (
@@ -4077,11 +4172,24 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
               
             }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
           
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
@@ -4095,71 +4203,52 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
               
             }
           
-          TAO_INTERCEPTOR (
-              char * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          char * _tao_retval_info = _tao_safe_retval._retn ();
+          ri.result (_tao_retval_info);
+          _tao_safe_retval = _tao_retval_info;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN (0);
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
+return _tao_safe_retval._retn ();
 }
 
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_shutting_down (
@@ -4193,17 +4282,21 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_
       1,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down ri (
@@ -4214,22 +4307,31 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_
       );
       ACE_CHECK;
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
           
           _tao_call.prepare_header (
@@ -4253,71 +4355,68 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
               
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
+          
           
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
@@ -4353,17 +4452,21 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
       1,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_find ri (
@@ -4374,22 +4477,31 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
       );
       ACE_CHECK;
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
           
           _tao_call.prepare_header (
@@ -4413,10 +4525,23 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
               
             }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
           
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
@@ -4429,65 +4554,49 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
               
             }
           
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
@@ -4518,17 +4627,21 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
       1,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_list ri (
@@ -4540,22 +4653,31 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
       );
       ACE_CHECK;
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
           
           _tao_call.prepare_header (
@@ -4579,10 +4701,23 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
               
             }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
           
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
@@ -4596,65 +4731,49 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
               
             }
           
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 
@@ -5599,7 +5718,7 @@ ImplementationRepository::ServerInformationIterator_var::upcast (void *src)
   return *tmp;
 }
 // *************************************************************
-// Inline operations for class ImplementationRepository::ServerInformationIterator_out
+// Operations for class ImplementationRepository::ServerInformationIterator_out
 // *************************************************************
 
 ImplementationRepository::ServerInformationIterator_out::ServerInformationIterator_out (ServerInformationIterator_ptr &p)
@@ -5671,19 +5790,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -5718,11 +5837,13 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_how_many = parameter_list->length ();
-  parameter_list->length (length_how_many + 1);
-  (*parameter_list)[length_how_many].argument <<= how_many_;
-  (*parameter_list)[length_how_many].mode = Dynamic::PARAM_IN;
+  
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= how_many_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
   
   return safe_parameter_list._retn ();
 }
@@ -5774,19 +5895,19 @@ public:
     );
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -5885,17 +6006,21 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
       1,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n ri (
@@ -5906,22 +6031,31 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
       );
       ACE_CHECK_RETURN  (_tao_retval);
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
           
           _tao_call.prepare_header (
@@ -5946,11 +6080,24 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 _tao_retval
               );
               
             }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
           
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
@@ -5965,70 +6112,51 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
               
             }
           
-          TAO_INTERCEPTOR (
-              CORBA::Boolean  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          CORBA::Boolean _tao_retval_info = _tao_retval;
+          ri.result (_tao_retval_info);
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_retval;
+      }
+    ACE_ENDTRY;
+    ACE_CHECK_RETURN  (_tao_retval);
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK_RETURN  (_tao_retval);
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
+return _tao_retval;
 }
 
 void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl::destroy (
@@ -6055,17 +6183,21 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl:
       0,
       istub->orb_core ()
     );
-
+  
+  int _invoke_status;
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
     );
   
 #endif  /* TAO_HAS_INTERCEPTORS */
   
   for (;;)
     {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ri (
@@ -6075,22 +6207,31 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl:
       );
       ACE_CHECK;
       
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
       ACE_TRY
         {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
+          _tao_vfr.send_request (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
           
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
           
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
+#endif /* TAO_HAS_INTERCEPTORS */
+          
+          _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
           
           _tao_call.prepare_header (
@@ -6098,6 +6239,7 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl:
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
+          
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
@@ -6105,71 +6247,68 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl:
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+                CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
               
             }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri,
                   ACE_TRY_ENV
                 );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
+                ACE_TRY_CHECK;
+              )
+              
+              continue;
+            }
+          
           
 #if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
           
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
+          ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
             &ri,
             ACE_TRY_ENV
           );
           ACE_TRY_CHECK;
+        
+      }
+    ACE_CATCHANY
+      {
+        ri.exception (&ACE_ANY_EXCEPTION);
+        _tao_vfr.receive_exception (
+          &ri,
+          ACE_TRY_ENV
+        );
+        ACE_TRY_CHECK;
+        
+        PortableInterceptor::ReplyStatus _tao_status =
+          ri.reply_status (ACE_TRY_ENV);
+        ACE_TRY_CHECK;
+        
+        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+            || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+    
+    PortableInterceptor::ReplyStatus _tao_status =
+      ri.reply_status (ACE_TRY_ENV);
+    ACE_CHECK;
+    
+    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+      continue;
+    
+#endif  /* TAO_HAS_INTERCEPTORS */
+    
+    break;
+  }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  
 }
 
 
diff --git a/TAO/tao/PortableServer/ImplRepoC.h b/TAO/tao/PortableServer/ImplRepoC.h
index 8c3c2514cef..fe51203c4af 100644
--- a/TAO/tao/PortableServer/ImplRepoC.h
+++ b/TAO/tao/PortableServer/ImplRepoC.h
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_ORIG_IMPLREPOC_H_
-#define _TAO_IDL_ORIG_IMPLREPOC_H_
+#ifndef _TAO_IDL_IMPLREPOC_H_
+#define _TAO_IDL_IMPLREPOC_H_
 
 #include "ace/pre.h"
 #include "tao/corbafwd.h"
@@ -32,7 +32,6 @@
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Object.h"
-#include "tao/ClientRequestInfo.h"
 #include "tao/Remote_Object_Proxy_Impl.h"
 #include "tao/Managed_Types.h"
 #include "tao/Sequence.h"
@@ -69,7 +68,7 @@ TAO_NAMESPACE  ImplementationRepository
 
   class ServerObject;
   typedef ServerObject *ServerObject_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -80,31 +79,34 @@ TAO_NAMESPACE  ImplementationRepository
   {
   public:
     ServerObject_var (void); // default constructor
-    ServerObject_var (ServerObject_ptr p) : ptr_ (p) {} 
+    ServerObject_var (ServerObject_ptr p) : ptr_ (p) {}
     ServerObject_var (const ServerObject_var &); // copy constructor
     ~ServerObject_var (void); // destructor
-    
+
     ServerObject_var &operator= (ServerObject_ptr);
     ServerObject_var &operator= (const ServerObject_var &);
     ServerObject_ptr operator-> (void) const;
-    
+
     operator const ServerObject_ptr &() const;
     operator ServerObject_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     ServerObject_ptr in (void) const;
     ServerObject_ptr &inout (void);
     ServerObject_ptr &out (void);
     ServerObject_ptr _retn (void);
     ServerObject_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ServerObject_ptr duplicate (ServerObject_ptr);
     static void release (ServerObject_ptr);
     static ServerObject_ptr nil (void);
-    static ServerObject_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static ServerObject_ptr narrow (
+        CORBA::Object *,
+        CORBA::Environment &
+      );
     static CORBA::Object * upcast (void *);
-  
+
   private:
     ServerObject_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -131,7 +133,7 @@ TAO_NAMESPACE  ImplementationRepository
     operator ServerObject_ptr &();
     ServerObject_ptr &ptr (void);
     ServerObject_ptr operator-> (void);
-  
+
   private:
     ServerObject_ptr &ptr_;
   };
@@ -143,13 +145,14 @@ TAO_NAMESPACE  ImplementationRepository
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_
 
-// Forward Classes Declaration
+  // Forward Classes Declaration
   class _TAO_ServerObject_Proxy_Impl;
   class _TAO_ServerObject_Remote_Proxy_Impl;
   class _TAO_ServerObject_Proxy_Broker;
   class _TAO_ServerObject_Remote_Proxy_Broker;
-  
-  class TAO_PortableServer_Export ServerObject : public virtual CORBA_Object
+
+  class TAO_PortableServer_Export ServerObject
+    : public virtual CORBA_Object
   {
   public:
   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -159,16 +162,19 @@ TAO_NAMESPACE  ImplementationRepository
 
     // the static operations
     static ServerObject_ptr _duplicate (ServerObject_ptr obj);
+
     static ServerObject_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
+
     static ServerObject_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
+
     static ServerObject_ptr _nil (void)
       {
         return (ServerObject_ptr)0;
@@ -177,7 +183,7 @@ TAO_NAMESPACE  ImplementationRepository
     static void _tao_any_destructor (void*);
 
     virtual void ping (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -185,7 +191,7 @@ TAO_NAMESPACE  ImplementationRepository
       ));
 
     virtual void shutdown (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -193,57 +199,57 @@ TAO_NAMESPACE  ImplementationRepository
       ));
 
     virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &ACE_TRY_ENV = 
+        const CORBA::Char *type_id,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   private:
     _TAO_ServerObject_Proxy_Broker *the_TAO_ServerObject_Proxy_Broker_;
-    
+
   protected:
     ServerObject (int collocated = 0);
-    
-    protected:
-      // This methods travese the inheritance tree and set the
-      // parents piece of the given class in the right mode
-      virtual void ImplementationRepository_ServerObject_setup_collocation (int collocated);
-      
-      ServerObject (
-        TAO_Stub *objref, 
+
+    // This methods travese the inheritance tree and set the
+    // parents piece of the given class in the right mode
+    virtual void ImplementationRepository_ServerObject_setup_collocation (int collocated);
+
+    ServerObject (
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
-        );
-      
-      friend class _TAO_ServerObject_Remote_Proxy_Impl;
-      friend class _TAO_ServerObject_ThruPOA_Proxy_Impl;
-      friend class _TAO_ServerObject_Direct_Proxy_Impl;
-    
+      );
+
+    friend class _TAO_ServerObject_Remote_Proxy_Impl;
+    friend class _TAO_ServerObject_ThruPOA_Proxy_Impl;
+    friend class _TAO_ServerObject_Direct_Proxy_Impl;
+
     virtual ~ServerObject (void);
+
   private:
     ServerObject (const ServerObject &);
     void operator= (const ServerObject &);
   };
 
-  
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
+  // The Proxy Implementations are used by each interface to
+  // perform a call. Each different implementation encapsulate
+  // an invocation logics.
 
 
   ///////////////////////////////////////////////////////////////////////
-  //                    Base  Impl. Declaration
+  //                    Base Proxy Impl. Declaration
   //
-  
-  class TAO_PortableServer_Export _TAO_ServerObject_Proxy_Impl : public virtual TAO_Object_Proxy_Impl
+
+  class TAO_PortableServer_Export _TAO_ServerObject_Proxy_Impl
+    : public virtual TAO_Object_Proxy_Impl
   {
   public:
     virtual ~_TAO_ServerObject_Proxy_Impl (void) { }
-    
-        virtual void ping (
+    virtual void ping (
         CORBA_Object *_collocated_tao_target_,
         CORBA::Environment &ACE_TRY_ENV
       )
@@ -259,265 +265,277 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
       )) = 0;
 
-protected:
+
+  protected:
     _TAO_ServerObject_Proxy_Impl (void);
-  
   };
+
   //
-  //                Base  Proxy Impl. Declaration
+  //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
 
-class TAO_PortableServer_Export _TAO_ServerObject_Remote_Proxy_Impl : 
-  public virtual _TAO_ServerObject_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl
-{
-public:
-  _TAO_ServerObject_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_ServerObject_Remote_Proxy_Impl (void) { }
-  
+
+  ///////////////////////////////////////////////////////////////////////
+  //                Remote Proxy Impl. Declaration
+  //
+
+  class TAO_PortableServer_Export _TAO_ServerObject_Remote_Proxy_Impl
+    : public virtual _TAO_ServerObject_Proxy_Impl,
+      public virtual TAO_Remote_Object_Proxy_Impl
+  {
+  public:
+    _TAO_ServerObject_Remote_Proxy_Impl (void);
+
+    virtual ~_TAO_ServerObject_Remote_Proxy_Impl (void) { }
     virtual void ping (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void shutdown (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-};
+        CORBA_Object *_collocated_tao_target_,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
 
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
+    virtual void shutdown (
+        CORBA_Object *_collocated_tao_target_,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
 
 
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
+  };
 
+  //
+  //             End Remote Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
 
+  // The Proxy Brokers are used by each interface to get
+  // the right proxy for performing a call. In the new
+  // collocation scheme, the proxy to be used can vary on
+  // a call by call basis.
 
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
 
-class TAO_PortableServer_Export _TAO_ServerObject_Proxy_Broker
-{
-public:
-  virtual ~_TAO_ServerObject_Proxy_Broker (void);
-  virtual _TAO_ServerObject_Proxy_Impl &select_proxy (
-    ServerObject *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
-
-protected:
-  _TAO_ServerObject_Proxy_Broker (void);
-  
-};
+  ///////////////////////////////////////////////////////////////////////
+  //                 Base Proxy Broker Declaration
+  //
 
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+    class TAO_PortableServer_Export _TAO_ServerObject_Proxy_Broker
+  {
+  public:
+    virtual ~_TAO_ServerObject_Proxy_Broker (void);
+    virtual _TAO_ServerObject_Proxy_Impl &select_proxy (
+        ServerObject *object,
+        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+      ) = 0;
 
+  protected:
+    _TAO_ServerObject_Proxy_Broker (void);
 
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
+  };
 
-class TAO_PortableServer_Export _TAO_ServerObject_Remote_Proxy_Broker : public virtual _TAO_ServerObject_Proxy_Broker
-{
-public: 
-  _TAO_ServerObject_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_ServerObject_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_ServerObject_Proxy_Impl &select_proxy (
-    ServerObject *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
-
-private:
-  _TAO_ServerObject_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
-
-public:
-  static _TAO_ServerObject_Remote_Proxy_Broker *the_TAO_ServerObject_Remote_Proxy_Broker (void);
-};
+  //
+  //              End Base Proxy Broker Declaration
+  ///////////////////////////////////////////////////////////////////////
 
 
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////////
+  //                 Remote Proxy Broker Declaration
+  //
+
+  class TAO_PortableServer_Export _TAO_ServerObject_Remote_Proxy_Broker
+    : public virtual _TAO_ServerObject_Proxy_Broker
+  {
+  public:
+    _TAO_ServerObject_Remote_Proxy_Broker (void);
+
+    virtual ~_TAO_ServerObject_Remote_Proxy_Broker (void);
+
+    virtual _TAO_ServerObject_Proxy_Impl &select_proxy (
+        ServerObject *object,
+        CORBA_Environment &ACE_TRY_ENV
+      );
+
+    private:
+      _TAO_ServerObject_Remote_Proxy_Impl remote_proxy_impl_;
+
+    public:
+      // This member function is used to get an handle to the unique instance
+      // of the Remote Proxy Broker that is available for a given
+      // interface.
+      static _TAO_ServerObject_Remote_Proxy_Broker *the_TAO_ServerObject_Remote_Proxy_Broker (void);
+    };
+
+    //
+    //              End Remote Proxy Broker Declaration
+    ///////////////////////////////////////////////////////////////////////
 
 
 #endif /* end #if !defined */
 
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerObject;
+    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerObject;
 
-struct EnvironmentVariable;
-class EnvironmentVariable_var;
+    struct EnvironmentVariable;
+    class EnvironmentVariable_var;
 
-struct TAO_PortableServer_Export EnvironmentVariable
-{
+    struct TAO_PortableServer_Export EnvironmentVariable
+    {
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef EnvironmentVariable_var _var_type;
+      typedef EnvironmentVariable_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-  static void _tao_any_destructor (void*);
+      static void _tao_any_destructor (void*);
 
-  TAO_String_Manager name;
-  TAO_String_Manager value;
-};
+      TAO_String_Manager name;
+      TAO_String_Manager value;
 
-class TAO_PortableServer_Export EnvironmentVariable_var
-{
-public:
-  EnvironmentVariable_var (void); // default constructor
-  EnvironmentVariable_var (EnvironmentVariable *);
-  EnvironmentVariable_var (const EnvironmentVariable_var &); // copy constructor
-  ~EnvironmentVariable_var (void); // destructor
-  
-  EnvironmentVariable_var &operator= (EnvironmentVariable *);
-  EnvironmentVariable_var &operator= (const EnvironmentVariable_var &);
-  EnvironmentVariable *operator-> (void);
-  const EnvironmentVariable *operator-> (void) const;
-  
-  operator const EnvironmentVariable &() const;
-  operator EnvironmentVariable &();
-  operator EnvironmentVariable &() const;
-  operator EnvironmentVariable *&(); // variable-size types only
-  
-  // in, inout, out, _retn 
-  const EnvironmentVariable &in (void) const;
-  EnvironmentVariable &inout (void);
-  EnvironmentVariable *&out (void);
-  EnvironmentVariable *_retn (void);
-  EnvironmentVariable *ptr (void) const;
-
-private:
-  EnvironmentVariable *ptr_;
-};
-
-class TAO_PortableServer_Export EnvironmentVariable_out
-{
-public:
-  EnvironmentVariable_out (EnvironmentVariable *&);
-  EnvironmentVariable_out (EnvironmentVariable_var &);
-  EnvironmentVariable_out (const EnvironmentVariable_out &);
-  EnvironmentVariable_out &operator= (const EnvironmentVariable_out &);
-  EnvironmentVariable_out &operator= (EnvironmentVariable *);
-  operator EnvironmentVariable *&();
-  EnvironmentVariable *&ptr (void);
-  EnvironmentVariable *operator-> (void);
-  
-private:
-  EnvironmentVariable *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const EnvironmentVariable_var &);
-};
-
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EnvironmentVariable;
-
-typedef char * Address;
-typedef CORBA::String_var Address_var;
-typedef CORBA::String_out Address_out;
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Address;
+    };
+
+    class TAO_PortableServer_Export EnvironmentVariable_var
+    {
+    public:
+      EnvironmentVariable_var (void);
+      EnvironmentVariable_var (EnvironmentVariable *);
+      EnvironmentVariable_var (const EnvironmentVariable_var &);
+      ~EnvironmentVariable_var (void);
+
+      EnvironmentVariable_var &operator= (EnvironmentVariable *);
+      EnvironmentVariable_var &operator= (const EnvironmentVariable_var &);
+      EnvironmentVariable *operator-> (void);
+      const EnvironmentVariable *operator-> (void) const;
+
+      operator const EnvironmentVariable &() const;
+      operator EnvironmentVariable &();
+      operator EnvironmentVariable &() const;
+      // Variable-size types only.
+      operator EnvironmentVariable *&();
+
+      // in, inout, out, _retn
+      const EnvironmentVariable &in (void) const;
+      EnvironmentVariable &inout (void);
+      EnvironmentVariable *&out (void);
+      EnvironmentVariable *_retn (void);
+      EnvironmentVariable *ptr (void) const;
+
+    private:
+      EnvironmentVariable *ptr_;
+    };
+
+    class TAO_PortableServer_Export EnvironmentVariable_out
+    {
+    public:
+      EnvironmentVariable_out (EnvironmentVariable *&);
+      EnvironmentVariable_out (EnvironmentVariable_var &);
+      EnvironmentVariable_out (const EnvironmentVariable_out &);
+      EnvironmentVariable_out &operator= (const EnvironmentVariable_out &);
+      EnvironmentVariable_out &operator= (EnvironmentVariable *);
+      operator EnvironmentVariable *&();
+      EnvironmentVariable *&ptr (void);
+      EnvironmentVariable *operator-> (void);
+
+    private:
+      EnvironmentVariable *&ptr_;
+      // Assignment from T_var not allowed.
+      void operator= (const EnvironmentVariable_var &);
+    };
+
+    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EnvironmentVariable;
+
+    typedef char * Address;
+    typedef CORBA::String_var Address_var;
+    typedef CORBA::String_out Address_out;
+    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Address;
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_
 
-  class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    // = Initialization and termination methods.
-    
-    _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void); // Default constructor.
-    _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum,
-      CORBA::ULong length,
-      EnvironmentVariable *data,
-      CORBA::Boolean release = 0);
-    _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (const _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &rhs);
-    _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &operator= (const _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &rhs);
-    virtual ~_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void); // Dtor.
-    // = Accessors.
-    EnvironmentVariable &operator[] (CORBA::ULong i);
-    const EnvironmentVariable &operator[] (CORBA::ULong i) const;
-    // = Static operations.
-    static EnvironmentVariable *allocbuf (CORBA::ULong size);
-    static void freebuf (EnvironmentVariable *buffer);
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    
-    EnvironmentVariable *get_buffer (CORBA::Boolean orphan = 0);
-    const EnvironmentVariable *get_buffer (void) const;
-    void replace (CORBA::ULong max,
-      CORBA::ULong length,
-      EnvironmentVariable *data,
-      CORBA::Boolean release);
-  };
+    class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
+      : public TAO_Unbounded_Base_Sequence
+    {
+    public:
+      // = Initialization and termination methods.
+      _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void);
+      _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum);
+      _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (
+          CORBA::ULong maximum,
+          CORBA::ULong length,
+          EnvironmentVariable *data,
+          CORBA::Boolean release = 0
+        );
+      _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (
+          const _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &rhs
+        );
+      _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &operator= (
+          const _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &rhs
+        );
+      virtual ~_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void);
+
+      // = Accessors.
+      EnvironmentVariable &operator[] (CORBA::ULong i);
+      const EnvironmentVariable &operator[] (CORBA::ULong i) const;
+
+      // = Static operations.
+      static EnvironmentVariable *allocbuf (CORBA::ULong size);
+      static void freebuf (EnvironmentVariable *buffer);
+
+      // Implement the TAO_Base_Sequence methods (see Sequence.h)
+      virtual void _allocate_buffer (CORBA::ULong length);
+      virtual void _deallocate_buffer (void);
+      EnvironmentVariable *get_buffer (CORBA::Boolean orphan = 0);
+      const EnvironmentVariable *get_buffer (void) const;
+      void replace (
+          CORBA::ULong max,
+          CORBA::ULong length,
+          EnvironmentVariable *data,
+          CORBA::Boolean release
+        );
+    };
 
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_
 
-class EnvironmentList;
-class EnvironmentList_var;
+    class EnvironmentList;
+    class EnvironmentList_var;
 
-// *************************************************************
-// EnvironmentList
-// *************************************************************
+    // *************************************************************
+    // EnvironmentList
+    // *************************************************************
 
-class TAO_PortableServer_Export EnvironmentList : public 
+    class TAO_PortableServer_Export EnvironmentList : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
+    _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<EnvironmentVariable>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-{
-public:
-  EnvironmentList (void); // default ctor
-  EnvironmentList (CORBA::ULong max); // uses max size
-  EnvironmentList (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    EnvironmentVariable *buffer, 
-    CORBA::Boolean release = 0
-  );
-  EnvironmentList (const EnvironmentList &); // copy ctor
-  ~EnvironmentList (void);
-  static void _tao_any_destructor (void*);
+    TAO_Unbounded_Sequence<EnvironmentVariable>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+    {
+    public:
+      EnvironmentList (void); // default ctor
+      EnvironmentList (CORBA::ULong max); // uses max size
+      EnvironmentList (
+          CORBA::ULong max,
+          CORBA::ULong length,
+          EnvironmentVariable *buffer,
+          CORBA::Boolean release = 0
+        );
+      EnvironmentList (const EnvironmentList &); // copy ctor
+      ~EnvironmentList (void);
+      static void _tao_any_destructor (void*);
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef EnvironmentList_var _var_type;
+      typedef EnvironmentList_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-};
+
+    };
 
 #endif /* end #if !defined */
 
@@ -525,41 +543,41 @@ public:
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST___VAR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST___VAR_CH_
 
-// *************************************************************
-// class ImplementationRepository::EnvironmentList_var
-// *************************************************************
+    // *************************************************************
+    // class ImplementationRepository::EnvironmentList_var
+    // *************************************************************
 
-class TAO_PortableServer_Export EnvironmentList_var
-{
-public:
-  EnvironmentList_var (void); // default constructor
-  EnvironmentList_var (EnvironmentList *);
-  EnvironmentList_var (const EnvironmentList_var &); // copy constructor
-  ~EnvironmentList_var (void); // destructor
-  
-  EnvironmentList_var &operator= (EnvironmentList *);
-  EnvironmentList_var &operator= (const EnvironmentList_var &);
-  EnvironmentList *operator-> (void);
-  const EnvironmentList *operator-> (void) const;
-  
-  operator const EnvironmentList &() const;
-  operator EnvironmentList &();
-  operator EnvironmentList &() const;
-  operator EnvironmentList *&(); // variable-size base types only
-  
-  EnvironmentVariable & operator[] (CORBA::ULong index);
-  const EnvironmentVariable & operator[] (CORBA::ULong index) const;
-  
-  // in, inout, out, _retn 
-  const EnvironmentList &in (void) const;
-  EnvironmentList &inout (void);
-  EnvironmentList *&out (void);
-  EnvironmentList *_retn (void);
-  EnvironmentList *ptr (void) const;
-
-private:
-  EnvironmentList *ptr_;
-};
+    class TAO_PortableServer_Export EnvironmentList_var
+    {
+    public:
+      EnvironmentList_var (void);
+      EnvironmentList_var (EnvironmentList *);
+      EnvironmentList_var (const EnvironmentList_var &);
+      ~EnvironmentList_var (void);
+
+      EnvironmentList_var &operator= (EnvironmentList *);
+      EnvironmentList_var &operator= (const EnvironmentList_var &);
+      EnvironmentList *operator-> (void);
+      const EnvironmentList *operator-> (void) const;
+
+      operator const EnvironmentList &() const;
+      operator EnvironmentList &();
+      operator EnvironmentList &() const;
+      operator EnvironmentList *&(); // variable-size base types only
+
+      EnvironmentVariable & operator[] (CORBA::ULong index);
+      const EnvironmentVariable & operator[] (CORBA::ULong index) const;
+
+      // in, inout, out, _retn
+      const EnvironmentList &in (void) const;
+      EnvironmentList &inout (void);
+      EnvironmentList *&out (void);
+      EnvironmentList *_retn (void);
+      EnvironmentList *ptr (void) const;
+
+    private:
+      EnvironmentList *ptr_;
+    };
 
 
 #endif /* end #if !defined */
@@ -568,252 +586,268 @@ private:
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST___OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST___OUT_CH_
 
-class TAO_PortableServer_Export EnvironmentList_out
-{
-public:
-  EnvironmentList_out (EnvironmentList *&);
-  EnvironmentList_out (EnvironmentList_var &);
-  EnvironmentList_out (const EnvironmentList_out &);
-  EnvironmentList_out &operator= (const EnvironmentList_out &);
-  EnvironmentList_out &operator= (EnvironmentList *);
-  operator EnvironmentList *&();
-  EnvironmentList *&ptr (void);
-  EnvironmentList *operator-> (void);
-  EnvironmentVariable & operator[] (CORBA::ULong index);
-  
-private:
-  EnvironmentList *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const EnvironmentList_var &);
-};
+    class TAO_PortableServer_Export EnvironmentList_out
+    {
+    public:
+      EnvironmentList_out (EnvironmentList *&);
+      EnvironmentList_out (EnvironmentList_var &);
+      EnvironmentList_out (const EnvironmentList_out &);
+      EnvironmentList_out &operator= (const EnvironmentList_out &);
+      EnvironmentList_out &operator= (EnvironmentList *);
+      operator EnvironmentList *&();
+      EnvironmentList *&ptr (void);
+      EnvironmentList *operator-> (void);
+      EnvironmentVariable & operator[] (CORBA::ULong index);
+
+    private:
+      EnvironmentList *&ptr_;
+      // Assignment from T_var not allowed.
+      void operator= (const EnvironmentList_var &);
+    };
 
 
 #endif /* end #if !defined */
 
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EnvironmentList;
+    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EnvironmentList;
 
-enum ActivationMode
-{
-    NORMAL,
-    MANUAL,
-    PER_CLIENT,
-    AUTO_START  
-};
-typedef ActivationMode &ActivationMode_out;
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ActivationMode;
-
-struct StartupOptions;
-class StartupOptions_var;
-
-struct TAO_PortableServer_Export StartupOptions
-{
+    enum ActivationMode
+    {
+      NORMAL,
+      MANUAL,
+      PER_CLIENT,
+      AUTO_START
+    };
+
+    typedef ActivationMode &ActivationMode_out;
+    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ActivationMode;
+
+    struct StartupOptions;
+    class StartupOptions_var;
+
+    struct TAO_PortableServer_Export StartupOptions
+    {
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef StartupOptions_var _var_type;
+      typedef StartupOptions_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-  static void _tao_any_destructor (void*);
+      static void _tao_any_destructor (void*);
 
-  TAO_String_Manager command_line;
-  ACE_NESTED_CLASS (ImplementationRepository, EnvironmentList) environment;
-  TAO_String_Manager working_directory;
-  ACE_NESTED_CLASS (ImplementationRepository, ActivationMode) activation;
-};
+      TAO_String_Manager command_line;
+      ACE_NESTED_CLASS (ImplementationRepository, EnvironmentList) environment;
+      TAO_String_Manager working_directory;
+      ACE_NESTED_CLASS (ImplementationRepository, ActivationMode) activation;
 
-class TAO_PortableServer_Export StartupOptions_var
-{
-public:
-  StartupOptions_var (void); // default constructor
-  StartupOptions_var (StartupOptions *);
-  StartupOptions_var (const StartupOptions_var &); // copy constructor
-  ~StartupOptions_var (void); // destructor
-  
-  StartupOptions_var &operator= (StartupOptions *);
-  StartupOptions_var &operator= (const StartupOptions_var &);
-  StartupOptions *operator-> (void);
-  const StartupOptions *operator-> (void) const;
-  
-  operator const StartupOptions &() const;
-  operator StartupOptions &();
-  operator StartupOptions &() const;
-  operator StartupOptions *&(); // variable-size types only
-  
-  // in, inout, out, _retn 
-  const StartupOptions &in (void) const;
-  StartupOptions &inout (void);
-  StartupOptions *&out (void);
-  StartupOptions *_retn (void);
-  StartupOptions *ptr (void) const;
-
-private:
-  StartupOptions *ptr_;
-};
-
-class TAO_PortableServer_Export StartupOptions_out
-{
-public:
-  StartupOptions_out (StartupOptions *&);
-  StartupOptions_out (StartupOptions_var &);
-  StartupOptions_out (const StartupOptions_out &);
-  StartupOptions_out &operator= (const StartupOptions_out &);
-  StartupOptions_out &operator= (StartupOptions *);
-  operator StartupOptions *&();
-  StartupOptions *&ptr (void);
-  StartupOptions *operator-> (void);
-  
-private:
-  StartupOptions *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const StartupOptions_var &);
-};
-
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_StartupOptions;
-
-struct ServerInformation;
-class ServerInformation_var;
-
-struct TAO_PortableServer_Export ServerInformation
-{
+    };
+
+    class TAO_PortableServer_Export StartupOptions_var
+    {
+    public:
+      StartupOptions_var (void);
+      StartupOptions_var (StartupOptions *);
+      StartupOptions_var (const StartupOptions_var &);
+      ~StartupOptions_var (void);
+
+      StartupOptions_var &operator= (StartupOptions *);
+      StartupOptions_var &operator= (const StartupOptions_var &);
+      StartupOptions *operator-> (void);
+      const StartupOptions *operator-> (void) const;
+
+      operator const StartupOptions &() const;
+      operator StartupOptions &();
+      operator StartupOptions &() const;
+      // Variable-size types only.
+      operator StartupOptions *&();
+
+      // in, inout, out, _retn
+      const StartupOptions &in (void) const;
+      StartupOptions &inout (void);
+      StartupOptions *&out (void);
+      StartupOptions *_retn (void);
+      StartupOptions *ptr (void) const;
+
+    private:
+      StartupOptions *ptr_;
+    };
+
+    class TAO_PortableServer_Export StartupOptions_out
+    {
+    public:
+      StartupOptions_out (StartupOptions *&);
+      StartupOptions_out (StartupOptions_var &);
+      StartupOptions_out (const StartupOptions_out &);
+      StartupOptions_out &operator= (const StartupOptions_out &);
+      StartupOptions_out &operator= (StartupOptions *);
+      operator StartupOptions *&();
+      StartupOptions *&ptr (void);
+      StartupOptions *operator-> (void);
+
+    private:
+      StartupOptions *&ptr_;
+      // Assignment from T_var not allowed.
+      void operator= (const StartupOptions_var &);
+    };
+
+    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_StartupOptions;
+
+    struct ServerInformation;
+    class ServerInformation_var;
+
+    struct TAO_PortableServer_Export ServerInformation
+    {
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef ServerInformation_var _var_type;
+      typedef ServerInformation_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-  static void _tao_any_destructor (void*);
+      static void _tao_any_destructor (void*);
 
-  TAO_String_Manager logical_server;
-  TAO_String_Manager server;
-  ACE_NESTED_CLASS (ImplementationRepository, StartupOptions) startup;
-  TAO_String_Manager location;
-};
+      TAO_String_Manager logical_server;
+      TAO_String_Manager server;
+      ACE_NESTED_CLASS (ImplementationRepository, StartupOptions) startup;
+      TAO_String_Manager location;
 
-class TAO_PortableServer_Export ServerInformation_var
-{
-public:
-  ServerInformation_var (void); // default constructor
-  ServerInformation_var (ServerInformation *);
-  ServerInformation_var (const ServerInformation_var &); // copy constructor
-  ~ServerInformation_var (void); // destructor
-  
-  ServerInformation_var &operator= (ServerInformation *);
-  ServerInformation_var &operator= (const ServerInformation_var &);
-  ServerInformation *operator-> (void);
-  const ServerInformation *operator-> (void) const;
-  
-  operator const ServerInformation &() const;
-  operator ServerInformation &();
-  operator ServerInformation &() const;
-  operator ServerInformation *&(); // variable-size types only
-  
-  // in, inout, out, _retn 
-  const ServerInformation &in (void) const;
-  ServerInformation &inout (void);
-  ServerInformation *&out (void);
-  ServerInformation *_retn (void);
-  ServerInformation *ptr (void) const;
-
-private:
-  ServerInformation *ptr_;
-};
-
-class TAO_PortableServer_Export ServerInformation_out
-{
-public:
-  ServerInformation_out (ServerInformation *&);
-  ServerInformation_out (ServerInformation_var &);
-  ServerInformation_out (const ServerInformation_out &);
-  ServerInformation_out &operator= (const ServerInformation_out &);
-  ServerInformation_out &operator= (ServerInformation *);
-  operator ServerInformation *&();
-  ServerInformation *&ptr (void);
-  ServerInformation *operator-> (void);
-  
-private:
-  ServerInformation *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const ServerInformation_var &);
-};
-
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformation;
+    };
+
+    class TAO_PortableServer_Export ServerInformation_var
+    {
+    public:
+      ServerInformation_var (void);
+      ServerInformation_var (ServerInformation *);
+      ServerInformation_var (const ServerInformation_var &);
+      ~ServerInformation_var (void);
+
+      ServerInformation_var &operator= (ServerInformation *);
+      ServerInformation_var &operator= (const ServerInformation_var &);
+      ServerInformation *operator-> (void);
+      const ServerInformation *operator-> (void) const;
+
+      operator const ServerInformation &() const;
+      operator ServerInformation &();
+      operator ServerInformation &() const;
+      // Variable-size types only.
+      operator ServerInformation *&();
+
+      // in, inout, out, _retn
+      const ServerInformation &in (void) const;
+      ServerInformation &inout (void);
+      ServerInformation *&out (void);
+      ServerInformation *_retn (void);
+      ServerInformation *ptr (void) const;
+
+    private:
+      ServerInformation *ptr_;
+    };
+
+    class TAO_PortableServer_Export ServerInformation_out
+    {
+    public:
+      ServerInformation_out (ServerInformation *&);
+      ServerInformation_out (ServerInformation_var &);
+      ServerInformation_out (const ServerInformation_out &);
+      ServerInformation_out &operator= (const ServerInformation_out &);
+      ServerInformation_out &operator= (ServerInformation *);
+      operator ServerInformation *&();
+      ServerInformation *&ptr (void);
+      ServerInformation *operator-> (void);
+
+    private:
+      ServerInformation *&ptr_;
+      // Assignment from T_var not allowed.
+      void operator= (const ServerInformation_var &);
+    };
+
+    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformation;
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_
 
-  class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    // = Initialization and termination methods.
-    
-    _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void); // Default constructor.
-    _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum,
-      CORBA::ULong length,
-      ServerInformation *data,
-      CORBA::Boolean release = 0);
-    _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (const _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &rhs);
-    _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &operator= (const _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &rhs);
-    virtual ~_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void); // Dtor.
-    // = Accessors.
-    ServerInformation &operator[] (CORBA::ULong i);
-    const ServerInformation &operator[] (CORBA::ULong i) const;
-    // = Static operations.
-    static ServerInformation *allocbuf (CORBA::ULong size);
-    static void freebuf (ServerInformation *buffer);
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    
-    ServerInformation *get_buffer (CORBA::Boolean orphan = 0);
-    const ServerInformation *get_buffer (void) const;
-    void replace (CORBA::ULong max,
-      CORBA::ULong length,
-      ServerInformation *data,
-      CORBA::Boolean release);
-  };
+    class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
+      : public TAO_Unbounded_Base_Sequence
+    {
+    public:
+      // = Initialization and termination methods.
+      _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void);
+      _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum);
+      _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (
+          CORBA::ULong maximum,
+          CORBA::ULong length,
+          ServerInformation *data,
+          CORBA::Boolean release = 0
+        );
+      _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (
+          const _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &rhs
+        );
+      _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &operator= (
+          const _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &rhs
+        );
+      virtual ~_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void);
+
+      // = Accessors.
+      ServerInformation &operator[] (CORBA::ULong i);
+      const ServerInformation &operator[] (CORBA::ULong i) const;
+
+      // = Static operations.
+      static ServerInformation *allocbuf (CORBA::ULong size);
+      static void freebuf (ServerInformation *buffer);
+
+      // Implement the TAO_Base_Sequence methods (see Sequence.h)
+      virtual void _allocate_buffer (CORBA::ULong length);
+      virtual void _deallocate_buffer (void);
+      ServerInformation *get_buffer (CORBA::Boolean orphan = 0);
+      const ServerInformation *get_buffer (void) const;
+      void replace (
+          CORBA::ULong max,
+          CORBA::ULong length,
+          ServerInformation *data,
+          CORBA::Boolean release
+        );
+    };
 
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_
 
-class ServerInformationList;
-class ServerInformationList_var;
+    class ServerInformationList;
+    class ServerInformationList_var;
 
-// *************************************************************
-// ServerInformationList
-// *************************************************************
+    // *************************************************************
+    // ServerInformationList
+    // *************************************************************
 
-class TAO_PortableServer_Export ServerInformationList : public 
+    class TAO_PortableServer_Export ServerInformationList : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
+    _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<ServerInformation>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-{
-public:
-  ServerInformationList (void); // default ctor
-  ServerInformationList (CORBA::ULong max); // uses max size
-  ServerInformationList (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    ServerInformation *buffer, 
-    CORBA::Boolean release = 0
-  );
-  ServerInformationList (const ServerInformationList &); // copy ctor
-  ~ServerInformationList (void);
-  static void _tao_any_destructor (void*);
+    TAO_Unbounded_Sequence<ServerInformation>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+    {
+    public:
+      ServerInformationList (void); // default ctor
+      ServerInformationList (CORBA::ULong max); // uses max size
+      ServerInformationList (
+          CORBA::ULong max,
+          CORBA::ULong length,
+          ServerInformation *buffer,
+          CORBA::Boolean release = 0
+        );
+      ServerInformationList (const ServerInformationList &); // copy ctor
+      ~ServerInformationList (void);
+      static void _tao_any_destructor (void*);
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef ServerInformationList_var _var_type;
+      typedef ServerInformationList_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-};
+
+    };
 
 #endif /* end #if !defined */
 
@@ -821,41 +855,41 @@ public:
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST___VAR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST___VAR_CH_
 
-// *************************************************************
-// class ImplementationRepository::ServerInformationList_var
-// *************************************************************
+    // *************************************************************
+    // class ImplementationRepository::ServerInformationList_var
+    // *************************************************************
 
-class TAO_PortableServer_Export ServerInformationList_var
-{
-public:
-  ServerInformationList_var (void); // default constructor
-  ServerInformationList_var (ServerInformationList *);
-  ServerInformationList_var (const ServerInformationList_var &); // copy constructor
-  ~ServerInformationList_var (void); // destructor
-  
-  ServerInformationList_var &operator= (ServerInformationList *);
-  ServerInformationList_var &operator= (const ServerInformationList_var &);
-  ServerInformationList *operator-> (void);
-  const ServerInformationList *operator-> (void) const;
-  
-  operator const ServerInformationList &() const;
-  operator ServerInformationList &();
-  operator ServerInformationList &() const;
-  operator ServerInformationList *&(); // variable-size base types only
-  
-  ServerInformation & operator[] (CORBA::ULong index);
-  const ServerInformation & operator[] (CORBA::ULong index) const;
-  
-  // in, inout, out, _retn 
-  const ServerInformationList &in (void) const;
-  ServerInformationList &inout (void);
-  ServerInformationList *&out (void);
-  ServerInformationList *_retn (void);
-  ServerInformationList *ptr (void) const;
-
-private:
-  ServerInformationList *ptr_;
-};
+    class TAO_PortableServer_Export ServerInformationList_var
+    {
+    public:
+      ServerInformationList_var (void);
+      ServerInformationList_var (ServerInformationList *);
+      ServerInformationList_var (const ServerInformationList_var &);
+      ~ServerInformationList_var (void);
+
+      ServerInformationList_var &operator= (ServerInformationList *);
+      ServerInformationList_var &operator= (const ServerInformationList_var &);
+      ServerInformationList *operator-> (void);
+      const ServerInformationList *operator-> (void) const;
+
+      operator const ServerInformationList &() const;
+      operator ServerInformationList &();
+      operator ServerInformationList &() const;
+      operator ServerInformationList *&(); // variable-size base types only
+
+      ServerInformation & operator[] (CORBA::ULong index);
+      const ServerInformation & operator[] (CORBA::ULong index) const;
+
+      // in, inout, out, _retn
+      const ServerInformationList &in (void) const;
+      ServerInformationList &inout (void);
+      ServerInformationList *&out (void);
+      ServerInformationList *_retn (void);
+      ServerInformationList *ptr (void) const;
+
+    private:
+      ServerInformationList *ptr_;
+    };
 
 
 #endif /* end #if !defined */
@@ -864,36 +898,36 @@ private:
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST___OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST___OUT_CH_
 
-class TAO_PortableServer_Export ServerInformationList_out
-{
-public:
-  ServerInformationList_out (ServerInformationList *&);
-  ServerInformationList_out (ServerInformationList_var &);
-  ServerInformationList_out (const ServerInformationList_out &);
-  ServerInformationList_out &operator= (const ServerInformationList_out &);
-  ServerInformationList_out &operator= (ServerInformationList *);
-  operator ServerInformationList *&();
-  ServerInformationList *&ptr (void);
-  ServerInformationList *operator-> (void);
-  ServerInformation & operator[] (CORBA::ULong index);
-  
-private:
-  ServerInformationList *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const ServerInformationList_var &);
-};
+    class TAO_PortableServer_Export ServerInformationList_out
+    {
+    public:
+      ServerInformationList_out (ServerInformationList *&);
+      ServerInformationList_out (ServerInformationList_var &);
+      ServerInformationList_out (const ServerInformationList_out &);
+      ServerInformationList_out &operator= (const ServerInformationList_out &);
+      ServerInformationList_out &operator= (ServerInformationList *);
+      operator ServerInformationList *&();
+      ServerInformationList *&ptr (void);
+      ServerInformationList *operator-> (void);
+      ServerInformation & operator[] (CORBA::ULong index);
+
+    private:
+      ServerInformationList *&ptr_;
+      // Assignment from T_var not allowed.
+      void operator= (const ServerInformationList_var &);
+    };
 
 
 #endif /* end #if !defined */
 
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformationList;
+    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformationList;
 
-class ServerInformationIterator;
+    class ServerInformationIterator;
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___PTR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___PTR_CH_
 
-typedef ServerInformationIterator *ServerInformationIterator_ptr;
+    typedef ServerInformationIterator *ServerInformationIterator_ptr;
 
 #endif /* end #if !defined */
 
@@ -901,41 +935,44 @@ typedef ServerInformationIterator *ServerInformationIterator_ptr;
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CH_
 
-class TAO_PortableServer_Export ServerInformationIterator_var : public TAO_Base_var
-{
-public:
-  ServerInformationIterator_var (void); // default constructor
-  ServerInformationIterator_var (ServerInformationIterator_ptr p) : ptr_ (p) {} 
-  ServerInformationIterator_var (const ServerInformationIterator_var &); // copy constructor
-  ~ServerInformationIterator_var (void); // destructor
-  
-  ServerInformationIterator_var &operator= (ServerInformationIterator_ptr);
-  ServerInformationIterator_var &operator= (const ServerInformationIterator_var &);
-  ServerInformationIterator_ptr operator-> (void) const;
-  
-  operator const ServerInformationIterator_ptr &() const;
-  operator ServerInformationIterator_ptr &();
-  // in, inout, out, _retn 
-  ServerInformationIterator_ptr in (void) const;
-  ServerInformationIterator_ptr &inout (void);
-  ServerInformationIterator_ptr &out (void);
-  ServerInformationIterator_ptr _retn (void);
-  ServerInformationIterator_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static ServerInformationIterator_ptr duplicate (ServerInformationIterator_ptr);
-  static void release (ServerInformationIterator_ptr);
-  static ServerInformationIterator_ptr nil (void);
-  static ServerInformationIterator_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
-
-private:
-  ServerInformationIterator_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  ServerInformationIterator_var (const TAO_Base_var &rhs);
-  ServerInformationIterator_var &operator= (const TAO_Base_var &rhs);
-};
+    class TAO_PortableServer_Export ServerInformationIterator_var : public TAO_Base_var
+    {
+    public:
+      ServerInformationIterator_var (void); // default constructor
+      ServerInformationIterator_var (ServerInformationIterator_ptr p) : ptr_ (p) {}
+      ServerInformationIterator_var (const ServerInformationIterator_var &); // copy constructor
+      ~ServerInformationIterator_var (void); // destructor
+
+      ServerInformationIterator_var &operator= (ServerInformationIterator_ptr);
+      ServerInformationIterator_var &operator= (const ServerInformationIterator_var &);
+      ServerInformationIterator_ptr operator-> (void) const;
+
+      operator const ServerInformationIterator_ptr &() const;
+      operator ServerInformationIterator_ptr &();
+      // in, inout, out, _retn
+      ServerInformationIterator_ptr in (void) const;
+      ServerInformationIterator_ptr &inout (void);
+      ServerInformationIterator_ptr &out (void);
+      ServerInformationIterator_ptr _retn (void);
+      ServerInformationIterator_ptr ptr (void) const;
+
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static ServerInformationIterator_ptr duplicate (ServerInformationIterator_ptr);
+      static void release (ServerInformationIterator_ptr);
+      static ServerInformationIterator_ptr nil (void);
+      static ServerInformationIterator_ptr narrow (
+          CORBA::Object *,
+          CORBA::Environment &
+        );
+      static CORBA::Object * upcast (void *);
+
+    private:
+      ServerInformationIterator_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      ServerInformationIterator_var (const TAO_Base_var &rhs);
+      ServerInformationIterator_var &operator= (const TAO_Base_var &rhs);
+    };
 
 
 #endif /* end #if !defined */
@@ -944,22 +981,22 @@ private:
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CH_
 
-class TAO_PortableServer_Export ServerInformationIterator_out
-{
-public:
-  ServerInformationIterator_out (ServerInformationIterator_ptr &);
-  ServerInformationIterator_out (ServerInformationIterator_var &);
-  ServerInformationIterator_out (const ServerInformationIterator_out &);
-  ServerInformationIterator_out &operator= (const ServerInformationIterator_out &);
-  ServerInformationIterator_out &operator= (const ServerInformationIterator_var &);
-  ServerInformationIterator_out &operator= (ServerInformationIterator_ptr);
-  operator ServerInformationIterator_ptr &();
-  ServerInformationIterator_ptr &ptr (void);
-  ServerInformationIterator_ptr operator-> (void);
-
-private:
-  ServerInformationIterator_ptr &ptr_;
-};
+    class TAO_PortableServer_Export ServerInformationIterator_out
+    {
+    public:
+      ServerInformationIterator_out (ServerInformationIterator_ptr &);
+      ServerInformationIterator_out (ServerInformationIterator_var &);
+      ServerInformationIterator_out (const ServerInformationIterator_out &);
+      ServerInformationIterator_out &operator= (const ServerInformationIterator_out &);
+      ServerInformationIterator_out &operator= (const ServerInformationIterator_var &);
+      ServerInformationIterator_out &operator= (ServerInformationIterator_ptr);
+      operator ServerInformationIterator_ptr &();
+      ServerInformationIterator_ptr &ptr (void);
+      ServerInformationIterator_ptr operator-> (void);
+
+    private:
+      ServerInformationIterator_ptr &ptr_;
+    };
 
 
 #endif /* end #if !defined */
@@ -968,8 +1005,8 @@ private:
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___PTR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___PTR_CH_
 
-class Administration;
-typedef Administration *Administration_ptr;
+    class Administration;
+    typedef Administration *Administration_ptr;
 
 #endif /* end #if !defined */
 
@@ -977,41 +1014,44 @@ typedef Administration *Administration_ptr;
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___VAR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___VAR_CH_
 
-class TAO_PortableServer_Export Administration_var : public TAO_Base_var
-{
-public:
-  Administration_var (void); // default constructor
-  Administration_var (Administration_ptr p) : ptr_ (p) {} 
-  Administration_var (const Administration_var &); // copy constructor
-  ~Administration_var (void); // destructor
-  
-  Administration_var &operator= (Administration_ptr);
-  Administration_var &operator= (const Administration_var &);
-  Administration_ptr operator-> (void) const;
-  
-  operator const Administration_ptr &() const;
-  operator Administration_ptr &();
-  // in, inout, out, _retn 
-  Administration_ptr in (void) const;
-  Administration_ptr &inout (void);
-  Administration_ptr &out (void);
-  Administration_ptr _retn (void);
-  Administration_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static Administration_ptr duplicate (Administration_ptr);
-  static void release (Administration_ptr);
-  static Administration_ptr nil (void);
-  static Administration_ptr narrow (CORBA::Object *, CORBA::Environment &);
-  static CORBA::Object * upcast (void *);
-
-private:
-  Administration_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  Administration_var (const TAO_Base_var &rhs);
-  Administration_var &operator= (const TAO_Base_var &rhs);
-};
+    class TAO_PortableServer_Export Administration_var : public TAO_Base_var
+    {
+    public:
+      Administration_var (void); // default constructor
+      Administration_var (Administration_ptr p) : ptr_ (p) {}
+      Administration_var (const Administration_var &); // copy constructor
+      ~Administration_var (void); // destructor
+
+      Administration_var &operator= (Administration_ptr);
+      Administration_var &operator= (const Administration_var &);
+      Administration_ptr operator-> (void) const;
+
+      operator const Administration_ptr &() const;
+      operator Administration_ptr &();
+      // in, inout, out, _retn
+      Administration_ptr in (void) const;
+      Administration_ptr &inout (void);
+      Administration_ptr &out (void);
+      Administration_ptr _retn (void);
+      Administration_ptr ptr (void) const;
+
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static Administration_ptr duplicate (Administration_ptr);
+      static void release (Administration_ptr);
+      static Administration_ptr nil (void);
+      static Administration_ptr narrow (
+          CORBA::Object *,
+          CORBA::Environment &
+        );
+      static CORBA::Object * upcast (void *);
+
+    private:
+      Administration_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      Administration_var (const TAO_Base_var &rhs);
+      Administration_var &operator= (const TAO_Base_var &rhs);
+    };
 
 
 #endif /* end #if !defined */
@@ -1020,22 +1060,22 @@ private:
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___OUT_CH_
 
-class TAO_PortableServer_Export Administration_out
-{
-public:
-  Administration_out (Administration_ptr &);
-  Administration_out (Administration_var &);
-  Administration_out (const Administration_out &);
-  Administration_out &operator= (const Administration_out &);
-  Administration_out &operator= (const Administration_var &);
-  Administration_out &operator= (Administration_ptr);
-  operator Administration_ptr &();
-  Administration_ptr &ptr (void);
-  Administration_ptr operator-> (void);
-
-private:
-  Administration_ptr &ptr_;
-};
+    class TAO_PortableServer_Export Administration_out
+    {
+    public:
+      Administration_out (Administration_ptr &);
+      Administration_out (Administration_var &);
+      Administration_out (const Administration_out &);
+      Administration_out &operator= (const Administration_out &);
+      Administration_out &operator= (const Administration_var &);
+      Administration_out &operator= (Administration_ptr);
+      operator Administration_ptr &();
+      Administration_ptr &ptr (void);
+      Administration_ptr operator-> (void);
+
+    private:
+      Administration_ptr &ptr_;
+    };
 
 
 #endif /* end #if !defined */
@@ -1044,81 +1084,85 @@ private:
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_
 
-// Forward Classes Declaration
-class _TAO_Administration_Proxy_Impl;
-class _TAO_Administration_Remote_Proxy_Impl;
-class _TAO_Administration_Proxy_Broker;
-class _TAO_Administration_Remote_Proxy_Broker;
-
-class TAO_PortableServer_Export Administration : public virtual CORBA_Object
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef Administration_ptr _ptr_type;
-  typedef Administration_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
+    // Forward Classes Declaration
+    class _TAO_Administration_Proxy_Impl;
+    class _TAO_Administration_Remote_Proxy_Impl;
+    class _TAO_Administration_Proxy_Broker;
+    class _TAO_Administration_Remote_Proxy_Broker;
 
-  // the static operations
-  static Administration_ptr _duplicate (Administration_ptr obj);
-  static Administration_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static Administration_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static Administration_ptr _nil (void)
+    class TAO_PortableServer_Export Administration
+      : public virtual CORBA_Object
     {
-      return (Administration_ptr)0;
-    }
+    public:
+    #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+      typedef Administration_ptr _ptr_type;
+      typedef Administration_var _var_type;
+    #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+      // the static operations
+      static Administration_ptr _duplicate (Administration_ptr obj);
+
+      static Administration_ptr _narrow (
+          CORBA::Object_ptr obj,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        );
+
+      static Administration_ptr _unchecked_narrow (
+          CORBA::Object_ptr obj,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        );
 
-  static void _tao_any_destructor (void*);
+      static Administration_ptr _nil (void)
+        {
+          return (Administration_ptr)0;
+        }
+
+      static void _tao_any_destructor (void*);
 
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_ALREADYREGISTERED_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_ALREADYREGISTERED_CH_
 
-  class TAO_PortableServer_Export AlreadyRegistered : public CORBA::UserException
-  {
-  public:
+      class TAO_PortableServer_Export AlreadyRegistered : public CORBA::UserException
+      {
+      public:
 
-    AlreadyRegistered (void);
-    // Default constructor.
-    
-    AlreadyRegistered (const AlreadyRegistered &);
-    // Copy constructor.
-    
-    ~AlreadyRegistered (void);
-    // Destructor.
-    
-    static void _tao_any_destructor (void*);
-    
-    AlreadyRegistered &operator= (const AlreadyRegistered &);
-    
-    virtual void _raise (void);
+        AlreadyRegistered (void);
+        // Default constructor.
 
-    virtual void _tao_encode (
-        TAO_OutputCDR &,
-        CORBA::Environment &
-      ) const;
-    
-    virtual void _tao_decode (
-        TAO_InputCDR &,
-        CORBA::Environment &
-      );
-    
-    static AlreadyRegistered *_downcast (CORBA::Exception *);
+        AlreadyRegistered (const AlreadyRegistered &);
+        // Copy constructor.
+
+        ~AlreadyRegistered (void);
+        // Destructor.
+
+        static void _tao_any_destructor (void*);
+
+        AlreadyRegistered &operator= (const AlreadyRegistered &);
+
+        virtual void _raise (void);
+
+        virtual void _tao_encode (
+            TAO_OutputCDR &,
+            CORBA::Environment &
+          ) const;
+
+        virtual void _tao_decode (
+            TAO_InputCDR &,
+            CORBA::Environment &
+          );
+
+        static AlreadyRegistered *_downcast (CORBA::Exception *);
 
 
-    // = TAO extension.
-    static CORBA::Exception *_alloc (void);
-    virtual CORBA::TypeCode_ptr _type (void) const;
-  }; // Exception ImplementationRepository::Administration::AlreadyRegistered.
+        // = TAO extension.
+        static CORBA::Exception *_alloc (void);
+        virtual CORBA::TypeCode_ptr _type (void) const;
+      }; // Exception ImplementationRepository::Administration::AlreadyRegistered.
 
-  static CORBA::TypeCode_ptr _tc_AlreadyRegistered;
+static CORBA::TypeCode_ptr _tc_AlreadyRegistered;
 
 
 #endif /* end #if !defined */
@@ -1127,48 +1171,48 @@ public:
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CANNOTACTIVATE_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CANNOTACTIVATE_CH_
 
-  class TAO_PortableServer_Export CannotActivate : public CORBA::UserException
-  {
-  public:
-    TAO_String_Manager reason;
-
-    CannotActivate (void);
-    // Default constructor.
-    
-    CannotActivate (const CannotActivate &);
-    // Copy constructor.
-    
-    ~CannotActivate (void);
-    // Destructor.
-    
-    static void _tao_any_destructor (void*);
-    
-    CannotActivate &operator= (const CannotActivate &);
-    
-    virtual void _raise (void);
+      class TAO_PortableServer_Export CannotActivate : public CORBA::UserException
+      {
+      public:
+        TAO_String_Manager reason;
 
-    virtual void _tao_encode (
-        TAO_OutputCDR &,
-        CORBA::Environment &
-      ) const;
-    
-    virtual void _tao_decode (
-        TAO_InputCDR &,
-        CORBA::Environment &
-      );
-    
-    static CannotActivate *_downcast (CORBA::Exception *);
+        CannotActivate (void);
+        // Default constructor.
 
-    CannotActivate (
-        const char * _tao_reason
-      );
-    
-    // = TAO extension.
-    static CORBA::Exception *_alloc (void);
-    virtual CORBA::TypeCode_ptr _type (void) const;
-  }; // Exception ImplementationRepository::Administration::CannotActivate.
+        CannotActivate (const CannotActivate &);
+        // Copy constructor.
+
+        ~CannotActivate (void);
+        // Destructor.
 
-  static CORBA::TypeCode_ptr _tc_CannotActivate;
+        static void _tao_any_destructor (void*);
+
+        CannotActivate &operator= (const CannotActivate &);
+
+        virtual void _raise (void);
+
+        virtual void _tao_encode (
+            TAO_OutputCDR &,
+            CORBA::Environment &
+          ) const;
+
+        virtual void _tao_decode (
+            TAO_InputCDR &,
+            CORBA::Environment &
+          );
+
+        static CannotActivate *_downcast (CORBA::Exception *);
+
+        CannotActivate (
+            const char * _tao_reason
+          );
+
+        // = TAO extension.
+        static CORBA::Exception *_alloc (void);
+        virtual CORBA::TypeCode_ptr _type (void) const;
+      }; // Exception ImplementationRepository::Administration::CannotActivate.
+
+static CORBA::TypeCode_ptr _tc_CannotActivate;
 
 
 #endif /* end #if !defined */
@@ -1177,844 +1221,846 @@ public:
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_NOTFOUND_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_NOTFOUND_CH_
 
-  class TAO_PortableServer_Export NotFound : public CORBA::UserException
-  {
-  public:
+      class TAO_PortableServer_Export NotFound : public CORBA::UserException
+      {
+      public:
 
-    NotFound (void);
-    // Default constructor.
-    
-    NotFound (const NotFound &);
-    // Copy constructor.
-    
-    ~NotFound (void);
-    // Destructor.
-    
-    static void _tao_any_destructor (void*);
-    
-    NotFound &operator= (const NotFound &);
-    
-    virtual void _raise (void);
+        NotFound (void);
+        // Default constructor.
 
-    virtual void _tao_encode (
-        TAO_OutputCDR &,
-        CORBA::Environment &
-      ) const;
-    
-    virtual void _tao_decode (
-        TAO_InputCDR &,
-        CORBA::Environment &
-      );
-    
-    static NotFound *_downcast (CORBA::Exception *);
+        NotFound (const NotFound &);
+        // Copy constructor.
 
+        ~NotFound (void);
+        // Destructor.
 
-    // = TAO extension.
-    static CORBA::Exception *_alloc (void);
-    virtual CORBA::TypeCode_ptr _type (void) const;
-  }; // Exception ImplementationRepository::Administration::NotFound.
+        static void _tao_any_destructor (void*);
 
-  static CORBA::TypeCode_ptr _tc_NotFound;
+        NotFound &operator= (const NotFound &);
 
+        virtual void _raise (void);
 
-#endif /* end #if !defined */
+        virtual void _tao_encode (
+            TAO_OutputCDR &,
+            CORBA::Environment &
+          ) const;
 
-  virtual void activate_server (
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      ImplementationRepository::Administration::NotFound,
-      ImplementationRepository::Administration::CannotActivate
-    ));
-
-  virtual void register_server (
-      const char * server,
-      const ImplementationRepository::StartupOptions & options,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      ImplementationRepository::Administration::AlreadyRegistered
-    ));
-
-  virtual void reregister_server (
-      const char * server,
-      const ImplementationRepository::StartupOptions & options,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void remove_server (
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      ImplementationRepository::Administration::NotFound
-    ));
-
-  virtual void shutdown_server (
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      ImplementationRepository::Administration::NotFound
-    ));
-
-  virtual char * server_is_running (
-      const char * server,
-      const char * addr,
-      ImplementationRepository::ServerObject_ptr server_object,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      ImplementationRepository::Administration::NotFound
-    ));
-
-  virtual void server_is_shutting_down (
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      ImplementationRepository::Administration::NotFound
-    ));
-
-  virtual void find (
-      const char * server,
-      ImplementationRepository::ServerInformation_out info,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      ImplementationRepository::Administration::NotFound
-    ));
-
-  virtual void list (
-      CORBA::ULong how_many,
-      ImplementationRepository::ServerInformationList_out server_list,
-      ImplementationRepository::ServerInformationIterator_out server_iterator,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
-
-private:
-  _TAO_Administration_Proxy_Broker *the_TAO_Administration_Proxy_Broker_;
-  
-protected:
-  Administration (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void ImplementationRepository_Administration_setup_collocation (int collocated);
-    
-    Administration (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_Administration_Remote_Proxy_Impl;
-    friend class _TAO_Administration_ThruPOA_Proxy_Impl;
-    friend class _TAO_Administration_Direct_Proxy_Impl;
-  
-  virtual ~Administration (void);
-private:
-  Administration (const Administration &);
-  void operator= (const Administration &);
-};
+        virtual void _tao_decode (
+            TAO_InputCDR &,
+            CORBA::Environment &
+          );
 
+        static NotFound *_downcast (CORBA::Exception *);
 
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
 
+        // = TAO extension.
+        static CORBA::Exception *_alloc (void);
+        virtual CORBA::TypeCode_ptr _type (void) const;
+      }; // Exception ImplementationRepository::Administration::NotFound.
 
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
+static CORBA::TypeCode_ptr _tc_NotFound;
 
-class TAO_PortableServer_Export _TAO_Administration_Proxy_Impl : public virtual TAO_Object_Proxy_Impl
-{
-public:
-  virtual ~_TAO_Administration_Proxy_Impl (void) { }
-  
-    virtual void activate_server (
-      CORBA_Object *_collocated_tao_target_,
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      ImplementationRepository::Administration::NotFound,
-      ImplementationRepository::Administration::CannotActivate
-    )) = 0;
-
-  virtual void register_server (
-      CORBA_Object *_collocated_tao_target_,
-      const char * server,
-      const ImplementationRepository::StartupOptions & options,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      ImplementationRepository::Administration::AlreadyRegistered
-    )) = 0;
-
-  virtual void reregister_server (
-      CORBA_Object *_collocated_tao_target_,
-      const char * server,
-      const ImplementationRepository::StartupOptions & options,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void remove_server (
-      CORBA_Object *_collocated_tao_target_,
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      ImplementationRepository::Administration::NotFound
-    )) = 0;
-
-  virtual void shutdown_server (
-      CORBA_Object *_collocated_tao_target_,
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      ImplementationRepository::Administration::NotFound
-    )) = 0;
-
-  virtual char * server_is_running (
-      CORBA_Object *_collocated_tao_target_,
-      const char * server,
-      const char * addr,
-      ImplementationRepository::ServerObject_ptr server_object,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      ImplementationRepository::Administration::NotFound
-    )) = 0;
-
-  virtual void server_is_shutting_down (
-      CORBA_Object *_collocated_tao_target_,
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      ImplementationRepository::Administration::NotFound
-    )) = 0;
-
-  virtual void find (
-      CORBA_Object *_collocated_tao_target_,
-      const char * server,
-      ImplementationRepository::ServerInformation_out info,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      ImplementationRepository::Administration::NotFound
-    )) = 0;
-
-  virtual void list (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::ULong how_many,
-      ImplementationRepository::ServerInformationList_out server_list,
-      ImplementationRepository::ServerInformationIterator_out server_iterator,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-protected:
-  _TAO_Administration_Proxy_Impl (void);
-
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
 
+#endif /* end #if !defined */
 
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
+      virtual void activate_server (
+          const char * server,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException,
+          ImplementationRepository::Administration::NotFound,
+          ImplementationRepository::Administration::CannotActivate
+        ));
+
+      virtual void register_server (
+          const char * server,
+          const ImplementationRepository::StartupOptions & options,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException,
+          ImplementationRepository::Administration::AlreadyRegistered
+        ));
+
+      virtual void reregister_server (
+          const char * server,
+          const ImplementationRepository::StartupOptions & options,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual void remove_server (
+          const char * server,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException,
+          ImplementationRepository::Administration::NotFound
+        ));
+
+      virtual void shutdown_server (
+          const char * server,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException,
+          ImplementationRepository::Administration::NotFound
+        ));
+
+      virtual char * server_is_running (
+          const char * server,
+          const char * addr,
+          ImplementationRepository::ServerObject_ptr server_object,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException,
+          ImplementationRepository::Administration::NotFound
+        ));
+
+      virtual void server_is_shutting_down (
+          const char * server,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException,
+          ImplementationRepository::Administration::NotFound
+        ));
+
+      virtual void find (
+          const char * server,
+          ImplementationRepository::ServerInformation_out info,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException,
+          ImplementationRepository::Administration::NotFound
+        ));
+
+      virtual void list (
+          CORBA::ULong how_many,
+          ImplementationRepository::ServerInformationList_out server_list,
+          ImplementationRepository::ServerInformationIterator_out server_iterator,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual CORBA::Boolean _is_a (
+          const CORBA::Char *type_id,
+          CORBA::Environment &ACE_TRY_ENV =
+            TAO_default_environment ()
+        );
 
-class TAO_PortableServer_Export _TAO_Administration_Remote_Proxy_Impl : 
-  public virtual _TAO_Administration_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl
-{
-public:
-  _TAO_Administration_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_Administration_Remote_Proxy_Impl (void) { }
-  
-    virtual void activate_server (
-      CORBA_Object *_collocated_tao_target_,
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      ImplementationRepository::Administration::NotFound,
-      ImplementationRepository::Administration::CannotActivate
-    ));
-
-  virtual void register_server (
-      CORBA_Object *_collocated_tao_target_,
-      const char * server,
-      const ImplementationRepository::StartupOptions & options,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      ImplementationRepository::Administration::AlreadyRegistered
-    ));
-
-  virtual void reregister_server (
-      CORBA_Object *_collocated_tao_target_,
-      const char * server,
-      const ImplementationRepository::StartupOptions & options,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void remove_server (
-      CORBA_Object *_collocated_tao_target_,
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      ImplementationRepository::Administration::NotFound
-    ));
-
-  virtual void shutdown_server (
-      CORBA_Object *_collocated_tao_target_,
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      ImplementationRepository::Administration::NotFound
-    ));
-
-  virtual char * server_is_running (
-      CORBA_Object *_collocated_tao_target_,
-      const char * server,
-      const char * addr,
-      ImplementationRepository::ServerObject_ptr server_object,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      ImplementationRepository::Administration::NotFound
-    ));
-
-  virtual void server_is_shutting_down (
-      CORBA_Object *_collocated_tao_target_,
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      ImplementationRepository::Administration::NotFound
-    ));
-
-  virtual void find (
-      CORBA_Object *_collocated_tao_target_,
-      const char * server,
-      ImplementationRepository::ServerInformation_out info,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      ImplementationRepository::Administration::NotFound
-    ));
-
-  virtual void list (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::ULong how_many,
-      ImplementationRepository::ServerInformationList_out server_list,
-      ImplementationRepository::ServerInformationIterator_out server_iterator,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-};
+      virtual void *_tao_QueryInterface (ptr_arith_t type);
 
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
+      virtual const char* _interface_repository_id (void) const;
 
+    private:
+      _TAO_Administration_Proxy_Broker *the_TAO_Administration_Proxy_Broker_;
 
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
+    protected:
+      Administration (int collocated = 0);
 
+      // This methods travese the inheritance tree and set the
+      // parents piece of the given class in the right mode
+      virtual void ImplementationRepository_Administration_setup_collocation (int collocated);
 
+      Administration (
+          TAO_Stub *objref,
+          CORBA::Boolean _tao_collocated = 0,
+          TAO_Abstract_ServantBase *servant = 0
+        );
 
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
+      friend class _TAO_Administration_Remote_Proxy_Impl;
+      friend class _TAO_Administration_ThruPOA_Proxy_Impl;
+      friend class _TAO_Administration_Direct_Proxy_Impl;
 
-class TAO_PortableServer_Export _TAO_Administration_Proxy_Broker
-{
-public:
-  virtual ~_TAO_Administration_Proxy_Broker (void);
-  virtual _TAO_Administration_Proxy_Impl &select_proxy (
-    Administration *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
-
-protected:
-  _TAO_Administration_Proxy_Broker (void);
-  
-};
+      virtual ~Administration (void);
 
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+    private:
+      Administration (const Administration &);
+      void operator= (const Administration &);
+    };
 
+    // The Proxy Implementations are used by each interface to
+    // perform a call. Each different implementation encapsulate
+    // an invocation logics.
 
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
 
-class TAO_PortableServer_Export _TAO_Administration_Remote_Proxy_Broker : public virtual _TAO_Administration_Proxy_Broker
-{
-public: 
-  _TAO_Administration_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_Administration_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_Administration_Proxy_Impl &select_proxy (
-    Administration *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
-
-private:
-  _TAO_Administration_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
-
-public:
-  static _TAO_Administration_Remote_Proxy_Broker *the_TAO_Administration_Remote_Proxy_Broker (void);
-};
+    ///////////////////////////////////////////////////////////////////////
+    //                    Base Proxy Impl. Declaration
+    //
 
+    class TAO_PortableServer_Export _TAO_Administration_Proxy_Impl
+      : public virtual TAO_Object_Proxy_Impl
+    {
+    public:
+      virtual ~_TAO_Administration_Proxy_Impl (void) { }
+      virtual void activate_server (
+          CORBA_Object *_collocated_tao_target_,
+          const char * server,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException,
+          ImplementationRepository::Administration::NotFound,
+          ImplementationRepository::Administration::CannotActivate
+        )) = 0;
+
+      virtual void register_server (
+          CORBA_Object *_collocated_tao_target_,
+          const char * server,
+          const ImplementationRepository::StartupOptions & options,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException,
+          ImplementationRepository::Administration::AlreadyRegistered
+        )) = 0;
+
+      virtual void reregister_server (
+          CORBA_Object *_collocated_tao_target_,
+          const char * server,
+          const ImplementationRepository::StartupOptions & options,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+
+      virtual void remove_server (
+          CORBA_Object *_collocated_tao_target_,
+          const char * server,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException,
+          ImplementationRepository::Administration::NotFound
+        )) = 0;
+
+      virtual void shutdown_server (
+          CORBA_Object *_collocated_tao_target_,
+          const char * server,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException,
+          ImplementationRepository::Administration::NotFound
+        )) = 0;
+
+      virtual char * server_is_running (
+          CORBA_Object *_collocated_tao_target_,
+          const char * server,
+          const char * addr,
+          ImplementationRepository::ServerObject_ptr server_object,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException,
+          ImplementationRepository::Administration::NotFound
+        )) = 0;
+
+      virtual void server_is_shutting_down (
+          CORBA_Object *_collocated_tao_target_,
+          const char * server,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException,
+          ImplementationRepository::Administration::NotFound
+        )) = 0;
+
+      virtual void find (
+          CORBA_Object *_collocated_tao_target_,
+          const char * server,
+          ImplementationRepository::ServerInformation_out info,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException,
+          ImplementationRepository::Administration::NotFound
+        )) = 0;
+
+      virtual void list (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::ULong how_many,
+          ImplementationRepository::ServerInformationList_out server_list,
+          ImplementationRepository::ServerInformationIterator_out server_iterator,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
 
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
 
+    protected:
+      _TAO_Administration_Proxy_Impl (void);
+    };
 
-#endif /* end #if !defined */
+    //
+    //               End Base Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
 
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Administration;
 
+    ///////////////////////////////////////////////////////////////////////
+    //                Remote Proxy Impl. Declaration
+    //
 
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_
+    class TAO_PortableServer_Export _TAO_Administration_Remote_Proxy_Impl
+      : public virtual _TAO_Administration_Proxy_Impl,
+        public virtual TAO_Remote_Object_Proxy_Impl
+    {
+    public:
+      _TAO_Administration_Remote_Proxy_Impl (void);
+
+      virtual ~_TAO_Administration_Remote_Proxy_Impl (void) { }
+      virtual void activate_server (
+          CORBA_Object *_collocated_tao_target_,
+          const char * server,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException,
+          ImplementationRepository::Administration::NotFound,
+          ImplementationRepository::Administration::CannotActivate
+        ));
+
+      virtual void register_server (
+          CORBA_Object *_collocated_tao_target_,
+          const char * server,
+          const ImplementationRepository::StartupOptions & options,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException,
+          ImplementationRepository::Administration::AlreadyRegistered
+        ));
+
+      virtual void reregister_server (
+          CORBA_Object *_collocated_tao_target_,
+          const char * server,
+          const ImplementationRepository::StartupOptions & options,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+      virtual void remove_server (
+          CORBA_Object *_collocated_tao_target_,
+          const char * server,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException,
+          ImplementationRepository::Administration::NotFound
+        ));
+
+      virtual void shutdown_server (
+          CORBA_Object *_collocated_tao_target_,
+          const char * server,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException,
+          ImplementationRepository::Administration::NotFound
+        ));
+
+      virtual char * server_is_running (
+          CORBA_Object *_collocated_tao_target_,
+          const char * server,
+          const char * addr,
+          ImplementationRepository::ServerObject_ptr server_object,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException,
+          ImplementationRepository::Administration::NotFound
+        ));
+
+      virtual void server_is_shutting_down (
+          CORBA_Object *_collocated_tao_target_,
+          const char * server,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException,
+          ImplementationRepository::Administration::NotFound
+        ));
+
+      virtual void find (
+          CORBA_Object *_collocated_tao_target_,
+          const char * server,
+          ImplementationRepository::ServerInformation_out info,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException,
+          ImplementationRepository::Administration::NotFound
+        ));
+
+      virtual void list (
+          CORBA_Object *_collocated_tao_target_,
+          CORBA::ULong how_many,
+          ImplementationRepository::ServerInformationList_out server_list,
+          ImplementationRepository::ServerInformationIterator_out server_iterator,
+          CORBA::Environment &ACE_TRY_ENV
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+
+
+    };
+
+    //
+    //             End Remote Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+
+    // The Proxy Brokers are used by each interface to get
+    // the right proxy for performing a call. In the new
+    // collocation scheme, the proxy to be used can vary on
+    // a call by call basis.
+
+
+    ///////////////////////////////////////////////////////////////////////
+    //                 Base Proxy Broker Declaration
+    //
+
+        class TAO_PortableServer_Export _TAO_Administration_Proxy_Broker
+    {
+    public:
+      virtual ~_TAO_Administration_Proxy_Broker (void);
+      virtual _TAO_Administration_Proxy_Impl &select_proxy (
+          Administration *object,
+          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+        ) = 0;
 
-// Forward Classes Declaration
-class _TAO_ServerInformationIterator_Proxy_Impl;
-class _TAO_ServerInformationIterator_Remote_Proxy_Impl;
-class _TAO_ServerInformationIterator_Proxy_Broker;
-class _TAO_ServerInformationIterator_Remote_Proxy_Broker;
+    protected:
+      _TAO_Administration_Proxy_Broker (void);
 
-class TAO_PortableServer_Export ServerInformationIterator : public virtual CORBA_Object
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef ServerInformationIterator_ptr _ptr_type;
-  typedef ServerInformationIterator_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
+    };
+
+    //
+    //              End Base Proxy Broker Declaration
+    ///////////////////////////////////////////////////////////////////////
 
-  // the static operations
-  static ServerInformationIterator_ptr _duplicate (ServerInformationIterator_ptr obj);
-  static ServerInformationIterator_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static ServerInformationIterator_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  static ServerInformationIterator_ptr _nil (void)
+
+    ///////////////////////////////////////////////////////////////////////
+    //                 Remote Proxy Broker Declaration
+    //
+
+    class TAO_PortableServer_Export _TAO_Administration_Remote_Proxy_Broker
+      : public virtual _TAO_Administration_Proxy_Broker
     {
-      return (ServerInformationIterator_ptr)0;
-    }
-
-  static void _tao_any_destructor (void*);
-
-  virtual CORBA::Boolean next_n (
-      CORBA::ULong how_many,
-      ImplementationRepository::ServerInformationList_out server_list,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
-  virtual const char* _interface_repository_id (void) const;
-
-private:
-  _TAO_ServerInformationIterator_Proxy_Broker *the_TAO_ServerInformationIterator_Proxy_Broker_;
-  
-protected:
-  ServerInformationIterator (int collocated = 0);
-  
-  protected:
-    // This methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
-    virtual void ImplementationRepository_ServerInformationIterator_setup_collocation (int collocated);
-    
-    ServerInformationIterator (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-      );
-    
-    friend class _TAO_ServerInformationIterator_Remote_Proxy_Impl;
-    friend class _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl;
-    friend class _TAO_ServerInformationIterator_Direct_Proxy_Impl;
-  
-  virtual ~ServerInformationIterator (void);
-private:
-  ServerInformationIterator (const ServerInformationIterator &);
-  void operator= (const ServerInformationIterator &);
-};
+    public:
+      _TAO_Administration_Remote_Proxy_Broker (void);
 
+      virtual ~_TAO_Administration_Remote_Proxy_Broker (void);
 
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulate
-// an invocation logics.
+      virtual _TAO_Administration_Proxy_Impl &select_proxy (
+          Administration *object,
+          CORBA_Environment &ACE_TRY_ENV
+        );
 
+      private:
+        _TAO_Administration_Remote_Proxy_Impl remote_proxy_impl_;
 
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
+      public:
+        // This member function is used to get an handle to the unique instance
+        // of the Remote Proxy Broker that is available for a given
+        // interface.
+        static _TAO_Administration_Remote_Proxy_Broker *the_TAO_Administration_Remote_Proxy_Broker (void);
+      };
 
-class TAO_PortableServer_Export _TAO_ServerInformationIterator_Proxy_Impl : public virtual TAO_Object_Proxy_Impl
-{
-public:
-  virtual ~_TAO_ServerInformationIterator_Proxy_Impl (void) { }
-  
-    virtual CORBA::Boolean next_n (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::ULong how_many,
-      ImplementationRepository::ServerInformationList_out server_list,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void destroy (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-protected:
-  _TAO_ServerInformationIterator_Proxy_Impl (void);
-
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
+      //
+      //              End Remote Proxy Broker Declaration
+      ///////////////////////////////////////////////////////////////////////
 
 
-///////////////////////////////////////////////////////////////////////
-//                    Remote  Impl. Declaration
-//
+#endif /* end #if !defined */
 
-class TAO_PortableServer_Export _TAO_ServerInformationIterator_Remote_Proxy_Impl : 
-  public virtual _TAO_ServerInformationIterator_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl
-{
-public:
-  _TAO_ServerInformationIterator_Remote_Proxy_Impl (void);
-  
-  virtual ~_TAO_ServerInformationIterator_Remote_Proxy_Impl (void) { }
-  
-    virtual CORBA::Boolean next_n (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::ULong how_many,
-      ImplementationRepository::ServerInformationList_out server_list,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void destroy (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-};
+      TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Administration;
 
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
 
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_)
+#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_
 
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis. 
+      // Forward Classes Declaration
+      class _TAO_ServerInformationIterator_Proxy_Impl;
+      class _TAO_ServerInformationIterator_Remote_Proxy_Impl;
+      class _TAO_ServerInformationIterator_Proxy_Broker;
+      class _TAO_ServerInformationIterator_Remote_Proxy_Broker;
 
+      class TAO_PortableServer_Export ServerInformationIterator
+        : public virtual CORBA_Object
+      {
+      public:
+      #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+        typedef ServerInformationIterator_ptr _ptr_type;
+        typedef ServerInformationIterator_var _var_type;
+      #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+        // the static operations
+        static ServerInformationIterator_ptr _duplicate (ServerInformationIterator_ptr obj);
+
+        static ServerInformationIterator_ptr _narrow (
+            CORBA::Object_ptr obj,
+            CORBA::Environment &ACE_TRY_ENV =
+              TAO_default_environment ()
+          );
+
+        static ServerInformationIterator_ptr _unchecked_narrow (
+            CORBA::Object_ptr obj,
+            CORBA::Environment &ACE_TRY_ENV =
+              TAO_default_environment ()
+          );
+
+        static ServerInformationIterator_ptr _nil (void)
+          {
+            return (ServerInformationIterator_ptr)0;
+          }
+
+        static void _tao_any_destructor (void*);
+
+        virtual CORBA::Boolean next_n (
+            CORBA::ULong how_many,
+            ImplementationRepository::ServerInformationList_out server_list,
+            CORBA::Environment &ACE_TRY_ENV =
+              TAO_default_environment ()
+          )
+          ACE_THROW_SPEC ((
+            CORBA::SystemException
+          ));
+
+        virtual void destroy (
+            CORBA::Environment &ACE_TRY_ENV =
+              TAO_default_environment ()
+          )
+          ACE_THROW_SPEC ((
+            CORBA::SystemException
+          ));
+
+        virtual CORBA::Boolean _is_a (
+            const CORBA::Char *type_id,
+            CORBA::Environment &ACE_TRY_ENV =
+              TAO_default_environment ()
+          );
+
+        virtual void *_tao_QueryInterface (ptr_arith_t type);
+
+        virtual const char* _interface_repository_id (void) const;
+
+      private:
+        _TAO_ServerInformationIterator_Proxy_Broker *the_TAO_ServerInformationIterator_Proxy_Broker_;
+
+      protected:
+        ServerInformationIterator (int collocated = 0);
+
+        // This methods travese the inheritance tree and set the
+        // parents piece of the given class in the right mode
+        virtual void ImplementationRepository_ServerInformationIterator_setup_collocation (int collocated);
+
+        ServerInformationIterator (
+            TAO_Stub *objref,
+            CORBA::Boolean _tao_collocated = 0,
+            TAO_Abstract_ServantBase *servant = 0
+          );
+
+        friend class _TAO_ServerInformationIterator_Remote_Proxy_Impl;
+        friend class _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl;
+        friend class _TAO_ServerInformationIterator_Direct_Proxy_Impl;
+
+        virtual ~ServerInformationIterator (void);
+
+      private:
+        ServerInformationIterator (const ServerInformationIterator &);
+        void operator= (const ServerInformationIterator &);
+      };
+
+      // The Proxy Implementations are used by each interface to
+      // perform a call. Each different implementation encapsulate
+      // an invocation logics.
+
+
+      ///////////////////////////////////////////////////////////////////////
+      //                    Base Proxy Impl. Declaration
+      //
+
+      class TAO_PortableServer_Export _TAO_ServerInformationIterator_Proxy_Impl
+        : public virtual TAO_Object_Proxy_Impl
+      {
+      public:
+        virtual ~_TAO_ServerInformationIterator_Proxy_Impl (void) { }
+        virtual CORBA::Boolean next_n (
+            CORBA_Object *_collocated_tao_target_,
+            CORBA::ULong how_many,
+            ImplementationRepository::ServerInformationList_out server_list,
+            CORBA::Environment &ACE_TRY_ENV
+          )
+          ACE_THROW_SPEC ((
+            CORBA::SystemException
+          )) = 0;
+
+        virtual void destroy (
+            CORBA_Object *_collocated_tao_target_,
+            CORBA::Environment &ACE_TRY_ENV
+          )
+          ACE_THROW_SPEC ((
+            CORBA::SystemException
+          )) = 0;
+
+
+      protected:
+        _TAO_ServerInformationIterator_Proxy_Impl (void);
+      };
+
+      //
+      //               End Base Proxy Impl. Declaration
+      ///////////////////////////////////////////////////////////////////////
+
+
+      ///////////////////////////////////////////////////////////////////////
+      //                Remote Proxy Impl. Declaration
+      //
+
+      class TAO_PortableServer_Export _TAO_ServerInformationIterator_Remote_Proxy_Impl
+        : public virtual _TAO_ServerInformationIterator_Proxy_Impl,
+          public virtual TAO_Remote_Object_Proxy_Impl
+      {
+      public:
+        _TAO_ServerInformationIterator_Remote_Proxy_Impl (void);
+
+        virtual ~_TAO_ServerInformationIterator_Remote_Proxy_Impl (void) { }
+        virtual CORBA::Boolean next_n (
+            CORBA_Object *_collocated_tao_target_,
+            CORBA::ULong how_many,
+            ImplementationRepository::ServerInformationList_out server_list,
+            CORBA::Environment &ACE_TRY_ENV
+          )
+          ACE_THROW_SPEC ((
+            CORBA::SystemException
+          ));
+
+        virtual void destroy (
+            CORBA_Object *_collocated_tao_target_,
+            CORBA::Environment &ACE_TRY_ENV
+          )
+          ACE_THROW_SPEC ((
+            CORBA::SystemException
+          ));
+
+
+      };
+
+      //
+      //             End Remote Proxy Impl. Declaration
+      ///////////////////////////////////////////////////////////////////////
+
+      // The Proxy Brokers are used by each interface to get
+      // the right proxy for performing a call. In the new
+      // collocation scheme, the proxy to be used can vary on
+      // a call by call basis.
+
+
+      ///////////////////////////////////////////////////////////////////////
+      //                 Base Proxy Broker Declaration
+      //
+
+            class TAO_PortableServer_Export _TAO_ServerInformationIterator_Proxy_Broker
+      {
+      public:
+        virtual ~_TAO_ServerInformationIterator_Proxy_Broker (void);
+        virtual _TAO_ServerInformationIterator_Proxy_Impl &select_proxy (
+            ServerInformationIterator *object,
+            CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+          ) = 0;
 
+      protected:
+        _TAO_ServerInformationIterator_Proxy_Broker (void);
 
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
+      };
 
-class TAO_PortableServer_Export _TAO_ServerInformationIterator_Proxy_Broker
-{
-public:
-  virtual ~_TAO_ServerInformationIterator_Proxy_Broker (void);
-  virtual _TAO_ServerInformationIterator_Proxy_Impl &select_proxy (
-    ServerInformationIterator *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  ) = 0;
-
-protected:
-  _TAO_ServerInformationIterator_Proxy_Broker (void);
-  
-};
+      //
+      //              End Base Proxy Broker Declaration
+      ///////////////////////////////////////////////////////////////////////
 
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
 
+      ///////////////////////////////////////////////////////////////////////
+      //                 Remote Proxy Broker Declaration
+      //
 
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
+      class TAO_PortableServer_Export _TAO_ServerInformationIterator_Remote_Proxy_Broker
+        : public virtual _TAO_ServerInformationIterator_Proxy_Broker
+      {
+      public:
+        _TAO_ServerInformationIterator_Remote_Proxy_Broker (void);
 
-class TAO_PortableServer_Export _TAO_ServerInformationIterator_Remote_Proxy_Broker : public virtual _TAO_ServerInformationIterator_Proxy_Broker
-{
-public: 
-  _TAO_ServerInformationIterator_Remote_Proxy_Broker (void);
-  
-  virtual ~_TAO_ServerInformationIterator_Remote_Proxy_Broker (void);
-  
-  virtual _TAO_ServerInformationIterator_Proxy_Impl &select_proxy (
-    ServerInformationIterator *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
-
-private:
-  _TAO_ServerInformationIterator_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
-// of the Remote Proxy Broker that is available for a given
-// interface.
-
-public:
-  static _TAO_ServerInformationIterator_Remote_Proxy_Broker *the_TAO_ServerInformationIterator_Remote_Proxy_Broker (void);
-};
+        virtual ~_TAO_ServerInformationIterator_Remote_Proxy_Broker (void);
 
+        virtual _TAO_ServerInformationIterator_Proxy_Impl &select_proxy (
+            ServerInformationIterator *object,
+            CORBA_Environment &ACE_TRY_ENV
+          );
 
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
+        private:
+          _TAO_ServerInformationIterator_Remote_Proxy_Impl remote_proxy_impl_;
+
+        public:
+          // This member function is used to get an handle to the unique instance
+          // of the Remote Proxy Broker that is available for a given
+          // interface.
+          static _TAO_ServerInformationIterator_Remote_Proxy_Broker *the_TAO_ServerInformationIterator_Remote_Proxy_Broker (void);
+        };
+
+        //
+        //              End Remote Proxy Broker Declaration
+        ///////////////////////////////////////////////////////////////////////
 
 
 #endif /* end #if !defined */
 
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformationIterator;
+        TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformationIterator;
 
 
-}
+      }
 TAO_NAMESPACE_CLOSE // module ImplementationRepository
 
 // Proxy Broker Factory function pointer declarations.
 
-extern TAO_PortableServer_Export
-ImplementationRepository::_TAO_ServerObject_Proxy_Broker *
-(*ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_PortableServer_Export
-ImplementationRepository::_TAO_Administration_Proxy_Broker *
-(*ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_PortableServer_Export
-ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Broker *
-(*ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-// Any operators for interface ImplementationRepository::ServerObject
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerObject_ptr);
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerObject *&);
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentVariable &); // copying version
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentVariable*); // noncopying version
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::EnvironmentVariable *&); // deprecated
+      extern TAO_PortableServer_Export
+      ImplementationRepository::_TAO_ServerObject_Proxy_Broker *
+      (*ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer) (
+          CORBA::Object_ptr obj
+        );
+
+      extern TAO_PortableServer_Export
+      ImplementationRepository::_TAO_Administration_Proxy_Broker *
+      (*ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer) (
+          CORBA::Object_ptr obj
+        );
+
+      extern TAO_PortableServer_Export
+      ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Broker *
+      (*ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer) (
+          CORBA::Object_ptr obj
+        );
+
+            // Any operators for interface ImplementationRepository::ServerObject
+      TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerObject_ptr);
+      TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerObject *&);
+      TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentVariable &); // copying version
+      TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentVariable*); // noncopying version
+      TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::EnvironmentVariable *&); // deprecated
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::EnvironmentVariable *&);
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentList &); // copying version
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentList*); // noncopying version
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::EnvironmentList *&); // deprecated
+                  TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentList &); // copying version
+      TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentList*); // noncopying version
+      TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::EnvironmentList *&); // deprecated
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::EnvironmentList *&);
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ActivationMode);
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ActivationMode &);
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::StartupOptions &); // copying version
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::StartupOptions*); // noncopying version
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::StartupOptions *&); // deprecated
+      TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ActivationMode);
+      TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ActivationMode &);
+      TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::StartupOptions &); // copying version
+      TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::StartupOptions*); // noncopying version
+      TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::StartupOptions *&); // deprecated
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::StartupOptions *&);
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformation &); // copying version
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformation*); // noncopying version
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformation *&); // deprecated
+      TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformation &); // copying version
+      TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformation*); // noncopying version
+      TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformation *&); // deprecated
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformation *&);
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformationList &); // copying version
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationList*); // noncopying version
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationList *&); // deprecated
+            TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformationList &); // copying version
+      TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationList*); // noncopying version
+      TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationList *&); // deprecated
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformationList *&);
-// Any operators for interface ImplementationRepository::Administration
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration_ptr);
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration *&);
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::Administration::AlreadyRegistered &); // copying version
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration::AlreadyRegistered*); // noncopying version
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration::AlreadyRegistered *&); // deprecated
+      // Any operators for interface ImplementationRepository::Administration
+      TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration_ptr);
+      TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration *&);
+      TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::Administration::AlreadyRegistered &); // copying version
+      TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration::AlreadyRegistered*); // noncopying version
+      TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration::AlreadyRegistered *&); // deprecated
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::Administration::AlreadyRegistered *&);
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::Administration::CannotActivate &); // copying version
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration::CannotActivate*); // noncopying version
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration::CannotActivate *&); // deprecated
+      TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::Administration::CannotActivate &); // copying version
+      TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration::CannotActivate*); // noncopying version
+      TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration::CannotActivate *&); // deprecated
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::Administration::CannotActivate *&);
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::Administration::NotFound &); // copying version
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration::NotFound*); // noncopying version
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration::NotFound *&); // deprecated
+      TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::Administration::NotFound &); // copying version
+      TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration::NotFound*); // noncopying version
+      TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration::NotFound *&); // deprecated
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::Administration::NotFound *&);
-// Any operators for interface ImplementationRepository::ServerInformationIterator
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr);
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationIterator *&);
+      // Any operators for interface ImplementationRepository::ServerInformationIterator
+      TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr);
+      TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationIterator *&);
 
-#ifndef __ACE_INLINE__
+      #ifndef __ACE_INLINE__
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerObject_ptr );
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerObject_ptr &);
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::EnvironmentVariable &);
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::EnvironmentVariable &);
+      TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerObject_ptr );
+      TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerObject_ptr &);
+      TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::EnvironmentVariable &);
+      TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::EnvironmentVariable &);
 
 #if !defined _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_
-#define _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_
+      #define _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const ImplementationRepository::EnvironmentList &
-  );
-TAO_PortableServer_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    ImplementationRepository::EnvironmentList &
-  );
+          TAO_OutputCDR &,
+          const ImplementationRepository::EnvironmentList &
+        );
+      TAO_PortableServer_Export CORBA::Boolean operator>> (
+          TAO_InputCDR &,
+          ImplementationRepository::EnvironmentList &
+        );
 
 #endif /* _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_ */
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ActivationMode &); // 
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ActivationMode &);
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::StartupOptions &);
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::StartupOptions &);
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformation &);
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformation &);
+      TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ActivationMode &); //
+      TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ActivationMode &);
+      TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::StartupOptions &);
+      TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::StartupOptions &);
+      TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformation &);
+      TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformation &);
 
 #if !defined _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_
-#define _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_
+      #define _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const ImplementationRepository::ServerInformationList &
-  );
-TAO_PortableServer_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    ImplementationRepository::ServerInformationList &
-  );
+          TAO_OutputCDR &,
+          const ImplementationRepository::ServerInformationList &
+        );
+      TAO_PortableServer_Export CORBA::Boolean operator>> (
+          TAO_InputCDR &,
+          ImplementationRepository::ServerInformationList &
+        );
 
 #endif /* _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_ */
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration_ptr );
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration_ptr &);
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration::AlreadyRegistered &);
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration::AlreadyRegistered &);
+      TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration_ptr );
+      TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration_ptr &);
+      TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration::AlreadyRegistered &);
+      TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration::AlreadyRegistered &);
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration::CannotActivate &);
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration::CannotActivate &);
+            TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration::CannotActivate &);
+      TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration::CannotActivate &);
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration::NotFound &);
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration::NotFound &);
+            TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration::NotFound &);
+      TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration::NotFound &);
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformationIterator_ptr );
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformationIterator_ptr &);
+            TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformationIterator_ptr );
+      TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformationIterator_ptr &);
 
-#endif /* __ACE_INLINE__ */
+      #endif /* __ACE_INLINE__ */
 
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/PortableServer/ImplRepoC.i b/TAO/tao/PortableServer/ImplRepoC.i
index 5c61c8c9abd..3e1070e7cfe 100644
--- a/TAO/tao/PortableServer/ImplRepoC.i
+++ b/TAO/tao/PortableServer/ImplRepoC.i
@@ -275,176 +275,176 @@ ImplementationRepository::EnvironmentVariable_out::operator-> (void)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CI_
 
-  // = Static operations.
-  ACE_INLINE ImplementationRepository::EnvironmentVariable *
-  ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (CORBA::ULong size)
-  // Allocate storage for the sequence.
-  {
-    ImplementationRepository::EnvironmentVariable *retval = 0;
-    ACE_NEW_RETURN (retval, ImplementationRepository::EnvironmentVariable[size], 0);
-    return retval;
-  }
-  
-  ACE_INLINE void ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (ImplementationRepository::EnvironmentVariable *buffer)
-  // Free the sequence.
-  {
-    delete [] buffer;
-  }
-  
-  ACE_INLINE
-  ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void) // Default constructor.
-  {
-  }
-  
-  ACE_INLINE
-  ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum,
-    CORBA::ULong length,
-    ImplementationRepository::EnvironmentVariable *data,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-  {
-  }
-  
-  ACE_INLINE
-  ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (const _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &rhs)
-  // Copy constructor.
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    if (rhs.buffer_ != 0)
-    {
-      ImplementationRepository::EnvironmentVariable *tmp1 = _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (this->maximum_);
-      ImplementationRepository::EnvironmentVariable * const tmp2 = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp1[i] = tmp2[i];
-      
-      this->buffer_ = tmp1;
-    }
-    else
-    {
-      this->buffer_ = 0;
-    }
-  }
-  
-  ACE_INLINE ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &
-  ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::operator= (const _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &rhs)
-  // Assignment operator.
+// = Static operations.
+ACE_INLINE ImplementationRepository::EnvironmentVariable *
+ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (CORBA::ULong size)
+// Allocate storage for the sequence.
+{
+  ImplementationRepository::EnvironmentVariable *retval = 0;
+  ACE_NEW_RETURN (retval, ImplementationRepository::EnvironmentVariable[size], 0);
+  return retval;
+}
+
+ACE_INLINE void ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (ImplementationRepository::EnvironmentVariable *buffer)
+// Free the sequence.
+{
+  delete [] buffer;
+}
+
+ACE_INLINE
+ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void) // Default constructor.
+{
+}
+
+ACE_INLINE
+ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum) // Constructor using a maximum length value.
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum,
+  CORBA::ULong length,
+  ImplementationRepository::EnvironmentVariable *data,
+  CORBA::Boolean release)
+: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+{
+}
+
+ACE_INLINE
+ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (const _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &rhs)
+// Copy constructor.
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
   {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-      {
-        // free the old buffer
-        ImplementationRepository::EnvironmentVariable *tmp = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *, this->buffer_);
-        _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    ImplementationRepository::EnvironmentVariable *tmp1 = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *, this->buffer_);
+    ImplementationRepository::EnvironmentVariable *tmp1 = _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (this->maximum_);
     ImplementationRepository::EnvironmentVariable * const tmp2 = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable * ACE_CAST_CONST, rhs.buffer_);
     
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
     
-    return *this;
+    this->buffer_ = tmp1;
   }
-  
-  // = Accessors.
-  ACE_INLINE ImplementationRepository::EnvironmentVariable &
-  ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::operator[] (CORBA::ULong i)
-  // operator []
+  else
   {
-    ACE_ASSERT (i < this->maximum_);
-    ImplementationRepository::EnvironmentVariable* tmp = ACE_reinterpret_cast(ImplementationRepository::EnvironmentVariable*,this->buffer_);
-    return tmp[i];
+    this->buffer_ = 0;
   }
+}
+
+ACE_INLINE ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &
+ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::operator= (const _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &rhs)
+// Assignment operator.
+{
+  if (this == &rhs)
+    return *this;
   
-  ACE_INLINE const ImplementationRepository::EnvironmentVariable &
-  ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::operator[] (CORBA::ULong i) const
-  // operator []
+  if (this->release_)
   {
-    ACE_ASSERT (i < this->maximum_);
-    ImplementationRepository::EnvironmentVariable * const tmp = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable* ACE_CAST_CONST, this->buffer_);
-    return tmp[i];
+    if (this->maximum_ < rhs.maximum_)
+    {
+      // free the old buffer
+      ImplementationRepository::EnvironmentVariable *tmp = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *, this->buffer_);
+      _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (tmp);
+      this->buffer_ = _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (rhs.maximum_);
+    }
   }
+  else
+    this->buffer_ = _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (rhs.maximum_);
+  
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  ImplementationRepository::EnvironmentVariable *tmp1 = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *, this->buffer_);
+  ImplementationRepository::EnvironmentVariable * const tmp2 = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable * ACE_CAST_CONST, rhs.buffer_);
   
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    tmp1[i] = tmp2[i];
   
-  ACE_INLINE ImplementationRepository::EnvironmentVariable *
-  ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::get_buffer (CORBA::Boolean orphan)
+  return *this;
+}
+
+// = Accessors.
+ACE_INLINE ImplementationRepository::EnvironmentVariable &
+ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::operator[] (CORBA::ULong i)
+// operator []
+{
+  ACE_ASSERT (i < this->maximum_);
+  ImplementationRepository::EnvironmentVariable* tmp = ACE_reinterpret_cast(ImplementationRepository::EnvironmentVariable*,this->buffer_);
+  return tmp[i];
+}
+
+ACE_INLINE const ImplementationRepository::EnvironmentVariable &
+ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::operator[] (CORBA::ULong i) const
+// operator []
+{
+  ACE_ASSERT (i < this->maximum_);
+  ImplementationRepository::EnvironmentVariable * const tmp = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable* ACE_CAST_CONST, this->buffer_);
+  return tmp[i];
+}
+
+// Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+ACE_INLINE ImplementationRepository::EnvironmentVariable *
+ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::get_buffer (CORBA::Boolean orphan)
+{
+  ImplementationRepository::EnvironmentVariable *result = 0;
+  if (orphan == 0)
   {
-    ImplementationRepository::EnvironmentVariable *result = 0;
-    if (orphan == 0)
+    // We retain ownership.
+    if (this->buffer_ == 0)
     {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (this->length_);
-        this->buffer_ = result;
-        this->release_ = 1;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable*, this->buffer_);
-      }
+      result = _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (this->length_);
+      this->buffer_ = result;
+      this->release_ = 1;
     }
-    else // if (orphan == 1)
+    else
     {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(ImplementationRepository::EnvironmentVariable*,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
+      result = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable*, this->buffer_);
     }
-    return result;
   }
-  
-  ACE_INLINE const ImplementationRepository::EnvironmentVariable *
-  ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const ImplementationRepository::EnvironmentVariable * ACE_CAST_CONST, this->buffer_);
-  }
-  
-  ACE_INLINE void
-  ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::replace (CORBA::ULong max,
-  CORBA::ULong length,
-  ImplementationRepository::EnvironmentVariable *data,
-  CORBA::Boolean release)
+  else // if (orphan == 1)
   {
-    this->maximum_ = max;
-    this->length_ = length;
-    if (this->buffer_ && this->release_ == 1)
+    if (this->release_ != 0)
     {
-      ImplementationRepository::EnvironmentVariable *tmp = ACE_reinterpret_cast(ImplementationRepository::EnvironmentVariable*,this->buffer_);
-      _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (tmp);
+      // We set the state back to default and relinquish
+      // ownership.
+      result = ACE_reinterpret_cast(ImplementationRepository::EnvironmentVariable*,this->buffer_);
+      this->maximum_ = 0;
+      this->length_ = 0;
+      this->buffer_ = 0;
+      this->release_ = 0;
     }
-    this->buffer_ = data;
-    this->release_ = release;
   }
-  
+  return result;
+}
+
+ACE_INLINE const ImplementationRepository::EnvironmentVariable *
+ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::get_buffer (void) const
+{
+  return ACE_reinterpret_cast(const ImplementationRepository::EnvironmentVariable * ACE_CAST_CONST, this->buffer_);
+}
+
+ACE_INLINE void
+ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::replace (CORBA::ULong max,
+CORBA::ULong length,
+ImplementationRepository::EnvironmentVariable *data,
+CORBA::Boolean release)
+{
+  this->maximum_ = max;
+  this->length_ = length;
+  if (this->buffer_ && this->release_ == 1)
+  {
+    ImplementationRepository::EnvironmentVariable *tmp = ACE_reinterpret_cast(ImplementationRepository::EnvironmentVariable*,this->buffer_);
+    _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (tmp);
+  }
+  this->buffer_ = data;
+  this->release_ = release;
+}
+
 #endif /* end #if !defined */
 
 
@@ -1055,176 +1055,176 @@ ImplementationRepository::ServerInformation_out::operator-> (void)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CI_
 
-  // = Static operations.
-  ACE_INLINE ImplementationRepository::ServerInformation *
-  ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (CORBA::ULong size)
-  // Allocate storage for the sequence.
-  {
-    ImplementationRepository::ServerInformation *retval = 0;
-    ACE_NEW_RETURN (retval, ImplementationRepository::ServerInformation[size], 0);
-    return retval;
-  }
-  
-  ACE_INLINE void ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (ImplementationRepository::ServerInformation *buffer)
-  // Free the sequence.
-  {
-    delete [] buffer;
-  }
-  
-  ACE_INLINE
-  ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void) // Default constructor.
-  {
-  }
-  
-  ACE_INLINE
-  ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum,
-    CORBA::ULong length,
-    ImplementationRepository::ServerInformation *data,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-  {
-  }
-  
-  ACE_INLINE
-  ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (const _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &rhs)
-  // Copy constructor.
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    if (rhs.buffer_ != 0)
-    {
-      ImplementationRepository::ServerInformation *tmp1 = _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (this->maximum_);
-      ImplementationRepository::ServerInformation * const tmp2 = ACE_reinterpret_cast (ImplementationRepository::ServerInformation * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp1[i] = tmp2[i];
-      
-      this->buffer_ = tmp1;
-    }
-    else
-    {
-      this->buffer_ = 0;
-    }
-  }
-  
-  ACE_INLINE ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &
-  ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::operator= (const _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &rhs)
-  // Assignment operator.
+// = Static operations.
+ACE_INLINE ImplementationRepository::ServerInformation *
+ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (CORBA::ULong size)
+// Allocate storage for the sequence.
+{
+  ImplementationRepository::ServerInformation *retval = 0;
+  ACE_NEW_RETURN (retval, ImplementationRepository::ServerInformation[size], 0);
+  return retval;
+}
+
+ACE_INLINE void ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (ImplementationRepository::ServerInformation *buffer)
+// Free the sequence.
+{
+  delete [] buffer;
+}
+
+ACE_INLINE
+ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void) // Default constructor.
+{
+}
+
+ACE_INLINE
+ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum) // Constructor using a maximum length value.
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum,
+  CORBA::ULong length,
+  ImplementationRepository::ServerInformation *data,
+  CORBA::Boolean release)
+: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+{
+}
+
+ACE_INLINE
+ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (const _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &rhs)
+// Copy constructor.
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
   {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-      {
-        // free the old buffer
-        ImplementationRepository::ServerInformation *tmp = ACE_reinterpret_cast (ImplementationRepository::ServerInformation *, this->buffer_);
-        _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    ImplementationRepository::ServerInformation *tmp1 = ACE_reinterpret_cast (ImplementationRepository::ServerInformation *, this->buffer_);
+    ImplementationRepository::ServerInformation *tmp1 = _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (this->maximum_);
     ImplementationRepository::ServerInformation * const tmp2 = ACE_reinterpret_cast (ImplementationRepository::ServerInformation * ACE_CAST_CONST, rhs.buffer_);
     
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
     
-    return *this;
+    this->buffer_ = tmp1;
   }
-  
-  // = Accessors.
-  ACE_INLINE ImplementationRepository::ServerInformation &
-  ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::operator[] (CORBA::ULong i)
-  // operator []
+  else
   {
-    ACE_ASSERT (i < this->maximum_);
-    ImplementationRepository::ServerInformation* tmp = ACE_reinterpret_cast(ImplementationRepository::ServerInformation*,this->buffer_);
-    return tmp[i];
+    this->buffer_ = 0;
   }
+}
+
+ACE_INLINE ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &
+ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::operator= (const _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &rhs)
+// Assignment operator.
+{
+  if (this == &rhs)
+    return *this;
   
-  ACE_INLINE const ImplementationRepository::ServerInformation &
-  ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::operator[] (CORBA::ULong i) const
-  // operator []
+  if (this->release_)
   {
-    ACE_ASSERT (i < this->maximum_);
-    ImplementationRepository::ServerInformation * const tmp = ACE_reinterpret_cast (ImplementationRepository::ServerInformation* ACE_CAST_CONST, this->buffer_);
-    return tmp[i];
+    if (this->maximum_ < rhs.maximum_)
+    {
+      // free the old buffer
+      ImplementationRepository::ServerInformation *tmp = ACE_reinterpret_cast (ImplementationRepository::ServerInformation *, this->buffer_);
+      _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (tmp);
+      this->buffer_ = _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (rhs.maximum_);
+    }
   }
+  else
+    this->buffer_ = _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (rhs.maximum_);
+  
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  ImplementationRepository::ServerInformation *tmp1 = ACE_reinterpret_cast (ImplementationRepository::ServerInformation *, this->buffer_);
+  ImplementationRepository::ServerInformation * const tmp2 = ACE_reinterpret_cast (ImplementationRepository::ServerInformation * ACE_CAST_CONST, rhs.buffer_);
   
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    tmp1[i] = tmp2[i];
   
-  ACE_INLINE ImplementationRepository::ServerInformation *
-  ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::get_buffer (CORBA::Boolean orphan)
+  return *this;
+}
+
+// = Accessors.
+ACE_INLINE ImplementationRepository::ServerInformation &
+ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::operator[] (CORBA::ULong i)
+// operator []
+{
+  ACE_ASSERT (i < this->maximum_);
+  ImplementationRepository::ServerInformation* tmp = ACE_reinterpret_cast(ImplementationRepository::ServerInformation*,this->buffer_);
+  return tmp[i];
+}
+
+ACE_INLINE const ImplementationRepository::ServerInformation &
+ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::operator[] (CORBA::ULong i) const
+// operator []
+{
+  ACE_ASSERT (i < this->maximum_);
+  ImplementationRepository::ServerInformation * const tmp = ACE_reinterpret_cast (ImplementationRepository::ServerInformation* ACE_CAST_CONST, this->buffer_);
+  return tmp[i];
+}
+
+// Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+ACE_INLINE ImplementationRepository::ServerInformation *
+ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::get_buffer (CORBA::Boolean orphan)
+{
+  ImplementationRepository::ServerInformation *result = 0;
+  if (orphan == 0)
   {
-    ImplementationRepository::ServerInformation *result = 0;
-    if (orphan == 0)
+    // We retain ownership.
+    if (this->buffer_ == 0)
     {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (this->length_);
-        this->buffer_ = result;
-        this->release_ = 1;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (ImplementationRepository::ServerInformation*, this->buffer_);
-      }
+      result = _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (this->length_);
+      this->buffer_ = result;
+      this->release_ = 1;
     }
-    else // if (orphan == 1)
+    else
     {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(ImplementationRepository::ServerInformation*,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
+      result = ACE_reinterpret_cast (ImplementationRepository::ServerInformation*, this->buffer_);
     }
-    return result;
   }
-  
-  ACE_INLINE const ImplementationRepository::ServerInformation *
-  ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const ImplementationRepository::ServerInformation * ACE_CAST_CONST, this->buffer_);
-  }
-  
-  ACE_INLINE void
-  ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::replace (CORBA::ULong max,
-  CORBA::ULong length,
-  ImplementationRepository::ServerInformation *data,
-  CORBA::Boolean release)
+  else // if (orphan == 1)
   {
-    this->maximum_ = max;
-    this->length_ = length;
-    if (this->buffer_ && this->release_ == 1)
+    if (this->release_ != 0)
     {
-      ImplementationRepository::ServerInformation *tmp = ACE_reinterpret_cast(ImplementationRepository::ServerInformation*,this->buffer_);
-      _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (tmp);
+      // We set the state back to default and relinquish
+      // ownership.
+      result = ACE_reinterpret_cast(ImplementationRepository::ServerInformation*,this->buffer_);
+      this->maximum_ = 0;
+      this->length_ = 0;
+      this->buffer_ = 0;
+      this->release_ = 0;
     }
-    this->buffer_ = data;
-    this->release_ = release;
   }
-  
+  return result;
+}
+
+ACE_INLINE const ImplementationRepository::ServerInformation *
+ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::get_buffer (void) const
+{
+  return ACE_reinterpret_cast(const ImplementationRepository::ServerInformation * ACE_CAST_CONST, this->buffer_);
+}
+
+ACE_INLINE void
+ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::replace (CORBA::ULong max,
+CORBA::ULong length,
+ImplementationRepository::ServerInformation *data,
+CORBA::Boolean release)
+{
+  this->maximum_ = max;
+  this->length_ = length;
+  if (this->buffer_ && this->release_ == 1)
+  {
+    ImplementationRepository::ServerInformation *tmp = ACE_reinterpret_cast(ImplementationRepository::ServerInformation*,this->buffer_);
+    _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (tmp);
+  }
+  this->buffer_ = data;
+  this->release_ = release;
+}
+
 #endif /* end #if !defined */
 
 
diff --git a/TAO/tao/PortableServer/ImplRepoS.cpp b/TAO/tao/PortableServer/ImplRepoS.cpp
index d790fced7bf..dfc4ce19f1d 100644
--- a/TAO/tao/PortableServer/ImplRepoS.cpp
+++ b/TAO/tao/PortableServer/ImplRepoS.cpp
@@ -19,10 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_ORIG_IMPLREPOS_CPP_
-#define _TAO_IDL_ORIG_IMPLREPOS_CPP_
+#ifndef _TAO_IDL_IMPLREPOS_CPP_
+#define _TAO_IDL_IMPLREPOS_CPP_
 
 #include "ImplRepoS.h"
+
 #include "tao/PortableServer/Object_Adapter.h"
 #include "tao/PortableServer/Operation_Table.h"
 #include "tao/TAO_Server_Request.h"
@@ -30,12 +31,14 @@
 #include "tao/Stub.h"
 #include "tao/IFR_Client_Adapter.h"
 #include "tao/PortableInterceptor.h"
-#include "ace/Dynamic_Service.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
+#include "tao/PortableServer/ServerRequestInfo.h"
+#include "tao/PortableServer/ServerInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+#include "ace/Dynamic_Service.h"
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus
 #endif /* __BORLANDC__ */
@@ -51,9 +54,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 16:33:09 */
+/* starting time is 17:40:16 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/sirion/coryan/head/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -146,9 +149,237 @@ TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::lookup (const ch
     }
   return 0;
 }
-/* ending time is 16:33:09 */
+/* ending time is 17:40:16 */
 static TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable tao_ImplementationRepository_ServerObject_optable;
 
+#if (TAO_HAS_INTERCEPTORS == 1)
+class TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping : public TAO_ServerRequestInfo
+{
+public:
+  TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::ServerObject *tao_impl
+    ,
+    CORBA::Environment &ACE_TRY_ENV = 
+      TAO_default_environment ()
+  );
+
+  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));
+  
+  virtual char * target_most_derived_interface (
+      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id,
+      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  
+private:
+  TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping &);
+  void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping &);
+  
+private:
+  POA_ImplementationRepository::ServerObject *_tao_impl;
+  
+};
+
+TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    POA_ImplementationRepository::ServerObject *tao_impl,
+    CORBA::Environment &
+  )
+  : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
+    _tao_impl (tao_impl)
+{}
+
+Dynamic::ParameterList *
+TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::arguments (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  return parameter_list;
+}
+
+Dynamic::ExceptionList *
+TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::exceptions (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  return exception_list;
+}
+
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  return result_any;
+}
+
+char *
+TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::target_most_derived_interface (
+    CORBA::Environment &)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return
+    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
+}
+
+CORBA::Boolean
+TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::target_is_a (
+    const char * id,
+    CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+}
+
+class TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown : public TAO_ServerRequestInfo
+{
+public:
+  TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::ServerObject *tao_impl
+    ,
+    CORBA::Environment &ACE_TRY_ENV = 
+      TAO_default_environment ()
+  );
+
+  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));
+  
+  virtual char * target_most_derived_interface (
+      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id,
+      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  
+private:
+  TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown &);
+  void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown &);
+  
+private:
+  POA_ImplementationRepository::ServerObject *_tao_impl;
+  
+};
+
+TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    POA_ImplementationRepository::ServerObject *tao_impl,
+    CORBA::Environment &
+  )
+  : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
+    _tao_impl (tao_impl)
+{}
+
+Dynamic::ParameterList *
+TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::arguments (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  return parameter_list;
+}
+
+Dynamic::ExceptionList *
+TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::exceptions (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  return exception_list;
+}
+
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  return result_any;
+}
+
+char *
+TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::target_most_derived_interface (
+    CORBA::Environment &)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return
+    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
+}
+
+CORBA::Boolean
+TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::target_is_a (
+    const char * id,
+    CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+}
+
+#endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
 //            Strategized Proxy Broker Implementation
@@ -253,17 +484,15 @@ ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function (CORBA:
 }
 
 int
-ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer (long _dummy_)
+ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer (long)
 {
-  ACE_UNUSED_ARG (_dummy_);
-
-  ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer =
+  ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer = 
     ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function;
-
+  
   return 0;
 }
 
-static int ImplementationRepository__TAO_ServerObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+static int ImplementationRepository__TAO_ServerObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
   ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer));
 
 
@@ -405,53 +634,48 @@ POA_ImplementationRepository::ServerObject::~ServerObject (void)
 void POA_ImplementationRepository::ServerObject::ping_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void * /* context */,
+    void *_tao_servant_upcall,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *)_tao_object_reference;
-
+  POA_ImplementationRepository::ServerObject *_tao_impl =
+    ACE_static_cast (POA_ImplementationRepository::ServerObject *, _tao_object_reference);
+  
   _tao_server_request.argument_flag (0);
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
-  POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping ri (
+  
+  TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping ri (
       _tao_server_request,
+      _tao_upcall,
       _tao_impl,
       ACE_TRY_ENV
     );
-
+  
   ACE_TRY
     {
       _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       _tao_impl->ping (
           ACE_TRY_ENV
         );
       TAO_INTERCEPTOR_CHECK;
-
+      
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
       _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc);
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
@@ -460,14 +684,24 @@ void POA_ImplementationRepository::ServerObject::ping_skel (
           ACE_TRY_ENV
         );
       ACE_TRY_CHECK;
-      ACE_RE_THROW;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        ri.reply_status (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+          || _tao_status == PortableInterceptor::USER_EXCEPTION)
+        ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -475,53 +709,48 @@ void POA_ImplementationRepository::ServerObject::ping_skel (
 void POA_ImplementationRepository::ServerObject::shutdown_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void * /* context */,
+    void *_tao_servant_upcall,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *)_tao_object_reference;
-
+  POA_ImplementationRepository::ServerObject *_tao_impl =
+    ACE_static_cast (POA_ImplementationRepository::ServerObject *, _tao_object_reference);
+  
   _tao_server_request.argument_flag (0);
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
-  POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown ri (
+  
+  TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown ri (
       _tao_server_request,
+      _tao_upcall,
       _tao_impl,
       ACE_TRY_ENV
     );
-
+  
   ACE_TRY
     {
       _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       _tao_impl->shutdown (
           ACE_TRY_ENV
         );
       TAO_INTERCEPTOR_CHECK;
-
+      
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
       _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc);
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
@@ -530,22 +759,32 @@ void POA_ImplementationRepository::ServerObject::shutdown_skel (
           ACE_TRY_ENV
         );
       ACE_TRY_CHECK;
-      ACE_RE_THROW;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        ri.reply_status (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+          || _tao_status == PortableInterceptor::USER_EXCEPTION)
+        ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_ImplementationRepository::ServerObject::_is_a_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
-    void * /* context */,
+    void * /* Servant_Upcall */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -568,7 +807,7 @@ void POA_ImplementationRepository::ServerObject::_is_a_skel (
 void POA_ImplementationRepository::ServerObject::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* context */,
+    void * /* Servant_Upcall */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -585,7 +824,7 @@ void POA_ImplementationRepository::ServerObject::_non_existent_skel (
 void POA_ImplementationRepository::ServerObject::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* context */,
+    void * /* Servant_Upcall */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -657,11 +896,15 @@ void* POA_ImplementationRepository::ServerObject::_downcast (
   return 0;
 }
 
-void POA_ImplementationRepository::ServerObject::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_ImplementationRepository::ServerObject::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
 {
-  this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
+  this->synchronous_upcall_dispatch (req,
+                                     servant_upcall,
+                                     this,
+                                     ACE_TRY_ENV);
 }
 
+
 const char* POA_ImplementationRepository::ServerObject::_interface_repository_id (void) const
 {
   return "IDL:ImplementationRepository/ServerObject:1.0";
@@ -672,55 +915,252 @@ POA_ImplementationRepository::ServerObject::_this (CORBA_Environment &ACE_TRY_EN
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-
+  
+  TAO_Stub_Auto_Ptr safe_stub (stub);
+  
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+  
   if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
   else
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-
+  
   CORBA::Object_var obj = tmp;
+  
+  (void) safe_stub.release ();
+  
   return ::ImplementationRepository::ServerObject::_unchecked_narrow (obj.in ());
 }
 
 
+class TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
+{
+private:
+  unsigned int hash (const char *str, unsigned int len);
+public:
+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+};
+/* starting time is 17:40:16 */
+/* C++ code produced by gperf version 2.8 (ACE version) */
+/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable -N lookup  */
+unsigned int
+TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
+{
+  static const unsigned char asso_values[] =
+    {
+#if defined (ACE_MVS)
+     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+     29, 29, 29, 29, 29, 29, 29, 29, 29,  0,
+     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+     29, 29, 29, 29, 29, 29, 29, 29, 29,  4,
+     29, 29,  0,  0,  0,  0, 29, 29, 29, 29,
+     29, 29, 29, 29, 29, 29, 29,  5, 29,  0,
+     29, 29, 29,  0, 29, 29, 29, 29, 29, 29,
+     29, 29,  5,  5, 29, 29, 29, 29, 29, 29,
+     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+     29, 29, 29, 29, 29, 29,
+#else
+     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+     29, 29, 29, 29, 29,  0, 29,  4, 29, 29,
+      0,  0,  0,  0, 29, 29, 29, 29,  5, 29,
+      0, 29, 29, 29,  0,  5,  5, 29, 29, 29,
+     29, 29, 29, 29, 29, 29, 29, 29,
+#endif /* ACE_MVS */
+    };
+  return len + asso_values[str[len - 1]] + asso_values[str[0]];
+}
+
+const class TAO_operation_db_entry *
+TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
+{
+  enum
+    {
+      TOTAL_KEYWORDS = 12,
+      MIN_WORD_LENGTH = 4,
+      MAX_WORD_LENGTH = 23,
+      MIN_HASH_VALUE = 4,
+      MAX_HASH_VALUE = 28,
+      HASH_VALUE_RANGE = 25,
+      DUPLICATES = 0
+    };
+
+  static const class TAO_operation_db_entry  wordlist[] =
+    {
+      {"",0},{"",0},{"",0},{"",0},
+      {"find", 	&POA_ImplementationRepository::Administration::find_skel},
+      {"",0},{"",0},{"",0},{"",0},
+      {"_is_a",  &POA_ImplementationRepository::Administration::_is_a_skel},
+      {"_interface",  &POA_ImplementationRepository::Administration::_interface_skel},
+      {"",0},{"",0},
+      {"remove_server", 	&POA_ImplementationRepository::Administration::remove_server_skel},
+      {"list", 	&POA_ImplementationRepository::Administration::list_skel},
+      {"register_server", 	&POA_ImplementationRepository::Administration::register_server_skel},
+      {"",0},
+      {"reregister_server", 	&POA_ImplementationRepository::Administration::reregister_server_skel},
+      {"_non_existent",  &POA_ImplementationRepository::Administration::_non_existent_skel},
+      {"activate_server", 	&POA_ImplementationRepository::Administration::activate_server_skel},
+      {"shutdown_server", 	&POA_ImplementationRepository::Administration::shutdown_server_skel},
+      {"",0},
+      {"server_is_running", 	&POA_ImplementationRepository::Administration::server_is_running_skel},
+      {"",0},{"",0},{"",0},{"",0},{"",0},
+      {"server_is_shutting_down", 	&POA_ImplementationRepository::Administration::server_is_shutting_down_skel},
+    };
+
+  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+    {
+      unsigned int key = hash (str, len);
+
+      if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
+        {
+          const char *s = wordlist[key].opname_;
+
+          if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
+            return &wordlist[key];
+        }
+    }
+  return 0;
+}
+/* ending time is 17:40:16 */
+static TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable tao_ImplementationRepository_Administration_optable;
+
 #if (TAO_HAS_INTERCEPTORS == 1)
-POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping (
+class TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server : public TAO_ServerRequestInfo
+{
+public:
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server (
     TAO_ServerRequest &_tao_server_request,
-    POA_ImplementationRepository::ServerObject *tao_impl,
+    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
+    ,
+    const char * server,
+    CORBA::Environment &ACE_TRY_ENV = 
+      TAO_default_environment ()
+  );
+
+  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));
+  
+  virtual char * target_most_derived_interface (
+      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id,
+      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  
+private:
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server &);
+  void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server &);
+  
+private:
+  POA_ImplementationRepository::Administration *_tao_impl;
+  const char * server_;
+  
+};
+
+TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    POA_ImplementationRepository::Administration *tao_impl,
+    const char * server,
     CORBA::Environment &
   )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
+  : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
+    _tao_impl (tao_impl),
+    server_ (server)
 {}
 
 Dynamic::ParameterList *
-POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::arguments (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-
-  return parameter_list;
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+  
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::exceptions (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
+  
+  Dynamic::ExceptionList_var safe_exception_list = exception_list;
+    
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata[] = 
+  {
+    {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc},
+    {ImplementationRepository::Administration::_tc_CannotActivate, ImplementationRepository::Administration::CannotActivate::_alloc}
+  };
+  
+  exception_list->length (2);
+  for (CORBA::ULong i = 0; i < 2; ++i)
+    {
+      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_activate_server_exceptiondata[i].tc;
+      TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1);
+      (*exception_list)[i] = tcp_object;
+    }
 
-  return exception_list;
+  return safe_exception_list._retn ();
 }
 
-CORBA::Any *
-POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -728,12 +1168,12 @@ POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_Implementation
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
 char *
-POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::target_most_derived_interface (
+TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::target_most_derived_interface (
     CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -742,7 +1182,7 @@ POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_Implementation
 }
 
 CORBA::Boolean
-POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::target_is_a (
+TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::target_is_a (
     const char * id,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -750,41 +1190,125 @@ POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_Implementation
   return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
 }
 
-POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown (
+class TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server : public TAO_ServerRequestInfo
+{
+public:
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server (
     TAO_ServerRequest &_tao_server_request,
-    POA_ImplementationRepository::ServerObject *tao_impl,
+    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
+    ,
+    const char * server,
+    const ImplementationRepository::StartupOptions & options,
+    CORBA::Environment &ACE_TRY_ENV = 
+      TAO_default_environment ()
+  );
+
+  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));
+  
+  virtual char * target_most_derived_interface (
+      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id,
+      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  
+private:
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server &);
+  void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server &);
+  
+private:
+  POA_ImplementationRepository::Administration *_tao_impl;
+  const char * server_;
+  const ImplementationRepository::StartupOptions & options_;
+  
+};
+
+TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    POA_ImplementationRepository::Administration *tao_impl,
+    const char * server,
+    const ImplementationRepository::StartupOptions & options,
     CORBA::Environment &
   )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
+  : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
+    _tao_impl (tao_impl),
+    server_ (server),
+    options_ (options)
 {}
 
 Dynamic::ParameterList *
-POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::arguments (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-
-  return parameter_list;
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+  
+  parameter_list->length (2);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->options_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::exceptions (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
+  
+  Dynamic::ExceptionList_var safe_exception_list = exception_list;
+    
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata[] = 
+  {
+    {ImplementationRepository::Administration::_tc_AlreadyRegistered, ImplementationRepository::Administration::AlreadyRegistered::_alloc}
+  };
+  
+  exception_list->length (1);
+  for (CORBA::ULong i = 0; i < 1; ++i)
+    {
+      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_register_server_exceptiondata[i].tc;
+      TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1);
+      (*exception_list)[i] = tcp_object;
+    }
 
-  return exception_list;
+  return safe_exception_list._retn ();
 }
 
-CORBA::Any *
-POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -792,12 +1316,12 @@ POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_Implementation
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
 char *
-POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::target_most_derived_interface (
+TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::target_most_derived_interface (
     CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -806,7 +1330,7 @@ POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_Implementation
 }
 
 CORBA::Boolean
-POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::target_is_a (
+TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::target_is_a (
     const char * id,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -814,121 +1338,1002 @@ POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_Implementation
   return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-class TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
+class TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server : public TAO_ServerRequestInfo
 {
+public:
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
+    ,
+    const char * server,
+    const ImplementationRepository::StartupOptions & options,
+    CORBA::Environment &ACE_TRY_ENV = 
+      TAO_default_environment ()
+  );
+
+  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));
+  
+  virtual char * target_most_derived_interface (
+      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id,
+      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  
 private:
-  unsigned int hash (const char *str, unsigned int len);
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server &);
+  void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server &);
+  
+private:
+  POA_ImplementationRepository::Administration *_tao_impl;
+  const char * server_;
+  const ImplementationRepository::StartupOptions & options_;
+  
+};
+
+TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    POA_ImplementationRepository::Administration *tao_impl,
+    const char * server,
+    const ImplementationRepository::StartupOptions & options,
+    CORBA::Environment &
+  )
+  : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
+    _tao_impl (tao_impl),
+    server_ (server),
+    options_ (options)
+{}
+
+Dynamic::ParameterList *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::arguments (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+  
+  parameter_list->length (2);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->options_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::exceptions (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  return exception_list;
+}
+
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  return result_any;
+}
+
+char *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::target_most_derived_interface (
+    CORBA::Environment &)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return
+    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
+}
+
+CORBA::Boolean
+TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::target_is_a (
+    const char * id,
+    CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+}
+
+class TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server : public TAO_ServerRequestInfo
+{
 public:
- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
+    ,
+    const char * server,
+    CORBA::Environment &ACE_TRY_ENV = 
+      TAO_default_environment ()
+  );
+
+  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));
+  
+  virtual char * target_most_derived_interface (
+      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id,
+      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  
+private:
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server &);
+  void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server &);
+  
+private:
+  POA_ImplementationRepository::Administration *_tao_impl;
+  const char * server_;
+  
 };
-/* starting time is 16:33:09 */
-/* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/sirion/coryan/head/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
+
+TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    POA_ImplementationRepository::Administration *tao_impl,
+    const char * server,
+    CORBA::Environment &
+  )
+  : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
+    _tao_impl (tao_impl),
+    server_ (server)
+{}
+
+Dynamic::ParameterList *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::arguments (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  static const unsigned char asso_values[] =
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+  
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::exceptions (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ExceptionList_var safe_exception_list = exception_list;
+    
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata[] = 
+  {
+    {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
+  };
+  
+  exception_list->length (1);
+  for (CORBA::ULong i = 0; i < 1; ++i)
     {
-#if defined (ACE_MVS)
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29,  0,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29,  4,
-     29, 29,  0,  0,  0,  0, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29,  5, 29,  0,
-     29, 29, 29,  0, 29, 29, 29, 29, 29, 29,
-     29, 29,  5,  5, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29,
-#else
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29,  0, 29,  4, 29, 29,
-      0,  0,  0,  0, 29, 29, 29, 29,  5, 29,
-      0, 29, 29, 29,  0,  5,  5, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29,
-#endif /* ACE_MVS */
-    };
-  return len + asso_values[str[len - 1]] + asso_values[str[0]];
+      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_remove_server_exceptiondata[i].tc;
+      TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1);
+      (*exception_list)[i] = tcp_object;
+    }
+
+  return safe_exception_list._retn ();
 }
 
-const class TAO_operation_db_entry *
-TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  enum
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  return result_any;
+}
+
+char *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::target_most_derived_interface (
+    CORBA::Environment &)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return
+    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
+}
+
+CORBA::Boolean
+TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::target_is_a (
+    const char * id,
+    CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+}
+
+class TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server : public TAO_ServerRequestInfo
+{
+public:
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
+    ,
+    const char * server,
+    CORBA::Environment &ACE_TRY_ENV = 
+      TAO_default_environment ()
+  );
+
+  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));
+  
+  virtual char * target_most_derived_interface (
+      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id,
+      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  
+private:
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server &);
+  void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server &);
+  
+private:
+  POA_ImplementationRepository::Administration *_tao_impl;
+  const char * server_;
+  
+};
+
+TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    POA_ImplementationRepository::Administration *tao_impl,
+    const char * server,
+    CORBA::Environment &
+  )
+  : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
+    _tao_impl (tao_impl),
+    server_ (server)
+{}
+
+Dynamic::ParameterList *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::arguments (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+  
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::exceptions (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ExceptionList_var safe_exception_list = exception_list;
+    
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[] = 
+  {
+    {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
+  };
+  
+  exception_list->length (1);
+  for (CORBA::ULong i = 0; i < 1; ++i)
     {
-      TOTAL_KEYWORDS = 12,
-      MIN_WORD_LENGTH = 4,
-      MAX_WORD_LENGTH = 23,
-      MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 28,
-      HASH_VALUE_RANGE = 25,
-      DUPLICATES = 0
-    };
+      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[i].tc;
+      TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1);
+      (*exception_list)[i] = tcp_object;
+    }
 
-  static const class TAO_operation_db_entry  wordlist[] =
+  return safe_exception_list._retn ();
+}
+
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  return result_any;
+}
+
+char *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::target_most_derived_interface (
+    CORBA::Environment &)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return
+    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
+}
+
+CORBA::Boolean
+TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::target_is_a (
+    const char * id,
+    CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+}
+
+class TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running : public TAO_ServerRequestInfo
+{
+public:
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
+    ,
+    const char * server,
+    const char * addr,
+    ImplementationRepository::ServerObject_ptr server_object,
+    CORBA::Environment &ACE_TRY_ENV = 
+      TAO_default_environment ()
+  );
+
+  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));
+  
+  virtual char * target_most_derived_interface (
+      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id,
+      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  void result (char * result);
+
+private:
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running &);
+  void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running &);
+  
+private:
+  POA_ImplementationRepository::Administration *_tao_impl;
+  const char * server_;
+  const char * addr_;
+  ImplementationRepository::ServerObject_ptr server_object_;
+  char * _result;
+};
+
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    POA_ImplementationRepository::Administration *tao_impl,
+    const char * server,
+    const char * addr,
+    ImplementationRepository::ServerObject_ptr server_object,
+    CORBA::Environment &
+  )
+  : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
+    _tao_impl (tao_impl),
+    server_ (server),
+    addr_ (addr),
+    server_object_ (server_object)
+{}
+
+Dynamic::ParameterList *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::arguments (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+  
+  parameter_list->length (3);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<= addr_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    (*parameter_list)[len].argument <<=  this->server_object_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::exceptions (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ExceptionList_var safe_exception_list = exception_list;
+    
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[] = 
+  {
+    {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
+  };
+  
+  exception_list->length (1);
+  for (CORBA::ULong i = 0; i < 1; ++i)
     {
-      {"",0},{"",0},{"",0},{"",0},
-      {"find",  &POA_ImplementationRepository::Administration::find_skel},
-      {"",0},{"",0},{"",0},{"",0},
-      {"_is_a",  &POA_ImplementationRepository::Administration::_is_a_skel},
-      {"_interface",  &POA_ImplementationRepository::Administration::_interface_skel},
-      {"",0},{"",0},
-      {"remove_server",         &POA_ImplementationRepository::Administration::remove_server_skel},
-      {"list",  &POA_ImplementationRepository::Administration::list_skel},
-      {"register_server",       &POA_ImplementationRepository::Administration::register_server_skel},
-      {"",0},
-      {"reregister_server",     &POA_ImplementationRepository::Administration::reregister_server_skel},
-      {"_non_existent",  &POA_ImplementationRepository::Administration::_non_existent_skel},
-      {"activate_server",       &POA_ImplementationRepository::Administration::activate_server_skel},
-      {"shutdown_server",       &POA_ImplementationRepository::Administration::shutdown_server_skel},
-      {"",0},
-      {"server_is_running",     &POA_ImplementationRepository::Administration::server_is_running_skel},
-      {"",0},{"",0},{"",0},{"",0},{"",0},
-      {"server_is_shutting_down",       &POA_ImplementationRepository::Administration::server_is_shutting_down_skel},
-    };
+      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[i].tc;
+      TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1);
+      (*exception_list)[i] = tcp_object;
+    }
 
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+  return safe_exception_list._retn ();
+}
+
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 0;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  CORBA::Any_var safe_result_any = result_any;
+  
+  (*result_any) <<= this->_result;
+  
+  return safe_result_any._retn ();
+}
+
+char *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::target_most_derived_interface (
+    CORBA::Environment &)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return
+    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
+}
+
+CORBA::Boolean
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::target_is_a (
+    const char * id,
+    CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+}
+
+void 
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::result (char * result)
+{
+  // Update the result.
+   this->_result = result;
+}
+
+class TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down : public TAO_ServerRequestInfo
+{
+public:
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
+    ,
+    const char * server,
+    CORBA::Environment &ACE_TRY_ENV = 
+      TAO_default_environment ()
+  );
+
+  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));
+  
+  virtual char * target_most_derived_interface (
+      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id,
+      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  
+private:
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &);
+  void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &);
+  
+private:
+  POA_ImplementationRepository::Administration *_tao_impl;
+  const char * server_;
+  
+};
+
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    POA_ImplementationRepository::Administration *tao_impl,
+    const char * server,
+    CORBA::Environment &
+  )
+  : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
+    _tao_impl (tao_impl),
+    server_ (server)
+{}
+
+Dynamic::ParameterList *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::arguments (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+  
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::exceptions (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ExceptionList_var safe_exception_list = exception_list;
+    
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[] = 
+  {
+    {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
+  };
+  
+  exception_list->length (1);
+  for (CORBA::ULong i = 0; i < 1; ++i)
     {
-      unsigned int key = hash (str, len);
+      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[i].tc;
+      TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1);
+      (*exception_list)[i] = tcp_object;
+    }
 
-      if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-        {
-          const char *s = wordlist[key].opname_;
+  return safe_exception_list._retn ();
+}
 
-          if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-            return &wordlist[key];
-        }
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  return result_any;
+}
+
+char *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::target_most_derived_interface (
+    CORBA::Environment &)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return
+    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
+}
+
+CORBA::Boolean
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::target_is_a (
+    const char * id,
+    CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+}
+
+class TAO_ServerRequestInfo_ImplementationRepository_Administration_find : public TAO_ServerRequestInfo
+{
+public:
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_find (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
+    ,
+    const char * server,
+    CORBA::Environment &ACE_TRY_ENV = 
+      TAO_default_environment ()
+  );
+
+  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));
+  
+  virtual char * target_most_derived_interface (
+      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id,
+      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  
+private:
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_find (const TAO_ServerRequestInfo_ImplementationRepository_Administration_find &);
+  void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_find &);
+  
+private:
+  POA_ImplementationRepository::Administration *_tao_impl;
+  const char * server_;
+  
+};
+
+TAO_ServerRequestInfo_ImplementationRepository_Administration_find::TAO_ServerRequestInfo_ImplementationRepository_Administration_find (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    POA_ImplementationRepository::Administration *tao_impl,
+    const char * server,
+    CORBA::Environment &
+  )
+  : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
+    _tao_impl (tao_impl),
+    server_ (server)
+{}
+
+Dynamic::ParameterList *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_find::arguments (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+  
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_find::exceptions (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ExceptionList_var safe_exception_list = exception_list;
+    
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata[] = 
+  {
+    {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
+  };
+  
+  exception_list->length (1);
+  for (CORBA::ULong i = 0; i < 1; ++i)
+    {
+      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_find_exceptiondata[i].tc;
+      TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1);
+      (*exception_list)[i] = tcp_object;
     }
-  return 0;
+
+  return safe_exception_list._retn ();
+}
+
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_Administration_find::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  return result_any;
+}
+
+char *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_find::target_most_derived_interface (
+    CORBA::Environment &)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return
+    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
+}
+
+CORBA::Boolean
+TAO_ServerRequestInfo_ImplementationRepository_Administration_find::target_is_a (
+    const char * id,
+    CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+}
+
+class TAO_ServerRequestInfo_ImplementationRepository_Administration_list : public TAO_ServerRequestInfo
+{
+public:
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_list (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
+    ,
+    const CORBA::ULong & how_many    
+,
+    CORBA::Environment &ACE_TRY_ENV = 
+      TAO_default_environment ()
+  );
+
+  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));
+  
+  virtual char * target_most_derived_interface (
+      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id,
+      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  
+private:
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_list (const TAO_ServerRequestInfo_ImplementationRepository_Administration_list &);
+  void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_list &);
+  
+private:
+  POA_ImplementationRepository::Administration *_tao_impl;
+  const CORBA::ULong & how_many_;
+    
+
+};
+
+TAO_ServerRequestInfo_ImplementationRepository_Administration_list::TAO_ServerRequestInfo_ImplementationRepository_Administration_list (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    POA_ImplementationRepository::Administration *tao_impl,
+    const CORBA::ULong & how_many    
+,
+    CORBA::Environment &
+  )
+  : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
+    _tao_impl (tao_impl),
+    how_many_ (how_many)  
+
+{}
+
+Dynamic::ParameterList *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_list::arguments (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+  
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= how_many_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    
+
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_list::exceptions (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  return exception_list;
 }
-/* ending time is 16:33:09 */
-static TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable tao_ImplementationRepository_Administration_optable;
 
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_Administration_list::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  return result_any;
+}
+
+char *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_list::target_most_derived_interface (
+    CORBA::Environment &)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return
+    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
+}
+
+CORBA::Boolean
+TAO_ServerRequestInfo_ImplementationRepository_Administration_list::target_is_a (
+    const char * id,
+    CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+}
+
+#endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
 //            Strategized Proxy Broker Implementation
@@ -945,14 +2350,14 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::_TAO
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
-
+  
 }
 
 POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::~_TAO_Administration_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     delete this->proxy_cache_[i];
-
+  
 }
 
 ImplementationRepository::_TAO_Administration_Proxy_Impl&
@@ -963,25 +2368,25 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::sele
 {
   int strategy =
     TAO_ORB_Core::collocation_strategy (object);
-
+  
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
-
+  
   this->create_proxy (strategy, ACE_TRY_ENV);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-
+  
   return *this->proxy_cache_[strategy];
-
+  
 }
 
-void
+void 
 POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::create_proxy (
     int strategy,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
-
+  
   if (this->proxy_cache_[strategy] == 0)
     {
       switch (strategy)
@@ -994,7 +2399,7 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::crea
           );
           ACE_CHECK;
           break;
-
+          
         case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
@@ -1003,7 +2408,7 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::crea
           );
           ACE_CHECK;
           break;
-
+          
         case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY:
         default:
           ACE_NEW_THROW_EX (
@@ -1013,9 +2418,9 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::crea
           );
           ACE_CHECK;
           break;
-
+        
       }
-
+    
   }
 }
 
@@ -1033,17 +2438,15 @@ ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function (CORB
 }
 
 int
-ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer (long _dummy_)
+ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer (long)
 {
-  ACE_UNUSED_ARG (_dummy_);
-
-  ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer =
+  ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer = 
     ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function;
-
+  
   return 0;
 }
 
-static int ImplementationRepository__TAO_Administration_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+static int ImplementationRepository__TAO_Administration_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
   ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer));
 
 
@@ -1397,7 +2800,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activa
           server,
           ACE_TRY_ENV
         );
-
+  
 }
 
 void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::register_server  (
@@ -1419,7 +2822,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::regist
           options,
           ACE_TRY_ENV
         );
-
+  
 }
 
 void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregister_server  (
@@ -1440,7 +2843,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregi
           options,
           ACE_TRY_ENV
         );
-
+  
 }
 
 void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove_server  (
@@ -1460,7 +2863,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove
           server,
           ACE_TRY_ENV
         );
-
+  
 }
 
 void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_server  (
@@ -1480,7 +2883,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdo
           server,
           ACE_TRY_ENV
         );
-
+  
 }
 
 char * POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_running  (
@@ -1504,7 +2907,7 @@ char * POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::serv
           server_object,
           ACE_TRY_ENV
         );
-
+  
 }
 
 void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_shutting_down  (
@@ -1524,7 +2927,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server
           server,
           ACE_TRY_ENV
         );
-
+  
 }
 
 void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find  (
@@ -1546,7 +2949,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find
           info,
           ACE_TRY_ENV
         );
-
+  
 }
 
 void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list  (
@@ -1569,7 +2972,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list
           server_iterator,
           ACE_TRY_ENV
         );
-
+  
 }
 
 
@@ -1595,13 +2998,14 @@ POA_ImplementationRepository::Administration::~Administration (void)
 void POA_ImplementationRepository::Administration::activate_server_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void * /* context */,
+    void *_tao_servant_upcall,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference;
-
+  POA_ImplementationRepository::Administration *_tao_impl =
+    ACE_static_cast (POA_ImplementationRepository::Administration *, _tao_object_reference);
+  
   _tao_server_request.argument_flag (0);
     CORBA::String_var server;
   if (!(
@@ -1611,46 +3015,40 @@ void POA_ImplementationRepository::Administration::activate_server_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
-  POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server ri (
+  
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server ri (
       _tao_server_request,
+      _tao_upcall,
       _tao_impl,
       server.in (),
       ACE_TRY_ENV
     );
-
+  
   ACE_TRY
     {
       _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       _tao_impl->activate_server (
           server.in (),
           ACE_TRY_ENV
         );
       TAO_INTERCEPTOR_CHECK;
-
+      
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
       _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc);
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
@@ -1659,14 +3057,24 @@ void POA_ImplementationRepository::Administration::activate_server_skel (
           ACE_TRY_ENV
         );
       ACE_TRY_CHECK;
-      ACE_RE_THROW;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        ri.reply_status (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+          || _tao_status == PortableInterceptor::USER_EXCEPTION)
+        ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -1674,13 +3082,14 @@ void POA_ImplementationRepository::Administration::activate_server_skel (
 void POA_ImplementationRepository::Administration::register_server_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void * /* context */,
+    void *_tao_servant_upcall,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference;
-
+  POA_ImplementationRepository::Administration *_tao_impl =
+    ACE_static_cast (POA_ImplementationRepository::Administration *, _tao_object_reference);
+  
   _tao_server_request.argument_flag (0);
     CORBA::String_var server;
   ImplementationRepository::StartupOptions options;
@@ -1692,48 +3101,42 @@ void POA_ImplementationRepository::Administration::register_server_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
-  POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server ri (
+  
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server ri (
       _tao_server_request,
+      _tao_upcall,
       _tao_impl,
       server.in (),
       options,
       ACE_TRY_ENV
     );
-
+  
   ACE_TRY
     {
       _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       _tao_impl->register_server (
           server.in (),
           options,
           ACE_TRY_ENV
         );
       TAO_INTERCEPTOR_CHECK;
-
+      
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
       _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc);
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
@@ -1742,14 +3145,24 @@ void POA_ImplementationRepository::Administration::register_server_skel (
           ACE_TRY_ENV
         );
       ACE_TRY_CHECK;
-      ACE_RE_THROW;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        ri.reply_status (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+          || _tao_status == PortableInterceptor::USER_EXCEPTION)
+        ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -1757,13 +3170,14 @@ void POA_ImplementationRepository::Administration::register_server_skel (
 void POA_ImplementationRepository::Administration::reregister_server_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void * /* context */,
+    void *_tao_servant_upcall,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference;
-
+  POA_ImplementationRepository::Administration *_tao_impl =
+    ACE_static_cast (POA_ImplementationRepository::Administration *, _tao_object_reference);
+  
   _tao_server_request.argument_flag (0);
     CORBA::String_var server;
   ImplementationRepository::StartupOptions options;
@@ -1775,48 +3189,42 @@ void POA_ImplementationRepository::Administration::reregister_server_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
-  POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server ri (
+  
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server ri (
       _tao_server_request,
+      _tao_upcall,
       _tao_impl,
       server.in (),
       options,
       ACE_TRY_ENV
     );
-
+  
   ACE_TRY
     {
       _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       _tao_impl->reregister_server (
           server.in (),
           options,
           ACE_TRY_ENV
         );
       TAO_INTERCEPTOR_CHECK;
-
+      
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
       _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc);
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
@@ -1825,14 +3233,24 @@ void POA_ImplementationRepository::Administration::reregister_server_skel (
           ACE_TRY_ENV
         );
       ACE_TRY_CHECK;
-      ACE_RE_THROW;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        ri.reply_status (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+          || _tao_status == PortableInterceptor::USER_EXCEPTION)
+        ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -1840,13 +3258,14 @@ void POA_ImplementationRepository::Administration::reregister_server_skel (
 void POA_ImplementationRepository::Administration::remove_server_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void * /* context */,
+    void *_tao_servant_upcall,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference;
-
+  POA_ImplementationRepository::Administration *_tao_impl =
+    ACE_static_cast (POA_ImplementationRepository::Administration *, _tao_object_reference);
+  
   _tao_server_request.argument_flag (0);
     CORBA::String_var server;
   if (!(
@@ -1856,46 +3275,40 @@ void POA_ImplementationRepository::Administration::remove_server_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
-  POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server ri (
+  
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server ri (
       _tao_server_request,
+      _tao_upcall,
       _tao_impl,
       server.in (),
       ACE_TRY_ENV
     );
-
+  
   ACE_TRY
     {
       _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       _tao_impl->remove_server (
           server.in (),
           ACE_TRY_ENV
         );
       TAO_INTERCEPTOR_CHECK;
-
+      
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
       _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc);
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
@@ -1904,14 +3317,24 @@ void POA_ImplementationRepository::Administration::remove_server_skel (
           ACE_TRY_ENV
         );
       ACE_TRY_CHECK;
-      ACE_RE_THROW;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        ri.reply_status (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+          || _tao_status == PortableInterceptor::USER_EXCEPTION)
+        ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -1919,13 +3342,14 @@ void POA_ImplementationRepository::Administration::remove_server_skel (
 void POA_ImplementationRepository::Administration::shutdown_server_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void * /* context */,
+    void *_tao_servant_upcall,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference;
-
+  POA_ImplementationRepository::Administration *_tao_impl =
+    ACE_static_cast (POA_ImplementationRepository::Administration *, _tao_object_reference);
+  
   _tao_server_request.argument_flag (0);
     CORBA::String_var server;
   if (!(
@@ -1935,46 +3359,40 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
-  POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server ri (
+  
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server ri (
       _tao_server_request,
+      _tao_upcall,
       _tao_impl,
       server.in (),
       ACE_TRY_ENV
     );
-
+  
   ACE_TRY
     {
       _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       _tao_impl->shutdown_server (
           server.in (),
           ACE_TRY_ENV
         );
       TAO_INTERCEPTOR_CHECK;
-
+      
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
       _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc);
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
@@ -1983,14 +3401,24 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel (
           ACE_TRY_ENV
         );
       ACE_TRY_CHECK;
-      ACE_RE_THROW;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        ri.reply_status (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+          || _tao_status == PortableInterceptor::USER_EXCEPTION)
+        ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -1998,13 +3426,14 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel (
 void POA_ImplementationRepository::Administration::server_is_running_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void * /* context */,
+    void *_tao_servant_upcall,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference;
-
+  POA_ImplementationRepository::Administration *_tao_impl =
+    ACE_static_cast (POA_ImplementationRepository::Administration *, _tao_object_reference);
+  
     CORBA::String_var _tao_retval;
   CORBA::String_var server;
   CORBA::String_var addr;
@@ -2018,27 +3447,31 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
-  POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running ri (
+  
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running ri (
       _tao_server_request,
+      _tao_upcall,
       _tao_impl,
       server.in (),
       addr.in (),
       server_object.in (),
       ACE_TRY_ENV
     );
-
+  
   ACE_TRY
     {
       _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval =
+      _tao_retval = 
       _tao_impl->server_is_running (
           server.in (),
           addr.in (),
@@ -2046,7 +3479,7 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
           ACE_TRY_ENV
         );
       TAO_INTERCEPTOR_CHECK;
-
+      
 #if (TAO_HAS_INTERCEPTORS == 1)
       char * _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
@@ -2055,16 +3488,6 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
       _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc);
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
@@ -2073,21 +3496,31 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
           ACE_TRY_ENV
         );
       ACE_TRY_CHECK;
-      ACE_RE_THROW;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        ri.reply_status (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+          || _tao_status == PortableInterceptor::USER_EXCEPTION)
+        ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(
       (_tao_out << _tao_retval.in ())
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -2095,13 +3528,14 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
 void POA_ImplementationRepository::Administration::server_is_shutting_down_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void * /* context */,
+    void *_tao_servant_upcall,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference;
-
+  POA_ImplementationRepository::Administration *_tao_impl =
+    ACE_static_cast (POA_ImplementationRepository::Administration *, _tao_object_reference);
+  
   _tao_server_request.argument_flag (0);
     CORBA::String_var server;
   if (!(
@@ -2111,46 +3545,40 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
-  POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down ri (
+  
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down ri (
       _tao_server_request,
+      _tao_upcall,
       _tao_impl,
       server.in (),
       ACE_TRY_ENV
     );
-
+  
   ACE_TRY
     {
       _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       _tao_impl->server_is_shutting_down (
           server.in (),
           ACE_TRY_ENV
         );
       TAO_INTERCEPTOR_CHECK;
-
+      
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
       _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc);
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
@@ -2159,14 +3587,24 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel
           ACE_TRY_ENV
         );
       ACE_TRY_CHECK;
-      ACE_RE_THROW;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        ri.reply_status (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+          || _tao_status == PortableInterceptor::USER_EXCEPTION)
+        ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -2174,13 +3612,14 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel
 void POA_ImplementationRepository::Administration::find_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void * /* context */,
+    void *_tao_servant_upcall,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference;
-
+  POA_ImplementationRepository::Administration *_tao_impl =
+    ACE_static_cast (POA_ImplementationRepository::Administration *, _tao_object_reference);
+  
     CORBA::String_var server;
   ImplementationRepository::ServerInformation_var info;
   if (!(
@@ -2190,47 +3629,41 @@ void POA_ImplementationRepository::Administration::find_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
-  POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_find ri (
+  
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_find ri (
       _tao_server_request,
+      _tao_upcall,
       _tao_impl,
       server.in (),
       ACE_TRY_ENV
     );
-
+  
   ACE_TRY
     {
       _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       _tao_impl->find (
           server.in (),
           info.out (),
           ACE_TRY_ENV
         );
       TAO_INTERCEPTOR_CHECK;
-
+      
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
       _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc);
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
@@ -2239,21 +3672,31 @@ void POA_ImplementationRepository::Administration::find_skel (
           ACE_TRY_ENV
         );
       ACE_TRY_CHECK;
-      ACE_RE_THROW;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        ri.reply_status (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+          || _tao_status == PortableInterceptor::USER_EXCEPTION)
+        ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(
       (_tao_out << info.in ())
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -2261,13 +3704,14 @@ void POA_ImplementationRepository::Administration::find_skel (
 void POA_ImplementationRepository::Administration::list_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void * /* context */,
+    void *_tao_servant_upcall,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference;
-
+  POA_ImplementationRepository::Administration *_tao_impl =
+    ACE_static_cast (POA_ImplementationRepository::Administration *, _tao_object_reference);
+  
     CORBA::ULong how_many;
   ImplementationRepository::ServerInformationList_var server_list;
     ImplementationRepository::ServerInformationIterator_var server_iterator;
@@ -2278,26 +3722,30 @@ void POA_ImplementationRepository::Administration::list_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
-  POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_list ri (
+  
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_list ri (
       _tao_server_request,
+      _tao_upcall,
       _tao_impl,
-      how_many
+      how_many      
 ,
       ACE_TRY_ENV
     );
-
+  
   ACE_TRY
     {
       _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       _tao_impl->list (
           how_many,
           server_list.out (),
@@ -2305,22 +3753,12 @@ void POA_ImplementationRepository::Administration::list_skel (
           ACE_TRY_ENV
         );
       TAO_INTERCEPTOR_CHECK;
-
+      
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
       _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc);
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
@@ -2329,30 +3767,40 @@ void POA_ImplementationRepository::Administration::list_skel (
           ACE_TRY_ENV
         );
       ACE_TRY_CHECK;
-      ACE_RE_THROW;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        ri.reply_status (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+          || _tao_status == PortableInterceptor::USER_EXCEPTION)
+        ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(
       (_tao_out << server_list.in ()) &&
       (_tao_out << server_iterator.in ())
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_ImplementationRepository::Administration::_is_a_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
-    void * /* context */,
+    void * /* Servant_Upcall */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -2362,10 +3810,10 @@ void POA_ImplementationRepository::Administration::_is_a_skel (
   CORBA::String_var value;
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
-
+  
   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -2373,16 +3821,16 @@ void POA_ImplementationRepository::Administration::_is_a_skel (
 }
 
 void POA_ImplementationRepository::Administration::_non_existent_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
-    void * /* context */,
+    void * /* Servant_Upcall */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -2390,35 +3838,35 @@ void POA_ImplementationRepository::Administration::_non_existent_skel (
 }
 
 void POA_ImplementationRepository::Administration::_interface_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
-    void * /* context */,
+    void * /* Servant_Upcall */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *) _tao_object_reference;
   CORBA_InterfaceDef_ptr _tao_retval = 0;
   CORBA::Boolean _tao_result = 0;
-
+  
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-
+    
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS ());
     }
-
+  
   ACE_TRY
     {
       _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
       _tao_server_request.init_reply ();
-
+      
       TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+      
       _tao_result =
         _tao_adapter->interfacedef_cdr_insert (
             _tao_out,
@@ -2430,7 +3878,7 @@ void POA_ImplementationRepository::Administration::_interface_skel (
       _tao_adapter->dispose (_tao_retval);
     }
   ACE_ENDTRY;
-
+  
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -2444,7 +3892,7 @@ CORBA::Boolean POA_ImplementationRepository::Administration::_is_a (
 {
   const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-
+  
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/Administration:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
@@ -2464,11 +3912,15 @@ void* POA_ImplementationRepository::Administration::_downcast (
   return 0;
 }
 
-void POA_ImplementationRepository::Administration::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_ImplementationRepository::Administration::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
 {
-  this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
+  this->synchronous_upcall_dispatch (req,
+                                     servant_upcall,
+                                     this,
+                                     ACE_TRY_ENV);
 }
 
+
 const char* POA_ImplementationRepository::Administration::_interface_repository_id (void) const
 {
   return "IDL:ImplementationRepository/Administration:1.0";
@@ -2479,536 +3931,227 @@ POA_ImplementationRepository::Administration::_this (CORBA_Environment &ACE_TRY_
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-
+  
+  TAO_Stub_Auto_Ptr safe_stub (stub);
+  
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+  
   if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
   else
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-
+  
   CORBA::Object_var obj = tmp;
+  
+  (void) safe_stub.release ();
+  
   return ::ImplementationRepository::Administration::_unchecked_narrow (obj.in ());
 }
 
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server (
-    TAO_ServerRequest &_tao_server_request,
-    POA_ImplementationRepository::Administration *tao_impl,
-    const char * server,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    server_ (server)
-{}
-
-Dynamic::ParameterList *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+class TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
-  CORBA::ULong length_server = parameter_list->length ();
-  parameter_list->length (length_server + 1);
-  (*parameter_list)[length_server].argument <<= server_;
-  (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
-
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+private:
+  unsigned int hash (const char *str, unsigned int len);
+public:
+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+};
+/* starting time is 17:40:17 */
+/* C++ code produced by gperf version 2.8 (ACE version) */
+/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable -N lookup  */
+unsigned int
+TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  Dynamic::ExceptionList_var safe_exception_list = exception_list;
-
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata[] =
-  {
-    {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc},
-    {ImplementationRepository::Administration::_tc_CannotActivate, ImplementationRepository::Administration::CannotActivate::_alloc}
-  };
-
-  exception_list->length (2);
-  for (CORBA::ULong i = 0; i < 2; ++i)
+  static const unsigned char asso_values[] =
     {
-      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_activate_server_exceptiondata[i].tc;
-      TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1);
-      (*exception_list)[i] = tcp_object;
-    }
-
-  return safe_exception_list._retn ();
-}
-
-CORBA::Any *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return result_any;
-}
-
-char *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server (
-    TAO_ServerRequest &_tao_server_request,
-    POA_ImplementationRepository::Administration *tao_impl,
-    const char * server,
-    const ImplementationRepository::StartupOptions & options,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    server_ (server),
-    options_ (options)
-{}
-
-Dynamic::ParameterList *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
-  CORBA::ULong length_server = parameter_list->length ();
-  parameter_list->length (length_server + 1);
-  (*parameter_list)[length_server].argument <<= server_;
-  (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
-
-  CORBA::ULong length_options = parameter_list->length ();
-  parameter_list->length (length_options + 1);
-  (*parameter_list)[length_options].argument <<=  this->options_;
-
-  (*parameter_list)[length_options].mode = Dynamic::PARAM_IN;
-
-  return safe_parameter_list._retn ();
+#if defined (ACE_MVS)
+     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+     14, 14, 14, 14, 14, 14, 14, 14, 14,  0,
+     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+     14, 14, 14, 14, 14, 14, 14, 14, 14,  0,
+     14, 14,  0,  0, 14, 14, 14, 14, 14, 14,
+     14, 14, 14, 14, 14, 14, 14, 14, 14,  0,
+     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+     14, 14, 14,  0, 14, 14, 14, 14,  0, 14,
+     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+     14, 14, 14, 14, 14, 14,
+#else
+     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+     14, 14, 14, 14, 14,  0, 14,  0, 14, 14,
+      0,  0, 14, 14, 14, 14, 14, 14, 14, 14,
+      0, 14, 14, 14, 14, 14,  0, 14, 14, 14,
+     14,  0, 14, 14, 14, 14, 14, 14,
+#endif /* ACE_MVS */
+    };
+  return len + asso_values[str[len - 1]] + asso_values[str[0]];
 }
 
-Dynamic::ExceptionList *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+const class TAO_operation_db_entry *
+TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
 {
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  Dynamic::ExceptionList_var safe_exception_list = exception_list;
-
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata[] =
-  {
-    {ImplementationRepository::Administration::_tc_AlreadyRegistered, ImplementationRepository::Administration::AlreadyRegistered::_alloc}
-  };
-
-  exception_list->length (1);
-  for (CORBA::ULong i = 0; i < 1; ++i)
+  enum
     {
-      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_register_server_exceptiondata[i].tc;
-      TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1);
-      (*exception_list)[i] = tcp_object;
-    }
-
-  return safe_exception_list._retn ();
-}
-
-CORBA::Any *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return result_any;
-}
-
-char *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server (
-    TAO_ServerRequest &_tao_server_request,
-    POA_ImplementationRepository::Administration *tao_impl,
-    const char * server,
-    const ImplementationRepository::StartupOptions & options,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    server_ (server),
-    options_ (options)
-{}
-
-Dynamic::ParameterList *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
-  CORBA::ULong length_server = parameter_list->length ();
-  parameter_list->length (length_server + 1);
-  (*parameter_list)[length_server].argument <<= server_;
-  (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
-
-  CORBA::ULong length_options = parameter_list->length ();
-  parameter_list->length (length_options + 1);
-  (*parameter_list)[length_options].argument <<=  this->options_;
-
-  (*parameter_list)[length_options].mode = Dynamic::PARAM_IN;
-
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return exception_list;
-}
-
-CORBA::Any *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return result_any;
-}
-
-char *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server (
-    TAO_ServerRequest &_tao_server_request,
-    POA_ImplementationRepository::Administration *tao_impl,
-    const char * server,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    server_ (server)
-{}
-
-Dynamic::ParameterList *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
-  CORBA::ULong length_server = parameter_list->length ();
-  parameter_list->length (length_server + 1);
-  (*parameter_list)[length_server].argument <<= server_;
-  (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
-
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  Dynamic::ExceptionList_var safe_exception_list = exception_list;
-
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata[] =
-  {
-    {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
-  };
+      TOTAL_KEYWORDS = 5,
+      MIN_WORD_LENGTH = 5,
+      MAX_WORD_LENGTH = 13,
+      MIN_HASH_VALUE = 5,
+      MAX_HASH_VALUE = 13,
+      HASH_VALUE_RANGE = 9,
+      DUPLICATES = 0
+    };
 
-  exception_list->length (1);
-  for (CORBA::ULong i = 0; i < 1; ++i)
+  static const class TAO_operation_db_entry  wordlist[] =
     {
-      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_remove_server_exceptiondata[i].tc;
-      TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1);
-      (*exception_list)[i] = tcp_object;
-    }
-
-  return safe_exception_list._retn ();
-}
-
-CORBA::Any *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return result_any;
-}
-
-char *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server (
-    TAO_ServerRequest &_tao_server_request,
-    POA_ImplementationRepository::Administration *tao_impl,
-    const char * server,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    server_ (server)
-{}
-
-Dynamic::ParameterList *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
-  CORBA::ULong length_server = parameter_list->length ();
-  parameter_list->length (length_server + 1);
-  (*parameter_list)[length_server].argument <<= server_;
-  (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
-
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  Dynamic::ExceptionList_var safe_exception_list = exception_list;
-
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[] =
-  {
-    {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
-  };
+      {"",0},{"",0},{"",0},{"",0},{"",0},
+      {"_is_a",  &POA_ImplementationRepository::ServerInformationIterator::_is_a_skel},
+      {"next_n", 	&POA_ImplementationRepository::ServerInformationIterator::next_n_skel},
+      {"destroy", 	&POA_ImplementationRepository::ServerInformationIterator::destroy_skel},
+      {"",0},{"",0},
+      {"_interface",  &POA_ImplementationRepository::ServerInformationIterator::_interface_skel},
+      {"",0},{"",0},
+      {"_non_existent",  &POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel},
+    };
 
-  exception_list->length (1);
-  for (CORBA::ULong i = 0; i < 1; ++i)
+  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
     {
-      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[i].tc;
-      TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1);
-      (*exception_list)[i] = tcp_object;
-    }
-
-  return safe_exception_list._retn ();
-}
+      unsigned int key = hash (str, len);
 
-CORBA::Any *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+      if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
+        {
+          const char *s = wordlist[key].opname_;
 
-  return result_any;
+          if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
+            return &wordlist[key];
+        }
+    }
+  return 0;
 }
+/* ending time is 17:40:17 */
+static TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable tao_ImplementationRepository_ServerInformationIterator_optable;
 
-char *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+#if (TAO_HAS_INTERCEPTORS == 1)
+class TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n : public TAO_ServerRequestInfo
 {
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
+public:
+  TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::ServerInformationIterator *tao_impl
+    ,
+    const CORBA::ULong & how_many,
+    CORBA::Environment &ACE_TRY_ENV = 
+      TAO_default_environment ()
+  );
+
+  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));
+  
+  virtual char * target_most_derived_interface (
+      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id,
+      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  void result (CORBA::Boolean result);
 
-CORBA::Boolean
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
+private:
+  TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &);
+  void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &);
+  
+private:
+  POA_ImplementationRepository::ServerInformationIterator *_tao_impl;
+  const CORBA::ULong & how_many_;
+  CORBA::Boolean _result;
+};
 
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running (
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (
     TAO_ServerRequest &_tao_server_request,
-    POA_ImplementationRepository::Administration *tao_impl,
-    const char * server,
-    const char * addr,
-    ImplementationRepository::ServerObject_ptr server_object,
+    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    POA_ImplementationRepository::ServerInformationIterator *tao_impl,
+    const CORBA::ULong & how_many,
     CORBA::Environment &
   )
-  : TAO_ServerRequestInfo (_tao_server_request),
+  : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
-    server_ (server),
-    addr_ (addr),
-    server_object_ (server_object)
+    how_many_ (how_many)
 {}
 
 Dynamic::ParameterList *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::arguments (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
-  CORBA::ULong length_server = parameter_list->length ();
-  parameter_list->length (length_server + 1);
-  (*parameter_list)[length_server].argument <<= server_;
-  (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
-
-  CORBA::ULong length_addr = parameter_list->length ();
-  parameter_list->length (length_addr + 1);
-  (*parameter_list)[length_addr].argument <<= addr_;
-  (*parameter_list)[length_addr].mode = Dynamic::PARAM_IN;
-
-  CORBA::ULong length_server_object = parameter_list->length ();
-  parameter_list->length (length_server_object + 1);
-  (*parameter_list)[length_server_object].argument <<=  this->server_object_;
-
-  (*parameter_list)[length_server_object].mode = Dynamic::PARAM_IN;
-
+  
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  
+    (*parameter_list)[len].argument <<= how_many_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::exceptions (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-
-  Dynamic::ExceptionList_var safe_exception_list = exception_list;
-
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[] =
-  {
-    {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
-  };
-
-  exception_list->length (1);
-  for (CORBA::ULong i = 0; i < 1; ++i)
-    {
-      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[i].tc;
-      TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1);
-      (*exception_list)[i] = tcp_object;
-    }
-
-  return safe_exception_list._retn ();
+  
+  return exception_list;
 }
 
-CORBA::Any *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -3016,16 +4159,16 @@ POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_Implementati
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
-  (*result_any) <<= this->_result;
-
+  
+  (*result_any) <<= CORBA::Any::from_boolean (this->_result);
+  
   return safe_result_any._retn ();
 }
 
 char *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::target_most_derived_interface (
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::target_most_derived_interface (
     CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -3034,7 +4177,7 @@ POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_Implementati
 }
 
 CORBA::Boolean
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::target_is_a (
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::target_is_a (
     const char * id,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -3042,204 +4185,73 @@ POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_Implementati
   return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
 }
 
-void
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::result (char * result)
+void 
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Boolean result)
 {
   // Update the result.
    this->_result = result;
 }
 
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (
-    TAO_ServerRequest &_tao_server_request,
-    POA_ImplementationRepository::Administration *tao_impl,
-    const char * server,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    server_ (server)
-{}
-
-Dynamic::ParameterList *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
-  CORBA::ULong length_server = parameter_list->length ();
-  parameter_list->length (length_server + 1);
-  (*parameter_list)[length_server].argument <<= server_;
-  (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
-
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  Dynamic::ExceptionList_var safe_exception_list = exception_list;
-
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[] =
-  {
-    {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
-  };
-
-  exception_list->length (1);
-  for (CORBA::ULong i = 0; i < 1; ++i)
-    {
-      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[i].tc;
-      TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1);
-      (*exception_list)[i] = tcp_object;
-    }
-
-  return safe_exception_list._retn ();
-}
-
-CORBA::Any *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return result_any;
-}
-
-char *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+class TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy : public TAO_ServerRequestInfo
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_find::TAO_ServerRequestInfo_ImplementationRepository_Administration_find (
+public:
+  TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
     TAO_ServerRequest &_tao_server_request,
-    POA_ImplementationRepository::Administration *tao_impl,
-    const char * server,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    server_ (server)
-{}
-
-Dynamic::ParameterList *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_find::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
-  CORBA::ULong length_server = parameter_list->length ();
-  parameter_list->length (length_server + 1);
-  (*parameter_list)[length_server].argument <<= server_;
-  (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
-
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_find::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  Dynamic::ExceptionList_var safe_exception_list = exception_list;
-
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata[] =
-  {
-    {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
-  };
-
-  exception_list->length (1);
-  for (CORBA::ULong i = 0; i < 1; ++i)
-    {
-      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_find_exceptiondata[i].tc;
-      TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1);
-      (*exception_list)[i] = tcp_object;
-    }
-
-  return safe_exception_list._retn ();
-}
-
-CORBA::Any *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_find::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return result_any;
-}
-
-char *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_find::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_find::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
+    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::ServerInformationIterator *tao_impl
+    ,
+    CORBA::Environment &ACE_TRY_ENV = 
+      TAO_default_environment ()
+  );
+
+  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));
+  
+  virtual char * target_most_derived_interface (
+      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id,
+      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  
+private:
+  TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &);
+  void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &);
+  
+private:
+  POA_ImplementationRepository::ServerInformationIterator *_tao_impl;
+  
+};
 
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_list::TAO_ServerRequestInfo_ImplementationRepository_Administration_list (
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
     TAO_ServerRequest &_tao_server_request,
-    POA_ImplementationRepository::Administration *tao_impl,
-    const CORBA::ULong & how_many
-,
+    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    POA_ImplementationRepository::ServerInformationIterator *tao_impl,
     CORBA::Environment &
   )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    how_many_ (how_many)
-
+  : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
+    _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_list::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::arguments (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
@@ -3247,31 +4259,23 @@ POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_Implementati
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
 
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
-  CORBA::ULong length_how_many = parameter_list->length ();
-  parameter_list->length (length_how_many + 1);
-  (*parameter_list)[length_how_many].argument <<= how_many_;
-  (*parameter_list)[length_how_many].mode = Dynamic::PARAM_IN;
-
-
-  return safe_parameter_list._retn ();
+  return parameter_list;
 }
 
 Dynamic::ExceptionList *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_list::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::exceptions (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_list::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -3284,7 +4288,7 @@ POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_Implementati
 }
 
 char *
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_list::target_most_derived_interface (
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::target_most_derived_interface (
     CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -3293,7 +4297,7 @@ POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_Implementati
 }
 
 CORBA::Boolean
-POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_list::target_is_a (
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::target_is_a (
     const char * id,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -3302,110 +4306,6 @@ POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_Implementati
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
-class TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-{
-private:
-  unsigned int hash (const char *str, unsigned int len);
-public:
- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-};
-/* starting time is 16:33:09 */
-/* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/sirion/coryan/head/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-#if defined (ACE_MVS)
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14,  0,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14,  0,
-     14, 14,  0,  0, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14,  0,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14,  0, 14, 14, 14, 14,  0, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14,
-#else
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14,  0, 14,  0, 14, 14,
-      0,  0, 14, 14, 14, 14, 14, 14, 14, 14,
-      0, 14, 14, 14, 14, 14,  0, 14, 14, 14,
-     14,  0, 14, 14, 14, 14, 14, 14,
-#endif /* ACE_MVS */
-    };
-  return len + asso_values[str[len - 1]] + asso_values[str[0]];
-}
-
-const class TAO_operation_db_entry *
-TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 5,
-      MIN_WORD_LENGTH = 5,
-      MAX_WORD_LENGTH = 13,
-      MIN_HASH_VALUE = 5,
-      MAX_HASH_VALUE = 13,
-      HASH_VALUE_RANGE = 9,
-      DUPLICATES = 0
-    };
-
-  static const class TAO_operation_db_entry  wordlist[] =
-    {
-      {"",0},{"",0},{"",0},{"",0},{"",0},
-      {"_is_a",  &POA_ImplementationRepository::ServerInformationIterator::_is_a_skel},
-      {"next_n",        &POA_ImplementationRepository::ServerInformationIterator::next_n_skel},
-      {"destroy",       &POA_ImplementationRepository::ServerInformationIterator::destroy_skel},
-      {"",0},{"",0},
-      {"_interface",  &POA_ImplementationRepository::ServerInformationIterator::_interface_skel},
-      {"",0},{"",0},
-      {"_non_existent",  &POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel},
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      unsigned int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-        {
-          const char *s = wordlist[key].opname_;
-
-          if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-            return &wordlist[key];
-        }
-    }
-  return 0;
-}
-/* ending time is 16:33:09 */
-static TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable tao_ImplementationRepository_ServerInformationIterator_optable;
-
 
 ///////////////////////////////////////////////////////////////////////
 //            Strategized Proxy Broker Implementation
@@ -3422,14 +4322,14 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
-
+  
 }
 
 POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::~_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     delete this->proxy_cache_[i];
-
+  
 }
 
 ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl&
@@ -3440,25 +4340,25 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B
 {
   int strategy =
     TAO_ORB_Core::collocation_strategy (object);
-
+  
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
-
+  
   this->create_proxy (strategy, ACE_TRY_ENV);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-
+  
   return *this->proxy_cache_[strategy];
-
+  
 }
 
-void
+void 
 POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::create_proxy (
     int strategy,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
-
+  
   if (this->proxy_cache_[strategy] == 0)
     {
       switch (strategy)
@@ -3510,17 +4410,15 @@ ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_fun
 }
 
 int
-ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer (long _dummy_)
+ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer (long)
 {
-  ACE_UNUSED_ARG (_dummy_);
-
-  ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer =
+  ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer = 
     ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function;
-
+  
   return 0;
 }
 
-static int ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+static int ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
   ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer));
 
 
@@ -3628,7 +4526,7 @@ CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_Dire
           server_list,
           ACE_TRY_ENV
         );
-
+  
 }
 
 void POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::destroy  (
@@ -3671,13 +4569,14 @@ POA_ImplementationRepository::ServerInformationIterator::~ServerInformationItera
 void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void * /* context */,
+    void *_tao_servant_upcall,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *)_tao_object_reference;
-
+  POA_ImplementationRepository::ServerInformationIterator *_tao_impl =
+    ACE_static_cast (POA_ImplementationRepository::ServerInformationIterator *, _tao_object_reference);
+  
     CORBA::Boolean _tao_retval = 0;
   CORBA::ULong how_many;
   ImplementationRepository::ServerInformationList_var server_list;
@@ -3688,32 +4587,36 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
-  POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n ri (
+  
+  TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n ri (
       _tao_server_request,
+      _tao_upcall,
       _tao_impl,
       how_many,
       ACE_TRY_ENV
     );
-
+  
   ACE_TRY
     {
       _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval =
+      _tao_retval = 
       _tao_impl->next_n (
           how_many,
           server_list.out (),
           ACE_TRY_ENV
         );
       TAO_INTERCEPTOR_CHECK;
-
+      
 #if (TAO_HAS_INTERCEPTORS == 1)
       CORBA::Boolean _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
@@ -3721,16 +4624,6 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
       _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc);
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
@@ -3739,22 +4632,32 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
           ACE_TRY_ENV
         );
       ACE_TRY_CHECK;
-      ACE_RE_THROW;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        ri.reply_status (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+          || _tao_status == PortableInterceptor::USER_EXCEPTION)
+        ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(
       (_tao_out << CORBA::Any::from_boolean (_tao_retval)) &&
       (_tao_out << server_list.in ())
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -3762,33 +4665,38 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
 void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void * /* context */,
+    void *_tao_servant_upcall,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *)_tao_object_reference;
-
+  POA_ImplementationRepository::ServerInformationIterator *_tao_impl =
+    ACE_static_cast (POA_ImplementationRepository::ServerInformationIterator *, _tao_object_reference);
+  
   _tao_server_request.argument_flag (0);
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
-  POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ri (
+  
+  TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ri (
       _tao_server_request,
+      _tao_upcall,
       _tao_impl,
       ACE_TRY_ENV
     );
-
+  
   ACE_TRY
     {
       _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       _tao_impl->destroy (
           ACE_TRY_ENV
         );
@@ -3799,16 +4707,6 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
       _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc);
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
@@ -3817,22 +4715,32 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
           ACE_TRY_ENV
         );
       ACE_TRY_CHECK;
-      ACE_RE_THROW;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        ri.reply_status (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+          || _tao_status == PortableInterceptor::USER_EXCEPTION)
+        ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
-    void * /* context */,
+    void * /* Servant_Upcall */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -3853,9 +4761,9 @@ void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel (
 }
 
 void POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
-    void * /* context */,
+    void * /* Servant_Upcall */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -3870,9 +4778,9 @@ void POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel
 }
 
 void POA_ImplementationRepository::ServerInformationIterator::_interface_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
-    void * /* context */,
+    void * /* Servant_Upcall */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -3944,11 +4852,15 @@ void* POA_ImplementationRepository::ServerInformationIterator::_downcast (
   return 0;
 }
 
-void POA_ImplementationRepository::ServerInformationIterator::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_ImplementationRepository::ServerInformationIterator::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
 {
-  this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
+  this->synchronous_upcall_dispatch (req,
+                                     servant_upcall,
+                                     this,
+                                     ACE_TRY_ENV);
 }
 
+
 const char* POA_ImplementationRepository::ServerInformationIterator::_interface_repository_id (void) const
 {
   return "IDL:ImplementationRepository/ServerInformationIterator:1.0";
@@ -3959,168 +4871,23 @@ POA_ImplementationRepository::ServerInformationIterator::_this (CORBA_Environmen
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-
+  
+  TAO_Stub_Auto_Ptr safe_stub (stub);
+  
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+  
   if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
   else
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-
+  
   CORBA::Object_var obj = tmp;
+  
+  (void) safe_stub.release ();
+  
   return ::ImplementationRepository::ServerInformationIterator::_unchecked_narrow (obj.in ());
 }
 
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (
-    TAO_ServerRequest &_tao_server_request,
-    POA_ImplementationRepository::ServerInformationIterator *tao_impl,
-    const CORBA::ULong & how_many,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    how_many_ (how_many)
-{}
-
-Dynamic::ParameterList *
-POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
-  CORBA::ULong length_how_many = parameter_list->length ();
-  parameter_list->length (length_how_many + 1);
-  (*parameter_list)[length_how_many].argument <<= how_many_;
-  (*parameter_list)[length_how_many].mode = Dynamic::PARAM_IN;
-
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return exception_list;
-}
-
-CORBA::Any *
-POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Any_var safe_result_any = result_any;
-
-  (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-
-  return safe_result_any._retn ();
-}
-
-char *
-POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void
-POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Boolean result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
-    TAO_ServerRequest &_tao_server_request,
-    POA_ImplementationRepository::ServerInformationIterator *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return exception_list;
-}
-
-CORBA::Any *
-POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return result_any;
-}
-
-char *
-POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
 
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/ImplRepoS.h b/TAO/tao/PortableServer/ImplRepoS.h
index d0fe41625d9..ef3099316fe 100644
--- a/TAO/tao/PortableServer/ImplRepoS.h
+++ b/TAO/tao/PortableServer/ImplRepoS.h
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_ORIG_IMPLREPOS_H_
-#define _TAO_IDL_ORIG_IMPLREPOS_H_
+#ifndef _TAO_IDL_IMPLREPOS_H_
+#define _TAO_IDL_IMPLREPOS_H_
 
 #include "ace/pre.h"
 #include "ImplRepoC.h"
@@ -35,8 +35,6 @@
 #include "tao/PortableServer/Collocated_Object.h"
 #include "tao/PortableServer/ThruPOA_Object_Proxy_Impl.h"
 #include "tao/PortableServer/Direct_Object_Proxy_Impl.h"
-#include "tao/PortableServer/ServerRequestInfo.h"
-
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
 #pragma warning(push)
@@ -56,7 +54,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
   class _TAO_ServerObject_ThruPOA_Proxy_Impl;
   class _TAO_ServerObject_Direct_Proxy_Impl;
   class _TAO_ServerObject_Strategized_Proxy_Broker;
-
+  
   class TAO_PortableServer_Export ServerObject :  public virtual PortableServer::ServantBase
   {
   protected:
@@ -69,7 +67,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
 
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       );
 
@@ -80,284 +78,174 @@ TAO_NAMESPACE  POA_ImplementationRepository
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
+        void *servant_upcall,
+        CORBA::Environment &ACE_TRY_ENV
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
+        void *servant_upcall,
+        CORBA::Environment &ACE_TRY_ENV
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
+        void *servant_upcall,
+        CORBA::Environment &ACE_TRY_ENV
       );
 
     virtual void _dispatch (
-        TAO_ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
+        TAO_ServerRequest &req,
+        void *_servant_upcall,
+        CORBA::Environment &ACE_TRY_ENV
       );
 
     ::ImplementationRepository::ServerObject *_this (
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       );
 
     virtual const char* _interface_repository_id (void) const;
 
     virtual void ping (
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
-    static void ping_skel (
+    
+        static void ping_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
+        void *_tao_servant_upcall,
+        CORBA::Environment &ACE_TRY_ENV
       );
 
     virtual void shutdown (
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
-    static void shutdown_skel (
+    
+        static void shutdown_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-    class TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_ImplementationRepository::ServerObject;
-      TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping (
-        TAO_ServerRequest &_tao_server_request,
-        POA_ImplementationRepository::ServerObject *tao_impl,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-      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));
-
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-    private:
-      TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping &);
-      void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping &);
-
-    private:
-      POA_ImplementationRepository::ServerObject *_tao_impl;
-
-    };
-
-    class TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_ImplementationRepository::ServerObject;
-      TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown (
-        TAO_ServerRequest &_tao_server_request,
-        POA_ImplementationRepository::ServerObject *tao_impl,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
+        void *_tao_servant_upcall,
+        CORBA::Environment &ACE_TRY_ENV
       );
 
-      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));
-
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-    private:
-      TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown &);
-      void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown &);
-
-    private:
-      POA_ImplementationRepository::ServerObject *_tao_impl;
-
-    };
-
-    #endif /* TAO_HAS_INTERCEPTORS */
 
   };
 
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration
+  //               Strategized Proxy Broker Declaration 
   //
-
+  
   class TAO_PortableServer_Export _TAO_ServerObject_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_ServerObject_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_ServerObject_Strategized_Proxy_Broker (void);
-
+    
     virtual ~_TAO_ServerObject_Strategized_Proxy_Broker (void);
-
+    
     virtual ::ImplementationRepository::_TAO_ServerObject_Proxy_Impl &select_proxy (
       ::ImplementationRepository::ServerObject *object,
-      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+      CORBA_Environment &ACE_TRY_ENV
     );
-
+  
   private:
-
-  // Helper methods that takes care to create the proxy
-  // as soon as their use is necessary.
+    // Helper methods that takes care to create the proxy
+    // as soon as their use is necessary.
     void create_proxy (
       int collocation_strategy,
       CORBA::Environment &ACE_TRY_ENV
     );
-
-  private:
-
+    
     // Caches the proxy implementations. The proxy implementation
     // are totally stateless, and those can be shared by all the
     // instances of a given IDL interface type.
     ::ImplementationRepository::_TAO_ServerObject_Proxy_Impl
-     *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-
+    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
+    
     TAO_SYNCH_MUTEX mutex_;
-  // This funxtion is used to get an handle to the unique instance
-  // of the Strategized Proxy Broker that is available for a given
-  // interface.
-
+    // This funxtion is used to get an handle to the unique instance
+    // of the Strategized Proxy Broker that is available for a given
+    // interface.
+  
   public:
     static _TAO_ServerObject_Strategized_Proxy_Broker *the_TAO_ServerObject_Strategized_Proxy_Broker (void);
   };
-
-
+  
+  
   //
-  //            End Strategized Proxy Broker Declaration
+  //            End Strategized Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    ThruPOA  Impl. Declaration
-//
-
-class TAO_PortableServer_Export _TAO_ServerObject_ThruPOA_Proxy_Impl :
-  public virtual ::ImplementationRepository::_TAO_ServerObject_Proxy_Impl,
-  public virtual TAO_ThruPOA_Object_Proxy_Impl
-{
-public:
-  _TAO_ServerObject_ThruPOA_Proxy_Impl (void);
-
-  virtual ~_TAO_ServerObject_ThruPOA_Proxy_Impl (void) { }
-
+  
+  
+  ///////////////////////////////////////////////////////////////////////
+  //                    ThruPOA  Impl. Declaration
+  //
+  
+  class TAO_PortableServer_Export _TAO_ServerObject_ThruPOA_Proxy_Impl : 
+    public virtual ::ImplementationRepository::_TAO_ServerObject_Proxy_Impl,
+    public virtual TAO_ThruPOA_Object_Proxy_Impl
+  {
+  public:
+    _TAO_ServerObject_ThruPOA_Proxy_Impl (void);
+    
+    virtual ~_TAO_ServerObject_ThruPOA_Proxy_Impl (void) { }
+    
     virtual void ping (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void shutdown (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-};
-
-
-//
-//                ThruPOA  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
+        CORBA_Object *_collocated_tao_target_,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    virtual void shutdown (
+        CORBA_Object *_collocated_tao_target_,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    
+  };
+  
+  //
+  //                ThruPOA  Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
+  
+  
 ///////////////////////////////////////////////////////////////////////
 //                    Direct  Impl. Declaration
 //
 
-class TAO_PortableServer_Export _TAO_ServerObject_Direct_Proxy_Impl :
+class TAO_PortableServer_Export _TAO_ServerObject_Direct_Proxy_Impl : 
   public virtual ImplementationRepository::_TAO_ServerObject_Proxy_Impl,
   public virtual TAO_Direct_Object_Proxy_Impl
 {
 public:
   _TAO_ServerObject_Direct_Proxy_Impl (void);
-
+  
   virtual ~_TAO_ServerObject_Direct_Proxy_Impl (void) { }
-
-    virtual void ping (
+  
+  virtual void ping (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual void shutdown (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -365,8 +253,8 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
-};
+  
+  };
 
 
 //
@@ -393,7 +281,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -404,36 +292,32 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
+      void *servant_upcall,
+      CORBA::Environment &ACE_TRY_ENV
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
+      void *servant_upcall,
+      CORBA::Environment &ACE_TRY_ENV
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
+      void *servant_upcall,
+      CORBA::Environment &ACE_TRY_ENV
     );
 
   virtual void _dispatch (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
+      TAO_ServerRequest &req,
+      void *_servant_upcall,
+      CORBA::Environment &ACE_TRY_ENV
     );
 
   ::ImplementationRepository::Administration *_this (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -441,7 +325,7 @@ public:
 
   virtual void activate_server (
       const char * server,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -449,665 +333,193 @@ public:
       ImplementationRepository::Administration::NotFound,
       ImplementationRepository::Administration::CannotActivate
     )) = 0;
-
-  static void activate_server_skel (
+  
+    static void activate_server_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
+      void *_tao_servant_upcall,
+      CORBA::Environment &ACE_TRY_ENV
     );
 
   virtual void register_server (
       const char * server,
       const ImplementationRepository::StartupOptions & options,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       ImplementationRepository::Administration::AlreadyRegistered
     )) = 0;
-
-  static void register_server_skel (
+  
+    static void register_server_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
+      void *_tao_servant_upcall,
+      CORBA::Environment &ACE_TRY_ENV
     );
 
   virtual void reregister_server (
       const char * server,
       const ImplementationRepository::StartupOptions & options,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
-  static void reregister_server_skel (
+  
+    static void reregister_server_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
+      void *_tao_servant_upcall,
+      CORBA::Environment &ACE_TRY_ENV
     );
 
   virtual void remove_server (
       const char * server,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       ImplementationRepository::Administration::NotFound
     )) = 0;
-
-  static void remove_server_skel (
+  
+    static void remove_server_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
+      void *_tao_servant_upcall,
+      CORBA::Environment &ACE_TRY_ENV
     );
 
   virtual void shutdown_server (
       const char * server,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       ImplementationRepository::Administration::NotFound
     )) = 0;
-
-  static void shutdown_server_skel (
+  
+    static void shutdown_server_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
+      void *_tao_servant_upcall,
+      CORBA::Environment &ACE_TRY_ENV
     );
 
   virtual char * server_is_running (
       const char * server,
       const char * addr,
       ImplementationRepository::ServerObject_ptr server_object,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       ImplementationRepository::Administration::NotFound
     )) = 0;
-
-  static void server_is_running_skel (
+  
+    static void server_is_running_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
+      void *_tao_servant_upcall,
+      CORBA::Environment &ACE_TRY_ENV
     );
 
   virtual void server_is_shutting_down (
       const char * server,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       ImplementationRepository::Administration::NotFound
     )) = 0;
-
-  static void server_is_shutting_down_skel (
+  
+    static void server_is_shutting_down_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
+      void *_tao_servant_upcall,
+      CORBA::Environment &ACE_TRY_ENV
     );
 
   virtual void find (
       const char * server,
       ImplementationRepository::ServerInformation_out info,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       ImplementationRepository::Administration::NotFound
     )) = 0;
-
-  static void find_skel (
+  
+    static void find_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
+      void *_tao_servant_upcall,
+      CORBA::Environment &ACE_TRY_ENV
     );
 
   virtual void list (
       CORBA::ULong how_many,
       ImplementationRepository::ServerInformationList_out server_list,
       ImplementationRepository::ServerInformationIterator_out server_iterator,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
-  static void list_skel (
+  
+    static void list_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-  class TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server : public TAO_ServerRequestInfo
-  {
-  public:
-    friend class POA_ImplementationRepository::Administration;
-    TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server (
-      TAO_ServerRequest &_tao_server_request,
-      POA_ImplementationRepository::Administration *tao_impl,
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-
-    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));
-
-    virtual char * target_most_derived_interface (
-        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Boolean target_is_a (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server &);
-    void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server &);
-
-  private:
-    POA_ImplementationRepository::Administration *_tao_impl;
-    const char * server_;
-
-  };
-
-  class TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server : public TAO_ServerRequestInfo
-  {
-  public:
-    friend class POA_ImplementationRepository::Administration;
-    TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server (
-      TAO_ServerRequest &_tao_server_request,
-      POA_ImplementationRepository::Administration *tao_impl,
-      const char * server,
-      const ImplementationRepository::StartupOptions & options,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-
-    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));
-
-    virtual char * target_most_derived_interface (
-        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Boolean target_is_a (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server &);
-    void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server &);
-
-  private:
-    POA_ImplementationRepository::Administration *_tao_impl;
-    const char * server_;
-    const ImplementationRepository::StartupOptions & options_;
-
-  };
-
-  class TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server : public TAO_ServerRequestInfo
-  {
-  public:
-    friend class POA_ImplementationRepository::Administration;
-    TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server (
-      TAO_ServerRequest &_tao_server_request,
-      POA_ImplementationRepository::Administration *tao_impl,
-      const char * server,
-      const ImplementationRepository::StartupOptions & options,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-
-    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));
-
-    virtual char * target_most_derived_interface (
-        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Boolean target_is_a (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server &);
-    void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server &);
-
-  private:
-    POA_ImplementationRepository::Administration *_tao_impl;
-    const char * server_;
-    const ImplementationRepository::StartupOptions & options_;
-
-  };
-
-  class TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server : public TAO_ServerRequestInfo
-  {
-  public:
-    friend class POA_ImplementationRepository::Administration;
-    TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server (
-      TAO_ServerRequest &_tao_server_request,
-      POA_ImplementationRepository::Administration *tao_impl,
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-
-    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));
-
-    virtual char * target_most_derived_interface (
-        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Boolean target_is_a (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server &);
-    void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server &);
-
-  private:
-    POA_ImplementationRepository::Administration *_tao_impl;
-    const char * server_;
-
-  };
-
-  class TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server : public TAO_ServerRequestInfo
-  {
-  public:
-    friend class POA_ImplementationRepository::Administration;
-    TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server (
-      TAO_ServerRequest &_tao_server_request,
-      POA_ImplementationRepository::Administration *tao_impl,
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-
-    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));
-
-    virtual char * target_most_derived_interface (
-        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Boolean target_is_a (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server &);
-    void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server &);
-
-  private:
-    POA_ImplementationRepository::Administration *_tao_impl;
-    const char * server_;
-
-  };
-
-  class TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running : public TAO_ServerRequestInfo
-  {
-  public:
-    friend class POA_ImplementationRepository::Administration;
-    TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running (
-      TAO_ServerRequest &_tao_server_request,
-      POA_ImplementationRepository::Administration *tao_impl,
-      const char * server,
-      const char * addr,
-      ImplementationRepository::ServerObject_ptr server_object,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-
-    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));
-
-    virtual char * target_most_derived_interface (
-        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Boolean target_is_a (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running &);
-    void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running &);
-
-  private:
-    POA_ImplementationRepository::Administration *_tao_impl;
-    const char * server_;
-    const char * addr_;
-    ImplementationRepository::ServerObject_ptr server_object_;
-    void result (char * result);
-    // update the result
-    char * _result;
-  };
-
-  class TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down : public TAO_ServerRequestInfo
-  {
-  public:
-    friend class POA_ImplementationRepository::Administration;
-    TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (
-      TAO_ServerRequest &_tao_server_request,
-      POA_ImplementationRepository::Administration *tao_impl,
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-
-    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));
-
-    virtual char * target_most_derived_interface (
-        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Boolean target_is_a (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &);
-    void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &);
-
-  private:
-    POA_ImplementationRepository::Administration *_tao_impl;
-    const char * server_;
-
-  };
-
-  class TAO_ServerRequestInfo_ImplementationRepository_Administration_find : public TAO_ServerRequestInfo
-  {
-  public:
-    friend class POA_ImplementationRepository::Administration;
-    TAO_ServerRequestInfo_ImplementationRepository_Administration_find (
-      TAO_ServerRequest &_tao_server_request,
-      POA_ImplementationRepository::Administration *tao_impl,
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-
-    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));
-
-    virtual char * target_most_derived_interface (
-        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Boolean target_is_a (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ServerRequestInfo_ImplementationRepository_Administration_find (const TAO_ServerRequestInfo_ImplementationRepository_Administration_find &);
-    void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_find &);
-
-  private:
-    POA_ImplementationRepository::Administration *_tao_impl;
-    const char * server_;
-
-  };
-
-  class TAO_ServerRequestInfo_ImplementationRepository_Administration_list : public TAO_ServerRequestInfo
-  {
-  public:
-    friend class POA_ImplementationRepository::Administration;
-    TAO_ServerRequestInfo_ImplementationRepository_Administration_list (
-      TAO_ServerRequest &_tao_server_request,
-      POA_ImplementationRepository::Administration *tao_impl,
-      const CORBA::ULong & how_many
-,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
+      void *_tao_servant_upcall,
+      CORBA::Environment &ACE_TRY_ENV
     );
 
-    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));
-
-    virtual char * target_most_derived_interface (
-        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Boolean target_is_a (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ServerRequestInfo_ImplementationRepository_Administration_list (const TAO_ServerRequestInfo_ImplementationRepository_Administration_list &);
-    void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_list &);
-
-  private:
-    POA_ImplementationRepository::Administration *_tao_impl;
-    const CORBA::ULong & how_many_;
-
-
-  };
-
-  #endif /* TAO_HAS_INTERCEPTORS */
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration
+//               Strategized Proxy Broker Declaration 
 //
 
 class TAO_PortableServer_Export _TAO_Administration_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_Administration_Proxy_Broker
 {
-public:
+public: 
   _TAO_Administration_Strategized_Proxy_Broker (void);
-
+  
   virtual ~_TAO_Administration_Strategized_Proxy_Broker (void);
-
+  
   virtual ::ImplementationRepository::_TAO_Administration_Proxy_Impl &select_proxy (
     ::ImplementationRepository::Administration *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+    CORBA_Environment &ACE_TRY_ENV
   );
 
 private:
-
-// Helper methods that takes care to create the proxy
-// as soon as their use is necessary.
+  // Helper methods that takes care to create the proxy
+  // as soon as their use is necessary.
   void create_proxy (
     int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
-
-private:
-
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::ImplementationRepository::_TAO_Administration_Proxy_Impl
-   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-
+  *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
+  
   TAO_SYNCH_MUTEX mutex_;
-// This funxtion is used to get an handle to the unique instance
-// of the Strategized Proxy Broker that is available for a given
-// interface.
+  // This funxtion is used to get an handle to the unique instance
+  // of the Strategized Proxy Broker that is available for a given
+  // interface.
 
 public:
   static _TAO_Administration_Strategized_Proxy_Broker *the_TAO_Administration_Strategized_Proxy_Broker (void);
@@ -1115,7 +527,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration
+//            End Strategized Proxy Broker Declaration 
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -1123,16 +535,16 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class TAO_PortableServer_Export _TAO_Administration_ThruPOA_Proxy_Impl :
+class TAO_PortableServer_Export _TAO_Administration_ThruPOA_Proxy_Impl : 
   public virtual ::ImplementationRepository::_TAO_Administration_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl
 {
 public:
   _TAO_Administration_ThruPOA_Proxy_Impl (void);
-
+  
   virtual ~_TAO_Administration_ThruPOA_Proxy_Impl (void) { }
-
-    virtual void activate_server (
+  
+  virtual void activate_server (
       CORBA_Object *_collocated_tao_target_,
       const char * server,
       CORBA::Environment &ACE_TRY_ENV
@@ -1142,7 +554,7 @@ public:
       ImplementationRepository::Administration::NotFound,
       ImplementationRepository::Administration::CannotActivate
     ));
-
+  
   virtual void register_server (
       CORBA_Object *_collocated_tao_target_,
       const char * server,
@@ -1153,7 +565,7 @@ public:
       CORBA::SystemException,
       ImplementationRepository::Administration::AlreadyRegistered
     ));
-
+  
   virtual void reregister_server (
       CORBA_Object *_collocated_tao_target_,
       const char * server,
@@ -1163,7 +575,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual void remove_server (
       CORBA_Object *_collocated_tao_target_,
       const char * server,
@@ -1173,7 +585,7 @@ public:
       CORBA::SystemException,
       ImplementationRepository::Administration::NotFound
     ));
-
+  
   virtual void shutdown_server (
       CORBA_Object *_collocated_tao_target_,
       const char * server,
@@ -1183,7 +595,7 @@ public:
       CORBA::SystemException,
       ImplementationRepository::Administration::NotFound
     ));
-
+  
   virtual char * server_is_running (
       CORBA_Object *_collocated_tao_target_,
       const char * server,
@@ -1195,7 +607,7 @@ public:
       CORBA::SystemException,
       ImplementationRepository::Administration::NotFound
     ));
-
+  
   virtual void server_is_shutting_down (
       CORBA_Object *_collocated_tao_target_,
       const char * server,
@@ -1205,7 +617,7 @@ public:
       CORBA::SystemException,
       ImplementationRepository::Administration::NotFound
     ));
-
+  
   virtual void find (
       CORBA_Object *_collocated_tao_target_,
       const char * server,
@@ -1216,7 +628,7 @@ public:
       CORBA::SystemException,
       ImplementationRepository::Administration::NotFound
     ));
-
+  
   virtual void list (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong how_many,
@@ -1227,10 +639,10 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
+  
 };
 
-
 //
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
@@ -1240,16 +652,16 @@ public:
 //                    Direct  Impl. Declaration
 //
 
-class TAO_PortableServer_Export _TAO_Administration_Direct_Proxy_Impl :
+class TAO_PortableServer_Export _TAO_Administration_Direct_Proxy_Impl : 
   public virtual ImplementationRepository::_TAO_Administration_Proxy_Impl,
   public virtual TAO_Direct_Object_Proxy_Impl
 {
 public:
   _TAO_Administration_Direct_Proxy_Impl (void);
-
+  
   virtual ~_TAO_Administration_Direct_Proxy_Impl (void) { }
-
-    virtual void activate_server (
+  
+  virtual void activate_server (
       CORBA_Object *_collocated_tao_target_,
       const char * server,
       CORBA::Environment &ACE_TRY_ENV
@@ -1259,7 +671,7 @@ public:
       ImplementationRepository::Administration::NotFound,
       ImplementationRepository::Administration::CannotActivate
     ));
-
+  
   virtual void register_server (
       CORBA_Object *_collocated_tao_target_,
       const char * server,
@@ -1270,7 +682,7 @@ public:
       CORBA::SystemException,
       ImplementationRepository::Administration::AlreadyRegistered
     ));
-
+  
   virtual void reregister_server (
       CORBA_Object *_collocated_tao_target_,
       const char * server,
@@ -1280,7 +692,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual void remove_server (
       CORBA_Object *_collocated_tao_target_,
       const char * server,
@@ -1290,7 +702,7 @@ public:
       CORBA::SystemException,
       ImplementationRepository::Administration::NotFound
     ));
-
+  
   virtual void shutdown_server (
       CORBA_Object *_collocated_tao_target_,
       const char * server,
@@ -1300,7 +712,7 @@ public:
       CORBA::SystemException,
       ImplementationRepository::Administration::NotFound
     ));
-
+  
   virtual char * server_is_running (
       CORBA_Object *_collocated_tao_target_,
       const char * server,
@@ -1312,7 +724,7 @@ public:
       CORBA::SystemException,
       ImplementationRepository::Administration::NotFound
     ));
-
+  
   virtual void server_is_shutting_down (
       CORBA_Object *_collocated_tao_target_,
       const char * server,
@@ -1322,7 +734,7 @@ public:
       CORBA::SystemException,
       ImplementationRepository::Administration::NotFound
     ));
-
+  
   virtual void find (
       CORBA_Object *_collocated_tao_target_,
       const char * server,
@@ -1333,7 +745,7 @@ public:
       CORBA::SystemException,
       ImplementationRepository::Administration::NotFound
     ));
-
+  
   virtual void list (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong how_many,
@@ -1344,8 +756,8 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
-};
+  
+  };
 
 
 //
@@ -1372,7 +784,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -1383,36 +795,32 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
+      void *servant_upcall,
+      CORBA::Environment &ACE_TRY_ENV
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
+      void *servant_upcall,
+      CORBA::Environment &ACE_TRY_ENV
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
+      void *servant_upcall,
+      CORBA::Environment &ACE_TRY_ENV
     );
 
   virtual void _dispatch (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
+      TAO_ServerRequest &req,
+      void *_servant_upcall,
+      CORBA::Environment &ACE_TRY_ENV
     );
 
   ::ImplementationRepository::ServerInformationIterator *_this (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -1421,183 +829,73 @@ public:
   virtual CORBA::Boolean next_n (
       CORBA::ULong how_many,
       ImplementationRepository::ServerInformationList_out server_list,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
-  static void next_n_skel (
+  
+    static void next_n_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
+      void *_tao_servant_upcall,
+      CORBA::Environment &ACE_TRY_ENV
     );
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
-  static void destroy_skel (
+  
+    static void destroy_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-  class TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n : public TAO_ServerRequestInfo
-  {
-  public:
-    friend class POA_ImplementationRepository::ServerInformationIterator;
-    TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (
-      TAO_ServerRequest &_tao_server_request,
-      POA_ImplementationRepository::ServerInformationIterator *tao_impl,
-      const CORBA::ULong & how_many,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-
-    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));
-
-    virtual char * target_most_derived_interface (
-        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Boolean target_is_a (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &);
-    void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &);
-
-  private:
-    POA_ImplementationRepository::ServerInformationIterator *_tao_impl;
-    const CORBA::ULong & how_many_;
-    void result (CORBA::Boolean result);
-    // update the result
-    CORBA::Boolean _result;
-  };
-
-  class TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy : public TAO_ServerRequestInfo
-  {
-  public:
-    friend class POA_ImplementationRepository::ServerInformationIterator;
-    TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
-      TAO_ServerRequest &_tao_server_request,
-      POA_ImplementationRepository::ServerInformationIterator *tao_impl,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
+      void *_tao_servant_upcall,
+      CORBA::Environment &ACE_TRY_ENV
     );
 
-    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));
-
-    virtual char * target_most_derived_interface (
-        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Boolean target_is_a (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &);
-    void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &);
-
-  private:
-    POA_ImplementationRepository::ServerInformationIterator *_tao_impl;
-
-  };
-
-  #endif /* TAO_HAS_INTERCEPTORS */
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration
+//               Strategized Proxy Broker Declaration 
 //
 
 class TAO_PortableServer_Export _TAO_ServerInformationIterator_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Broker
 {
-public:
+public: 
   _TAO_ServerInformationIterator_Strategized_Proxy_Broker (void);
-
+  
   virtual ~_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void);
-
+  
   virtual ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl &select_proxy (
     ::ImplementationRepository::ServerInformationIterator *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+    CORBA_Environment &ACE_TRY_ENV
   );
 
 private:
-
-// Helper methods that takes care to create the proxy
-// as soon as their use is necessary.
+  // Helper methods that takes care to create the proxy
+  // as soon as their use is necessary.
   void create_proxy (
     int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
-
-private:
-
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl
-   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-
+  *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
+  
   TAO_SYNCH_MUTEX mutex_;
-// This funxtion is used to get an handle to the unique instance
-// of the Strategized Proxy Broker that is available for a given
-// interface.
+  // This funxtion is used to get an handle to the unique instance
+  // of the Strategized Proxy Broker that is available for a given
+  // interface.
 
 public:
   static _TAO_ServerInformationIterator_Strategized_Proxy_Broker *the_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void);
@@ -1605,7 +903,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration
+//            End Strategized Proxy Broker Declaration 
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -1613,16 +911,16 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class TAO_PortableServer_Export _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl :
+class TAO_PortableServer_Export _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl : 
   public virtual ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl
 {
 public:
   _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl (void);
-
+  
   virtual ~_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl (void) { }
-
-    virtual CORBA::Boolean next_n (
+  
+  virtual CORBA::Boolean next_n (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong how_many,
       ImplementationRepository::ServerInformationList_out server_list,
@@ -1631,7 +929,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual void destroy (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -1639,10 +937,10 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
+  
 };
 
-
 //
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
@@ -1652,16 +950,16 @@ public:
 //                    Direct  Impl. Declaration
 //
 
-class TAO_PortableServer_Export _TAO_ServerInformationIterator_Direct_Proxy_Impl :
+class TAO_PortableServer_Export _TAO_ServerInformationIterator_Direct_Proxy_Impl : 
   public virtual ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl,
   public virtual TAO_Direct_Object_Proxy_Impl
 {
 public:
   _TAO_ServerInformationIterator_Direct_Proxy_Impl (void);
-
+  
   virtual ~_TAO_ServerInformationIterator_Direct_Proxy_Impl (void) { }
-
-    virtual CORBA::Boolean next_n (
+  
+  virtual CORBA::Boolean next_n (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong how_many,
       ImplementationRepository::ServerInformationList_out server_list,
@@ -1670,7 +968,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual void destroy (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -1678,8 +976,8 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
-};
+  
+  };
 
 
 //
@@ -1688,7 +986,7 @@ public:
 
 
 }
-TAO_NAMESPACE_CLOSE
+TAO_NAMESPACE_CLOSE // module ImplementationRepository
 
 #include "ImplRepoS_T.h"
 
diff --git a/TAO/tao/PortableServer/ImplRepoS_T.cpp b/TAO/tao/PortableServer/ImplRepoS_T.cpp
index 33c9ff71548..016d28b09a2 100644
--- a/TAO/tao/PortableServer/ImplRepoS_T.cpp
+++ b/TAO/tao/PortableServer/ImplRepoS_T.cpp
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_ORIG_IMPLREPOS_T_CPP_
-#define _TAO_IDL_ORIG_IMPLREPOS_T_CPP_
+#ifndef _TAO_IDL_IMPLREPOS_T_CPP_
+#define _TAO_IDL_IMPLREPOS_T_CPP_
 
 #include "ImplRepoS_T.h"
 
diff --git a/TAO/tao/PortableServer/ImplRepoS_T.h b/TAO/tao/PortableServer/ImplRepoS_T.h
index da800daa397..5ef43a79a77 100644
--- a/TAO/tao/PortableServer/ImplRepoS_T.h
+++ b/TAO/tao/PortableServer/ImplRepoS_T.h
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_ORIG_IMPLREPOS_T_H_
-#define _TAO_IDL_ORIG_IMPLREPOS_T_H_
+#ifndef _TAO_IDL_IMPLREPOS_T_H_
+#define _TAO_IDL_IMPLREPOS_T_H_
 
 #include "ace/pre.h"
 #if defined(_MSC_VER)
@@ -74,16 +74,16 @@ TAO_NAMESPACE  POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
-    void shutdown (
+    
+        void shutdown (
         CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
-  private:
+    
+      private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
@@ -136,8 +136,8 @@ TAO_NAMESPACE  POA_ImplementationRepository
         ImplementationRepository::Administration::NotFound,
         ImplementationRepository::Administration::CannotActivate
       ));
-
-    void register_server (
+    
+        void register_server (
         const char * server,
         const ImplementationRepository::StartupOptions & options,
         CORBA::Environment &ACE_TRY_ENV = 
@@ -147,8 +147,8 @@ TAO_NAMESPACE  POA_ImplementationRepository
         CORBA::SystemException,
         ImplementationRepository::Administration::AlreadyRegistered
       ));
-
-    void reregister_server (
+    
+        void reregister_server (
         const char * server,
         const ImplementationRepository::StartupOptions & options,
         CORBA::Environment &ACE_TRY_ENV = 
@@ -157,8 +157,8 @@ TAO_NAMESPACE  POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
-    void remove_server (
+    
+        void remove_server (
         const char * server,
         CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
@@ -167,8 +167,8 @@ TAO_NAMESPACE  POA_ImplementationRepository
         CORBA::SystemException,
         ImplementationRepository::Administration::NotFound
       ));
-
-    void shutdown_server (
+    
+        void shutdown_server (
         const char * server,
         CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
@@ -177,8 +177,8 @@ TAO_NAMESPACE  POA_ImplementationRepository
         CORBA::SystemException,
         ImplementationRepository::Administration::NotFound
       ));
-
-    char * server_is_running (
+    
+        char * server_is_running (
         const char * server,
         const char * addr,
         ImplementationRepository::ServerObject_ptr server_object,
@@ -189,8 +189,8 @@ TAO_NAMESPACE  POA_ImplementationRepository
         CORBA::SystemException,
         ImplementationRepository::Administration::NotFound
       ));
-
-    void server_is_shutting_down (
+    
+        void server_is_shutting_down (
         const char * server,
         CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
@@ -199,8 +199,8 @@ TAO_NAMESPACE  POA_ImplementationRepository
         CORBA::SystemException,
         ImplementationRepository::Administration::NotFound
       ));
-
-    void find (
+    
+        void find (
         const char * server,
         ImplementationRepository::ServerInformation_out info,
         CORBA::Environment &ACE_TRY_ENV = 
@@ -210,8 +210,8 @@ TAO_NAMESPACE  POA_ImplementationRepository
         CORBA::SystemException,
         ImplementationRepository::Administration::NotFound
       ));
-
-    void list (
+    
+        void list (
         CORBA::ULong how_many,
         ImplementationRepository::ServerInformationList_out server_list,
         ImplementationRepository::ServerInformationIterator_out server_iterator,
@@ -221,8 +221,8 @@ TAO_NAMESPACE  POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
-  private:
+    
+      private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
@@ -274,16 +274,16 @@ TAO_NAMESPACE  POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
-    void destroy (
+    
+        void destroy (
         CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
-  private:
+    
+      private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
diff --git a/TAO/tao/PortableServer/ImplRepoS_T.i b/TAO/tao/PortableServer/ImplRepoS_T.i
index 8493026649f..5ca98d451c6 100644
--- a/TAO/tao/PortableServer/ImplRepoS_T.i
+++ b/TAO/tao/PortableServer/ImplRepoS_T.i
@@ -23,30 +23,30 @@
 
 template <class T> ACE_INLINE
 POA_ImplementationRepository::ServerObject_tie<T>::ServerObject_tie (T &t)
-        : ptr_ (&t),
-          poa_ (PortableServer::POA::_nil ()),
-          rel_ (0)
+	: ptr_ (&t),
+	  poa_ (PortableServer::POA::_nil ()),
+	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_ImplementationRepository::ServerObject_tie<T>::ServerObject_tie (T &t, PortableServer::POA_ptr poa)
-        : ptr_ (&t),
-          poa_ (PortableServer::POA::_duplicate (poa)),
-          rel_ (0)
+	: ptr_ (&t),
+	  poa_ (PortableServer::POA::_duplicate (poa)),
+	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_ImplementationRepository::ServerObject_tie<T>::ServerObject_tie (T *tp, CORBA::Boolean release)
-        : ptr_ (tp),
-          poa_ (PortableServer::POA::_nil ()),
-          rel_ (release)
+	: ptr_ (tp),
+	  poa_ (PortableServer::POA::_nil ()),
+	  rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_ImplementationRepository::ServerObject_tie<T>::ServerObject_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-        : ptr_ (tp),
-          poa_ (PortableServer::POA::_duplicate (poa)),
-          rel_ (release)
+	: ptr_ (tp),
+	  poa_ (PortableServer::POA::_duplicate (poa)),
+	  rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -126,30 +126,30 @@ ACE_TRY_ENV
 
 template <class T> ACE_INLINE
 POA_ImplementationRepository::Administration_tie<T>::Administration_tie (T &t)
-        : ptr_ (&t),
-          poa_ (PortableServer::POA::_nil ()),
-          rel_ (0)
+	: ptr_ (&t),
+	  poa_ (PortableServer::POA::_nil ()),
+	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_ImplementationRepository::Administration_tie<T>::Administration_tie (T &t, PortableServer::POA_ptr poa)
-        : ptr_ (&t),
-          poa_ (PortableServer::POA::_duplicate (poa)),
-          rel_ (0)
+	: ptr_ (&t),
+	  poa_ (PortableServer::POA::_duplicate (poa)),
+	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_ImplementationRepository::Administration_tie<T>::Administration_tie (T *tp, CORBA::Boolean release)
-        : ptr_ (tp),
-          poa_ (PortableServer::POA::_nil ()),
-          rel_ (release)
+	: ptr_ (tp),
+	  poa_ (PortableServer::POA::_nil ()),
+	  rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_ImplementationRepository::Administration_tie<T>::Administration_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-        : ptr_ (tp),
-          poa_ (PortableServer::POA::_duplicate (poa)),
-          rel_ (release)
+	: ptr_ (tp),
+	  poa_ (PortableServer::POA::_duplicate (poa)),
+	  rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -360,30 +360,30 @@ how_many,
 
 template <class T> ACE_INLINE
 POA_ImplementationRepository::ServerInformationIterator_tie<T>::ServerInformationIterator_tie (T &t)
-        : ptr_ (&t),
-          poa_ (PortableServer::POA::_nil ()),
-          rel_ (0)
+	: ptr_ (&t),
+	  poa_ (PortableServer::POA::_nil ()),
+	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_ImplementationRepository::ServerInformationIterator_tie<T>::ServerInformationIterator_tie (T &t, PortableServer::POA_ptr poa)
-        : ptr_ (&t),
-          poa_ (PortableServer::POA::_duplicate (poa)),
-          rel_ (0)
+	: ptr_ (&t),
+	  poa_ (PortableServer::POA::_duplicate (poa)),
+	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_ImplementationRepository::ServerInformationIterator_tie<T>::ServerInformationIterator_tie (T *tp, CORBA::Boolean release)
-        : ptr_ (tp),
-          poa_ (PortableServer::POA::_nil ()),
-          rel_ (release)
+	: ptr_ (tp),
+	  poa_ (PortableServer::POA::_nil ()),
+	  rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_ImplementationRepository::ServerInformationIterator_tie<T>::ServerInformationIterator_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-        : ptr_ (tp),
-          poa_ (PortableServer::POA::_duplicate (poa)),
-          rel_ (release)
+	: ptr_ (tp),
+	  poa_ (PortableServer::POA::_duplicate (poa)),
+	  rel_ (release)
 {}
 
 template <class T> ACE_INLINE
diff --git a/TAO/tao/PortableServer/Makefile b/TAO/tao/PortableServer/Makefile
index 61ba2415183..3c196c09f7f 100644
--- a/TAO/tao/PortableServer/Makefile
+++ b/TAO/tao/PortableServer/Makefile
@@ -39,7 +39,9 @@ CPP_SRCS += \
   Collocated_Object \
   PolicyS \
   ORB_Manager \
+  ImplRepo_i \
   ServerRequestInfo \
+  ServerInterceptorAdapter \
   Default_Servant_Dispatcher \
   Servant_Dispatcher
 
@@ -525,7 +527,9 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Array_Base.cpp \
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
- POA.i $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i POA.i \
+ $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/CORBA_String.h \
@@ -945,44 +949,31 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Array_Base.cpp \
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
- POA.i ImplRepoS.h ImplRepoC.h \
- $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i POA.i \
+ ImplRepoS.h \
+ ImplRepoC.h \
+ portableserver_export.h \
  ImplRepoC.i \
  PortableServer.h \
- portableserver_export.h \
  RTPortableServerC.h \
  Servant_Base.h \
  Collocated_Object.h \
  Collocated_Object.i \
  ThruPOA_Object_Proxy_Impl.h \
  Direct_Object_Proxy_Impl.h \
- ServerRequestInfo.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- ServerRequestInfo.inl \
- ImplRepoS_T.h ImplRepoS_T.i ImplRepoS_T.cpp ImplRepoS.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
+ ImplRepoS_T.h \
+ ImplRepoS_T.i \
+ ImplRepoS_T.cpp \
+ ImplRepoS.i \
+ ImplRepo_i.h \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/CORBA_String.h \
  $(TAO_ROOT)/tao/CORBA_String.inl \
  $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
@@ -992,6 +983,18 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(TAO_ROOT)/tao/Parser_Registry.h \
  $(TAO_ROOT)/tao/Parser_Registry.i \
  $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -1019,8 +1022,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1386,7 +1389,9 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Array_Base.cpp \
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
- POA.i Strategized_Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i POA.i \
+ Strategized_Object_Proxy_Broker.h \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Services.h \
@@ -1438,18 +1443,17 @@ CPPFLAGS += -I$(TAO_ROOT)
  ServerRequestInfo.h \
  $(TAO_ROOT)/tao/StringSeqC.h \
  $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- ServerRequestInfo.inl \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
  $(TAO_ROOT)/tao/TAO_Server_Request.h \
  $(TAO_ROOT)/tao/Tagged_Profile.h \
  $(TAO_ROOT)/tao/GIOPC.h \
  $(TAO_ROOT)/tao/GIOPC.i \
  $(TAO_ROOT)/tao/Tagged_Profile.i \
  $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ ServerRequestInfo.inl ServerInterceptorAdapter.h \
+ ServerInterceptorAdapter.inl \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/Profile.h \
@@ -1457,14 +1461,13 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
  RT_Servant_Dispatcher.h Servant_Dispatcher.h \
  $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h
@@ -1629,18 +1632,18 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/CORBA_String.h \
  $(TAO_ROOT)/tao/CORBA_String.inl \
  $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/Encodable.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/ORB.i
 
@@ -2043,11 +2046,12 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Array_Base.cpp \
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
- POA.i
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i POA.i
 
 .obj/Active_Object_Map.o .obj/Active_Object_Map.so .shobj/Active_Object_Map.o .shobj/Active_Object_Map.so: Active_Object_Map.cpp Active_Object_Map.h \
- $(ACE_ROOT)/ace/pre.h \
- Key_Adapters.h PortableServerC.h portableserver_export.h \
+ $(ACE_ROOT)/ace/pre.h Key_Adapters.h \
+ PortableServerC.h portableserver_export.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
@@ -2450,7 +2454,9 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Array_Base.cpp \
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
- POA.i Operation_Table.h \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i POA.i \
+ Operation_Table.h \
  $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
  $(TAO_ROOT)/tao/ORB_Core.h \
@@ -2508,8 +2514,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2518,8 +2524,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/GIOPC.h \
  $(TAO_ROOT)/tao/GIOPC.i \
  $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
  $(TAO_ROOT)/tao/TAO_Server_Request.i \
  $(TAO_ROOT)/tao/IFR_Client_Adapter.h \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
@@ -2747,7 +2751,9 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Array_Base.cpp \
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
- POA.i ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i POA.i \
+ ThruPOA_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Services.h \
@@ -2803,8 +2809,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i
@@ -3140,16 +3146,16 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/CORBA_String.h \
  $(TAO_ROOT)/tao/CORBA_String.inl \
  $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/Encodable.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Policy_Manager.h \
@@ -3537,8 +3543,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i
@@ -3546,10 +3552,7 @@ CPPFLAGS += -I$(TAO_ROOT)
 .obj/PolicyS.o .obj/PolicyS.so .shobj/PolicyS.o .shobj/PolicyS.so: PolicyS.cpp PolicyS.h \
  $(ACE_ROOT)/ace/pre.h \
  $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
@@ -3558,6 +3561,9 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/OS_Errno.h \
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -3641,13 +3647,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
  $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
@@ -3666,6 +3666,12 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
  PortableServer.h \
  portableserver_export.h \
@@ -3703,25 +3709,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  Collocated_Object.i \
  ThruPOA_Object_Proxy_Impl.h \
  Direct_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(ACE_ROOT)/ace/Array_Base.h \
- $(ACE_ROOT)/ace/Array_Base.inl \
- $(ACE_ROOT)/ace/Array_Base.cpp \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
  PolicyS_T.h PolicyS_T.i PolicyS_T.cpp PolicyS.i \
  Object_Adapter.h \
  Key_Adapters.h \
@@ -3811,6 +3798,18 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(TAO_ROOT)/tao/Parser_Registry.h \
  $(TAO_ROOT)/tao/Parser_Registry.i \
  $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -3818,8 +3817,13 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(ACE_ROOT)/ace/Array_Base.h \
+ $(ACE_ROOT)/ace/Array_Base.inl \
+ $(ACE_ROOT)/ace/Array_Base.cpp \
  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
@@ -3841,17 +3845,20 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/IFR_Client_Adapter.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/RequestInfo_Util.h \
  ServerRequestInfo.h \
  $(TAO_ROOT)/tao/StringSeqC.h \
  $(TAO_ROOT)/tao/StringSeqC.i \
  ServerRequestInfo.inl \
- $(TAO_ROOT)/tao/RequestInfo_Util.h \
+ ServerInterceptorAdapter.h \
+ ServerInterceptorAdapter.inl \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
  $(ACE_ROOT)/ace/Dynamic_Service.i \
@@ -4015,6 +4022,181 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/CORBA_String.inl \
  $(TAO_ROOT)/tao/ORB.i
 
+.obj/ImplRepo_i.o .obj/ImplRepo_i.so .shobj/ImplRepo_i.o .shobj/ImplRepo_i.so: ImplRepo_i.cpp \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ ImplRepo_i.h \
+ ImplRepoS.h \
+ ImplRepoC.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Unbounded_Set.h \
+ $(ACE_ROOT)/ace/Node.h \
+ $(ACE_ROOT)/ace/Node.cpp \
+ $(ACE_ROOT)/ace/Unbounded_Set.inl \
+ $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ portableserver_export.h \
+ ImplRepoC.i \
+ PortableServer.h \
+ RTPortableServerC.h \
+ PortableServerC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ PortableServerC.i \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ RTPortableServerC.i \
+ Servant_Base.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ Servant_Base.i \
+ Collocated_Object.h \
+ Collocated_Object.i \
+ ThruPOA_Object_Proxy_Impl.h \
+ Direct_Object_Proxy_Impl.h \
+ ImplRepoS_T.h \
+ ImplRepoS_T.i \
+ ImplRepoS_T.cpp \
+ ImplRepoS.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/ORB.i
+
 .obj/ServerRequestInfo.o .obj/ServerRequestInfo.so .shobj/ServerRequestInfo.o .shobj/ServerRequestInfo.so: ServerRequestInfo.cpp ServerRequestInfo.h \
  $(ACE_ROOT)/ace/pre.h \
  $(TAO_ROOT)/tao/corbafwd.h \
@@ -4164,14 +4346,265 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Encodable.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.i \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ Object_Adapter.h portableserver_export.h Key_Adapters.h \
+ PortableServerC.h PortableServerC.i \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Unbounded_Queue.h \
+ $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ Key_Adapters.i poa_macros.h RTPortableServerC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ RTPortableServerC.i Servant_Base.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ Servant_Base.i Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ Object_Adapter.i ServerRequestInfo.inl POA.h POAManager.h \
+ POAManager.i \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Array_Base.h \
+ $(ACE_ROOT)/ace/Array_Base.inl \
+ $(ACE_ROOT)/ace/Array_Base.cpp \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ POA.i
+
+.obj/ServerInterceptorAdapter.o .obj/ServerInterceptorAdapter.so .shobj/ServerInterceptorAdapter.o .shobj/ServerInterceptorAdapter.so: ServerInterceptorAdapter.cpp \
+ ServerInterceptorAdapter.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Unbounded_Set.h \
+ $(ACE_ROOT)/ace/Node.h \
+ $(ACE_ROOT)/ace/Node.cpp \
+ $(ACE_ROOT)/ace/Unbounded_Set.inl \
+ $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(ACE_ROOT)/ace/Array_Base.h \
+ $(ACE_ROOT)/ace/Array_Base.inl \
+ $(ACE_ROOT)/ace/Array_Base.cpp \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ ServerInterceptorAdapter.inl ServerRequestInfo.h \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
  $(TAO_ROOT)/tao/StringSeqC.h \
@@ -4180,7 +4613,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/OctetSeqC.i \
  $(TAO_ROOT)/tao/Service_Context.h \
  $(TAO_ROOT)/tao/Service_Context.inl \
- portableserver_export.h ServerRequestInfo.inl \
  $(TAO_ROOT)/tao/TAO_Server_Request.h \
  $(TAO_ROOT)/tao/Tagged_Profile.h \
  $(TAO_ROOT)/tao/GIOPC.h \
@@ -4188,7 +4620,67 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/GIOPC.i \
  $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/TAO_Server_Request.i
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ Object_Adapter.h portableserver_export.h Key_Adapters.h \
+ PortableServerC.h PortableServerC.i \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Unbounded_Queue.h \
+ $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ Key_Adapters.i poa_macros.h RTPortableServerC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ RTPortableServerC.i Servant_Base.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ Servant_Base.i Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ Object_Adapter.i ServerRequestInfo.inl
 
 .obj/Default_Servant_Dispatcher.o .obj/Default_Servant_Dispatcher.so .shobj/Default_Servant_Dispatcher.o .shobj/Default_Servant_Dispatcher.so: Default_Servant_Dispatcher.cpp \
  Default_Servant_Dispatcher.h \
@@ -4729,59 +5221,19 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
- $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
  portableserver_export.h ImplRepoC.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/Profile.h \
@@ -4789,8 +5241,13 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/ORB.h \
@@ -4801,6 +5258,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(ACE_ROOT)/ace/Service_Object.h \
@@ -4813,9 +5272,36 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
  $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(TAO_ROOT)/tao/Adapter.h \
  $(TAO_ROOT)/tao/Adapter.i \
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -4885,6 +5371,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
  $(TAO_ROOT)/tao/TAOC.i \
  $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
  $(TAO_ROOT)/tao/target_specification.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
@@ -4894,12 +5382,16 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/RequestInfo_Util.h
+ $(TAO_ROOT)/tao/RequestInfo_Util.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
+ $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
 
 .obj/ImplRepoS.o .obj/ImplRepoS.so .shobj/ImplRepoS.o .shobj/ImplRepoS.so: ImplRepoS.cpp ImplRepoS.h \
- $(ACE_ROOT)/ace/pre.h \
- ImplRepoC.h \
+ $(ACE_ROOT)/ace/pre.h ImplRepoC.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/post.h \
@@ -5013,23 +5505,28 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ portableserver_export.h ImplRepoC.i \
+ PortableServer.h \
+ portableserver_export.h \
+ RTPortableServerC.h \
+ PortableServerC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ PortableServerC.i \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
@@ -5045,31 +5542,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
  $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- portableserver_export.h ImplRepoC.i \
- PortableServer.h \
- portableserver_export.h \
- RTPortableServerC.h \
- PortableServerC.h \
- PortableServerC.i \
- $(TAO_ROOT)/tao/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
  RTPortableServerC.i \
  Servant_Base.h \
@@ -5079,10 +5551,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  Collocated_Object.i \
  ThruPOA_Object_Proxy_Impl.h \
  Direct_Object_Proxy_Impl.h \
- ServerRequestInfo.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- ServerRequestInfo.inl \
  ImplRepoS_T.h ImplRepoS_T.i ImplRepoS_T.cpp ImplRepoS.i \
  Object_Adapter.h \
  Key_Adapters.h \
@@ -5140,6 +5608,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  Active_Object_Map.i \
  $(TAO_ROOT)/tao/Adapter.h \
  $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
  Object_Adapter.i \
  Operation_Table.h \
  $(TAO_ROOT)/tao/TAO_Server_Request.h \
@@ -5149,6 +5621,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/GIOPC.i \
  $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
  $(TAO_ROOT)/tao/TAO_Server_Request.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/ORB.h \
@@ -5166,6 +5640,18 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(TAO_ROOT)/tao/Parser_Registry.h \
  $(TAO_ROOT)/tao/Parser_Registry.i \
  $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -5201,19 +5687,24 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/IFR_Client_Adapter.h \
  $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/RequestInfo_Util.h \
+ ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ ServerRequestInfo.inl \
+ ServerInterceptorAdapter.h \
+ ServerInterceptorAdapter.inl \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
  $(ACE_ROOT)/ace/Dynamic_Service.i \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/RequestInfo_Util.h
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
 .obj/MessagingS.o .obj/MessagingS.so .shobj/MessagingS.o .shobj/MessagingS.so: MessagingS.cpp \
  $(TAO_ROOT)/tao/orbconf.h \
@@ -5240,8 +5731,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- MessagingS.h \
+ $(ACE_ROOT)/ace/OS.i MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/corbafwd.h \
@@ -5367,9 +5857,9 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Encodable.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/PollableC.i \
@@ -5517,17 +6007,20 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/IFR_Client_Adapter.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/RequestInfo_Util.h \
  ServerRequestInfo.h \
  $(TAO_ROOT)/tao/StringSeqC.h \
  $(TAO_ROOT)/tao/StringSeqC.i \
  ServerRequestInfo.inl \
- $(TAO_ROOT)/tao/RequestInfo_Util.h \
+ ServerInterceptorAdapter.h \
+ ServerInterceptorAdapter.inl \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
  $(ACE_ROOT)/ace/Dynamic_Service.i \
@@ -5662,10 +6155,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/Encodable.h \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
@@ -5692,8 +6185,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/MProfile.i
 
@@ -5919,7 +6412,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Array_Base.cpp \
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
- POA.i \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i POA.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Services.h \
@@ -5973,8 +6467,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/GIOPC.h \
  $(TAO_ROOT)/tao/GIOPC.i \
  $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
  $(TAO_ROOT)/tao/TAO_Server_Request.i \
  $(TAO_ROOT)/tao/debug.h
 
diff --git a/TAO/tao/PortableServer/Makefile.bor b/TAO/tao/PortableServer/Makefile.bor
index d535427968f..0574b118f7c 100644
--- a/TAO/tao/PortableServer/Makefile.bor
+++ b/TAO/tao/PortableServer/Makefile.bor
@@ -16,6 +16,7 @@ OBJFILES = \
 	$(OBJDIR)\Object_Adapter.obj \
 	$(OBJDIR)\Operation_Table.obj \
 	$(OBJDIR)\ORB_Manager.obj \
+	$(OBJDIR)\ImplRepo_i.obj \
 	$(OBJDIR)\POA.obj \
 	$(OBJDIR)\POAManager.obj \
 	$(OBJDIR)\PolicyS.obj \
@@ -23,6 +24,7 @@ OBJFILES = \
 	$(OBJDIR)\PortableServerC.obj \
 	$(OBJDIR)\Servant_Base.obj \
         $(OBJDIR)\Servant_Dispatcher.obj \
+	$(OBJDIR)\ServerInterceptorAdapter.obj \
 	$(OBJDIR)\ServerRequestInfo.obj \
 	$(OBJDIR)\RT_Acceptor_Filters.obj \
         $(OBJDIR)\RT_Servant_Dispatcher.obj \
diff --git a/TAO/tao/PortableServer/MessagingS.cpp b/TAO/tao/PortableServer/MessagingS.cpp
index 6fcbe7f35e0..94fd4a20ffb 100644
--- a/TAO/tao/PortableServer/MessagingS.cpp
+++ b/TAO/tao/PortableServer/MessagingS.cpp
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_ORIG_MESSAGINGS_CPP_
-#define _TAO_IDL_ORIG_MESSAGINGS_CPP_
+#ifndef _TAO_IDL_MESSAGINGS_CPP_
+#define _TAO_IDL_MESSAGINGS_CPP_
 
 #include "tao/orbconf.h"
 
@@ -34,9 +34,12 @@
 #include "tao/ORB_Core.h"
 #include "tao/Stub.h"
 #include "tao/IFR_Client_Adapter.h"
-#include "tao/PortableServer/ServerRequestInfo.h"
+#include "tao/PortableInterceptor.h"
+
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
+#include "tao/PortableServer/ServerRequestInfo.h"
+#include "tao/PortableServer/ServerInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 #include "ace/Dynamic_Service.h"
@@ -48,8 +51,6 @@
 #include "MessagingS.i"
 #endif /* !defined INLINE */
 
-ACE_RCSID(tao, MessagingS, "$Id$")
-
 #if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1)
 
 class TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
@@ -59,9 +60,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 22:01:25 */
+/* starting time is 17:34:18 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/sirion/coryan/head/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -151,7 +152,7 @@ TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable::lookup (const char *str, unsign
     }
   return 0;
 }
-/* ending time is 22:01:25 */
+/* ending time is 17:34:18 */
 static TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable tao_Messaging_ReplyHandler_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -260,10 +261,8 @@ Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function (CORBA::Object_ptr obj
 }
 
 int
-Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_Initializer (long _dummy_)
+Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_Initializer (long)
 {
-  ACE_UNUSED_ARG (_dummy_);
-
   Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer =
     Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function;
 
@@ -318,7 +317,7 @@ POA_Messaging::ReplyHandler::~ReplyHandler (void)
 void POA_Messaging::ReplyHandler::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* context */,
+    void * /* Servant_Upcall */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -341,7 +340,7 @@ void POA_Messaging::ReplyHandler::_is_a_skel (
 void POA_Messaging::ReplyHandler::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* context */,
+    void * /* Servant_Upcall */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -358,7 +357,7 @@ void POA_Messaging::ReplyHandler::_non_existent_skel (
 void POA_Messaging::ReplyHandler::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* context */,
+    void * /* Servant_Upcall */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -430,9 +429,12 @@ void* POA_Messaging::ReplyHandler::_downcast (
   return 0;
 }
 
-void POA_Messaging::ReplyHandler::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_Messaging::ReplyHandler::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
 {
-  this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
+  this->synchronous_upcall_dispatch (req,
+                                     servant_upcall,
+                                     this,
+                                     ACE_TRY_ENV);
 }
 
 const char* POA_Messaging::ReplyHandler::_interface_repository_id (void) const
@@ -446,6 +448,8 @@ POA_Messaging::ReplyHandler::_this (CORBA_Environment &ACE_TRY_ENV)
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
 
+  TAO_Stub_Auto_Ptr safe_stub (stub);
+
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
 
   if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
@@ -454,11 +458,14 @@ POA_Messaging::ReplyHandler::_this (CORBA_Environment &ACE_TRY_ENV)
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
 
   CORBA::Object_var obj = tmp;
+
+  (void) safe_stub.release ();
+
   return ::Messaging::ReplyHandler::_unchecked_narrow (obj.in ());
 }
 
 #endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */
-  
+
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/MessagingS.h b/TAO/tao/PortableServer/MessagingS.h
index 4d00d8c1256..13e0ec51294 100644
--- a/TAO/tao/PortableServer/MessagingS.h
+++ b/TAO/tao/PortableServer/MessagingS.h
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_ORIG_MESSAGINGS_H_
-#define _TAO_IDL_ORIG_MESSAGINGS_H_
+#ifndef _TAO_IDL_MESSAGINGS_H_
+#define _TAO_IDL_MESSAGINGS_H_
 
 #include "ace/pre.h"
 
@@ -87,36 +87,32 @@ TAO_NAMESPACE  POA_Messaging
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
+        void *servant_upcall,
+        CORBA::Environment &ACE_TRY_ENV
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
+        void *servant_upcall,
+        CORBA::Environment &ACE_TRY_ENV
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
+        void *servant_upcall,
+        CORBA::Environment &ACE_TRY_ENV
       );
 
     virtual void _dispatch (
-        TAO_ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
+        TAO_ServerRequest &req,
+        void *_servant_upcall,
+        CORBA::Environment &ACE_TRY_ENV
       );
 
     ::Messaging::ReplyHandler *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
 
@@ -139,13 +135,13 @@ TAO_NAMESPACE  POA_Messaging
 
     virtual ::Messaging::_TAO_ReplyHandler_Proxy_Impl &select_proxy (
       ::Messaging::ReplyHandler *object,
-      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+      CORBA_Environment &ACE_TRY_ENV
     );
 
   private:
 
-  // Helper methods that takes care to create the proxy
-  // as soon as their use is necessary.
+    // Helper methods that takes care to create the proxy
+    // as soon as their use is necessary.
     void create_proxy (
       int collocation_strategy,
       CORBA::Environment &ACE_TRY_ENV
@@ -157,12 +153,12 @@ TAO_NAMESPACE  POA_Messaging
     // are totally stateless, and those can be shared by all the
     // instances of a given IDL interface type.
     ::Messaging::_TAO_ReplyHandler_Proxy_Impl
-     *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
+    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
 
     TAO_SYNCH_MUTEX mutex_;
-  // This funxtion is used to get an handle to the unique instance
-  // of the Strategized Proxy Broker that is available for a given
-  // interface.
+    // This funxtion is used to get an handle to the unique instance
+    // of the Strategized Proxy Broker that is available for a given
+    // interface.
 
   public:
     static _TAO_ReplyHandler_Strategized_Proxy_Broker *the_TAO_ReplyHandler_Strategized_Proxy_Broker (void);
@@ -174,25 +170,25 @@ TAO_NAMESPACE  POA_Messaging
   ///////////////////////////////////////////////////////////////////////
 
 
-///////////////////////////////////////////////////////////////////////
-//                    ThruPOA  Impl. Declaration
-//
+  ///////////////////////////////////////////////////////////////////////
+  //                    ThruPOA  Impl. Declaration
+  //
 
-class TAO_PortableServer_Export _TAO_ReplyHandler_ThruPOA_Proxy_Impl :
-  public virtual ::Messaging::_TAO_ReplyHandler_Proxy_Impl,
-  public virtual TAO_ThruPOA_Object_Proxy_Impl
-{
-public:
-  _TAO_ReplyHandler_ThruPOA_Proxy_Impl (void);
+  class TAO_PortableServer_Export _TAO_ReplyHandler_ThruPOA_Proxy_Impl :
+    public virtual ::Messaging::_TAO_ReplyHandler_Proxy_Impl,
+    public virtual TAO_ThruPOA_Object_Proxy_Impl
+  {
+  public:
+    _TAO_ReplyHandler_ThruPOA_Proxy_Impl (void);
 
-  virtual ~_TAO_ReplyHandler_ThruPOA_Proxy_Impl (void) { }
+    virtual ~_TAO_ReplyHandler_ThruPOA_Proxy_Impl (void) { }
 
   };
 
 
-//
-//                ThruPOA  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
+  //
+  //                ThruPOA  Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
 
 
 ///////////////////////////////////////////////////////////////////////
diff --git a/TAO/tao/PortableServer/MessagingS_T.cpp b/TAO/tao/PortableServer/MessagingS_T.cpp
index 4dd199b72f4..50339592624 100644
--- a/TAO/tao/PortableServer/MessagingS_T.cpp
+++ b/TAO/tao/PortableServer/MessagingS_T.cpp
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_ORIG_MESSAGINGS_T_CPP_
-#define _TAO_IDL_ORIG_MESSAGINGS_T_CPP_
+#ifndef _TAO_IDL_MESSAGINGS_T_CPP_
+#define _TAO_IDL_MESSAGINGS_T_CPP_
 
 #include "MessagingS_T.h"
 
diff --git a/TAO/tao/PortableServer/MessagingS_T.h b/TAO/tao/PortableServer/MessagingS_T.h
index b9e6c8f3c1b..a6d4e852dee 100644
--- a/TAO/tao/PortableServer/MessagingS_T.h
+++ b/TAO/tao/PortableServer/MessagingS_T.h
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_ORIG_MESSAGINGS_T_H_
-#define _TAO_IDL_ORIG_MESSAGINGS_T_H_
+#ifndef _TAO_IDL_MESSAGINGS_T_H_
+#define _TAO_IDL_MESSAGINGS_T_H_
 
 #include "ace/pre.h"
 #if defined(_MSC_VER)
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index 9544ead8f48..c73983e4944 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -5,6 +5,7 @@
 #include "POA.h"
 #include "Strategized_Object_Proxy_Broker.h"
 #include "ServerRequestInfo.h"
+#include "ServerInterceptorAdapter.h"
 
 // -- ACE Include --
 #include "ace/Auto_Ptr.h"
@@ -256,7 +257,6 @@ TAO_Object_Adapter::create_lock (int enable_locking,
 int
 TAO_Object_Adapter::dispatch_servant (const TAO_ObjectKey &key,
                                       TAO_ServerRequest &req,
-                                      void *context,
                                       CORBA::Object_out forward_to,
                                       CORBA::Environment &ACE_TRY_ENV)
 {
@@ -285,7 +285,6 @@ TAO_Object_Adapter::dispatch_servant (const TAO_ObjectKey &key,
 
     this->servant_dispatcher_->dispatch (servant_upcall,
                                          req,
-                                         context,
                                          ACE_TRY_ENV);
     ACE_CHECK_RETURN (result);
   }
@@ -620,7 +619,6 @@ TAO_Object_Adapter::priority (void) const
 int
 TAO_Object_Adapter::dispatch (TAO_ObjectKey &key,
                               TAO_ServerRequest &request,
-                              void *context,
                               CORBA::Object_out forward_to,
                               CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -639,7 +637,7 @@ TAO_Object_Adapter::dispatch (TAO_ObjectKey &key,
     this->orb_core_.server_request_interceptors (),
     request.interceptor_count ());
 
-  TAO_ServerRequestInfo ri (request);
+  TAO_ServerRequestInfo ri (request, 0);
 
   ACE_TRY
     {
@@ -648,11 +646,21 @@ TAO_Object_Adapter::dispatch (TAO_ObjectKey &key,
       // servant.
       sri_adapter.receive_request_service_contexts (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
+
+      // If a PortableInterceptor::ForwardRequest exception was
+      // thrown, then set the forward_to object reference and return
+      // with the appropriate return status.
+      if (sri_adapter.location_forwarded ())
+        {
+          forward_to = ri.forward_reference (ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
+          return TAO_Adapter::DS_FORWARD;
+        }
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
       result = this->dispatch_servant (key,
                                        request,
-                                       context,
                                        forward_to,
                                        ACE_TRY_ENV);
 
@@ -667,23 +675,25 @@ TAO_Object_Adapter::dispatch (TAO_ObjectKey &key,
           ACE_TRY_CHECK;
         }
     }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc);
-      sri_adapter.send_other (&ri,
-                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      forward_to = CORBA::Object::_duplicate (exc.forward.in ());
-      return TAO_Adapter::DS_FORWARD;
-    }
   ACE_CATCHANY
     {
+      ri.exception (&ACE_ANY_EXCEPTION);
+
       sri_adapter.send_exception (&ri,
                                   ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    };
+
+      PortableInterceptor::ReplyStatus status =
+        ri.reply_status (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      // Only re-throw the exception if it hasn't been transformed by
+      // the send_exception() interception point (e.g. to a
+      // LOCATION_FORWARD).
+      if (status == PortableInterceptor::SYSTEM_EXCEPTION
+          || status == PortableInterceptor::USER_EXCEPTION)
+        ACE_RE_THROW;
+    }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (result);
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
@@ -743,11 +753,12 @@ TAO_Object_Adapter::create_collocated_object (TAO_Stub *stub,
               //       -Ossama
               stub->servant_orb (this->orb_core_.orb ());
 
-              CORBA::Object_ptr x;
+              CORBA_Object_ptr x;
               ACE_NEW_RETURN (x,
-                              CORBA::Object (stub, 1,
+                              CORBA::Object (stub,
+                                             1,
                                              servant),
-                              0);
+                              CORBA::Object::_nil ());
 
               // Here we set the strategized Proxy Broker.
               x->_proxy_broker (the_tao_strategized_object_proxy_broker ());
@@ -1068,7 +1079,8 @@ TAO_Object_Adapter::Servant_Upcall::Servant_Upcall (TAO_ORB_Core *oc)
     poa_ (0),
     servant_ (0),
     state_ (INITIAL_STAGE),
-    id_ (),
+    system_id_ (),
+    user_id_ (0),
     current_context_ (),
 #if (TAO_HAS_MINIMUM_POA == 0)
     cookie_ (0),
@@ -1108,7 +1120,7 @@ TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key
 
   // Locate the POA.
   this->object_adapter_->locate_poa (key,
-                                     this->id_,
+                                     this->system_id_,
                                      this->poa_,
                                      ACE_TRY_ENV);
   ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED);
@@ -1134,7 +1146,7 @@ TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key
 
       // Lookup the servant.
       this->servant_ = this->poa_->locate_servant_i (operation,
-                                                     this->id_,
+                                                     this->system_id_,
                                                      *this,
                                                      this->current_context_,
                                                      ACE_TRY_ENV);
diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h
index 5ee0f3bee94..840d7e68c4d 100644
--- a/TAO/tao/PortableServer/Object_Adapter.h
+++ b/TAO/tao/PortableServer/Object_Adapter.h
@@ -233,7 +233,6 @@ public:
 
   int dispatch_servant (const TAO_ObjectKey &key,
                         TAO_ServerRequest &req,
-                        void *context,
                         CORBA::Object_out forward_to,
                         CORBA_Environment &ACE_TRY_ENV);
 
@@ -294,7 +293,6 @@ public:
   virtual int priority (void) const;
   virtual int dispatch (TAO_ObjectKey &key,
                         TAO_ServerRequest &request,
-                        void *context, /* unused? */
                         CORBA::Object_out foward_to,
                         CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -629,7 +627,12 @@ public:
     // Object Adapter accessor.
 
     const PortableServer::ObjectId &id (void) const;
-    // ID accessor.
+    // System ID accessor.
+
+    void user_id (const PortableServer::ObjectId *);
+    const PortableServer::ObjectId &user_id (void) const;
+    // User ID accessors.  This is the same value returned by
+    // PortableServer::Current::get_object_id().
 
     PortableServer::Servant servant (void) const;
     // Servant accessor.
@@ -684,7 +687,9 @@ public:
 
     State state_;
 
-    PortableServer::ObjectId id_;
+    PortableServer::ObjectId system_id_;
+
+    const PortableServer::ObjectId *user_id_;
 
     TAO_POA_Current_Impl current_context_;
 
diff --git a/TAO/tao/PortableServer/Object_Adapter.i b/TAO/tao/PortableServer/Object_Adapter.i
index f88e3f9f789..b26036dc8fb 100644
--- a/TAO/tao/PortableServer/Object_Adapter.i
+++ b/TAO/tao/PortableServer/Object_Adapter.i
@@ -178,7 +178,20 @@ TAO_Object_Adapter::Servant_Upcall::object_adapter (void) const
 ACE_INLINE const PortableServer::ObjectId &
 TAO_Object_Adapter::Servant_Upcall::id (void) const
 {
-  return this->id_;
+  return this->system_id_;
+}
+
+ACE_INLINE void
+TAO_Object_Adapter::Servant_Upcall::user_id (
+  const PortableServer::ObjectId *id)
+{
+  this->user_id_ = id;
+}
+
+ACE_INLINE const PortableServer::ObjectId &
+TAO_Object_Adapter::Servant_Upcall::user_id (void) const
+{
+  return *(this->user_id_);
 }
 
 #if (TAO_HAS_MINIMUM_POA == 0)
@@ -288,4 +301,3 @@ TAO_POA_Current_Impl::priority (void) const
 {
   return this->priority_;
 }
-
diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp
index 02dcba3f4a7..923bf1c5373 100644
--- a/TAO/tao/PortableServer/POA.cpp
+++ b/TAO/tao/PortableServer/POA.cpp
@@ -2282,6 +2282,8 @@ TAO_POA::locate_servant_i (const char *operation,
           ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
                             0);
         }
+
+      servant_upcall.user_id (&poa_current_impl.object_id_);
     }
   else
     {
@@ -2294,6 +2296,8 @@ TAO_POA::locate_servant_i (const char *operation,
                                            ACE_const_cast (CORBA::Octet *,
                                                            system_id.get_buffer ()),
                                            0);
+
+      servant_upcall.user_id (&system_id);
     }
 
   // If the POA has the RETAIN policy, the POA looks in the Active
diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp
index f337d48d922..0199f0e709f 100644
--- a/TAO/tao/PortableServer/PolicyS.cpp
+++ b/TAO/tao/PortableServer/PolicyS.cpp
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_ORIG_POLICYS_CPP_
-#define _TAO_IDL_ORIG_POLICYS_CPP_
+#ifndef _TAO_IDL_CORBA_POLICYS_CPP_
+#define _TAO_IDL_CORBA_POLICYS_CPP_
 
 #include "PolicyS.h"
 
@@ -30,9 +30,12 @@
 #include "tao/ORB_Core.h"
 #include "tao/Stub.h"
 #include "tao/IFR_Client_Adapter.h"
-#include "tao/PortableServer/ServerRequestInfo.h"
+#include "tao/PortableInterceptor.h"
+
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
+#include "tao/PortableServer/ServerRequestInfo.h"
+#include "tao/PortableServer/ServerInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 #include "ace/Dynamic_Service.h"
@@ -51,9 +54,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 14:08:51 */
+/* starting time is 12:07:54 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/sirion/coryan/head/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Policy_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Policy_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_Policy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -148,7 +151,7 @@ TAO_CORBA_Policy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len
     }
   return 0;
 }
-/* ending time is 14:08:51 */
+/* ending time is 12:07:54 */
 static TAO_CORBA_Policy_Perfect_Hash_OpTable tao_CORBA_Policy_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -157,8 +160,9 @@ class TAO_ServerRequestInfo_CORBA_Policy_policy_type_get : public TAO_ServerRequ
 public:
   TAO_ServerRequestInfo_CORBA_Policy_policy_type_get (
     TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
     POA_CORBA_Policy *tao_impl,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   );
 
@@ -167,23 +171,23 @@ public:
         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));
-  
+
   virtual char * target_most_derived_interface (
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
@@ -194,7 +198,7 @@ public:
 private:
   TAO_ServerRequestInfo_CORBA_Policy_policy_type_get (const TAO_ServerRequestInfo_CORBA_Policy_policy_type_get &);
   void operator= (const TAO_ServerRequestInfo_CORBA_Policy_policy_type_get &);
-  
+
 private:
   POA_CORBA_Policy *_tao_impl;
   CORBA::PolicyType _result;
@@ -202,10 +206,11 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::TAO_ServerRequestInfo_CORBA_Policy_policy_type_get (
     TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Policy *tao_impl,
     CORBA::Environment &
   )
-  : TAO_ServerRequestInfo (_tao_server_request),
+  : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
@@ -217,7 +222,7 @@ TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::arguments (CORBA::Environmen
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -229,11 +234,11 @@ TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::exceptions (CORBA::Environme
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -242,11 +247,11 @@ TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::result (CORBA::Environment &
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
-  
+
   return safe_result_any._retn ();
 }
 
@@ -268,7 +273,7 @@ TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::target_is_a (
   return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
 }
 
-void 
+void
 TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::result (CORBA::PolicyType result)
 {
   // Update the result.
@@ -280,8 +285,9 @@ class TAO_ServerRequestInfo_CORBA_Policy_copy : public TAO_ServerRequestInfo
 public:
   TAO_ServerRequestInfo_CORBA_Policy_copy (
     TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
     POA_CORBA_Policy *tao_impl,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   );
 
@@ -290,45 +296,46 @@ public:
         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));
-  
+
   virtual char * target_most_derived_interface (
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA_Policy_ptr result);
+  void result (CORBA::Policy_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_Policy_copy (const TAO_ServerRequestInfo_CORBA_Policy_copy &);
   void operator= (const TAO_ServerRequestInfo_CORBA_Policy_copy &);
-  
+
 private:
   POA_CORBA_Policy *_tao_impl;
-  CORBA_Policy_ptr _result;
+  CORBA::Policy_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_Policy_copy::TAO_ServerRequestInfo_CORBA_Policy_copy (
     TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Policy *tao_impl,
     CORBA::Environment &
   )
-  : TAO_ServerRequestInfo (_tao_server_request),
+  : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
@@ -340,7 +347,7 @@ TAO_ServerRequestInfo_CORBA_Policy_copy::arguments (CORBA::Environment &ACE_TRY_
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -352,11 +359,11 @@ TAO_ServerRequestInfo_CORBA_Policy_copy::exceptions (CORBA::Environment &ACE_TRY
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_CORBA_Policy_copy::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -365,11 +372,11 @@ TAO_ServerRequestInfo_CORBA_Policy_copy::result (CORBA::Environment &ACE_TRY_ENV
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
-  
+
   return safe_result_any._retn ();
 }
 
@@ -391,8 +398,8 @@ TAO_ServerRequestInfo_CORBA_Policy_copy::target_is_a (
   return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
 }
 
-void 
-TAO_ServerRequestInfo_CORBA_Policy_copy::result (CORBA_Policy_ptr result)
+void
+TAO_ServerRequestInfo_CORBA_Policy_copy::result (CORBA::Policy_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -403,8 +410,9 @@ class TAO_ServerRequestInfo_CORBA_Policy_destroy : public TAO_ServerRequestInfo
 public:
   TAO_ServerRequestInfo_CORBA_Policy_destroy (
     TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
     POA_CORBA_Policy *tao_impl,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   );
 
@@ -413,44 +421,45 @@ public:
         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));
-  
+
   virtual char * target_most_derived_interface (
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  
+
 private:
   TAO_ServerRequestInfo_CORBA_Policy_destroy (const TAO_ServerRequestInfo_CORBA_Policy_destroy &);
   void operator= (const TAO_ServerRequestInfo_CORBA_Policy_destroy &);
-  
+
 private:
   POA_CORBA_Policy *_tao_impl;
-  
+
 };
 
 TAO_ServerRequestInfo_CORBA_Policy_destroy::TAO_ServerRequestInfo_CORBA_Policy_destroy (
     TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Policy *tao_impl,
     CORBA::Environment &
   )
-  : TAO_ServerRequestInfo (_tao_server_request),
+  : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
@@ -462,7 +471,7 @@ TAO_ServerRequestInfo_CORBA_Policy_destroy::arguments (CORBA::Environment &ACE_T
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -474,11 +483,11 @@ TAO_ServerRequestInfo_CORBA_Policy_destroy::exceptions (CORBA::Environment &ACE_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_CORBA_Policy_destroy::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -487,7 +496,7 @@ TAO_ServerRequestInfo_CORBA_Policy_destroy::result (CORBA::Environment &ACE_TRY_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -516,53 +525,53 @@ TAO_ServerRequestInfo_CORBA_Policy_destroy::target_is_a (
 //
 
 // Factory function Implementation.
-_TAO_CORBA_Policy_Strategized_Proxy_Broker *_TAO_CORBA_Policy_Strategized_Proxy_Broker::the_TAO_CORBA_Policy_Strategized_Proxy_Broker (void)
+POA_CORBA_TAO_Policy_Strategized_Proxy_Broker *POA_CORBA_TAO_Policy_Strategized_Proxy_Broker::the_TAO_Policy_Strategized_Proxy_Broker (void)
 {
-  static _TAO_CORBA_Policy_Strategized_Proxy_Broker strategized_proxy_broker;
+  static POA_CORBA_TAO_Policy_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
 }
 
-_TAO_CORBA_Policy_Strategized_Proxy_Broker::_TAO_CORBA_Policy_Strategized_Proxy_Broker (void)
+POA_CORBA_TAO_Policy_Strategized_Proxy_Broker::POA_CORBA_TAO_Policy_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
-  
+
 }
 
-_TAO_CORBA_Policy_Strategized_Proxy_Broker::~_TAO_CORBA_Policy_Strategized_Proxy_Broker (void)
+POA_CORBA_TAO_Policy_Strategized_Proxy_Broker::~POA_CORBA_TAO_Policy_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     delete this->proxy_cache_[i];
-  
+
 }
 
-_TAO_CORBA_Policy_Proxy_Impl&
-_TAO_CORBA_Policy_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_Policy *object,
+CORBA_TAO_Policy_Proxy_Impl&
+POA_CORBA_TAO_Policy_Strategized_Proxy_Broker::select_proxy (
+    ::CORBA::Policy *object,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   int strategy =
     TAO_ORB_Core::collocation_strategy (object);
-  
+
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
-  
+
   this->create_proxy (strategy, ACE_TRY_ENV);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-  
+
   return *this->proxy_cache_[strategy];
-  
+
 }
 
-void 
-_TAO_CORBA_Policy_Strategized_Proxy_Broker::create_proxy (
+void
+POA_CORBA_TAO_Policy_Strategized_Proxy_Broker::create_proxy (
     int strategy,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
-  
+
   if (this->proxy_cache_[strategy] == 0)
     {
       switch (strategy)
@@ -570,33 +579,24 @@ _TAO_CORBA_Policy_Strategized_Proxy_Broker::create_proxy (
         case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              _TAO_CORBA_Policy_ThruPOA_Proxy_Impl,
-              CORBA::NO_MEMORY ()
-          );
-          ACE_CHECK;
-          break;
-          
-        case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY:
-          ACE_NEW_THROW_EX (
-              this->proxy_cache_[strategy],
-              _TAO_CORBA_Policy_Direct_Proxy_Impl,
+              POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
           break;
-          
+
         case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY:
         default:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              ::_TAO_CORBA_Policy_Remote_Proxy_Impl,
+              CORBA_TAO_Policy_Remote_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
           break;
-        
+
       }
-    
+
   }
 }
 
@@ -606,39 +606,37 @@ _TAO_CORBA_Policy_Strategized_Proxy_Broker::create_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 
-_TAO_CORBA_Policy_Proxy_Broker *
-_TAO_CORBA_Policy_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+CORBA_TAO_Policy_Proxy_Broker *
+CORBA_CORBA_TAO_Policy_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 {
   ACE_UNUSED_ARG (obj);
-  return ::_TAO_CORBA_Policy_Strategized_Proxy_Broker::the_TAO_CORBA_Policy_Strategized_Proxy_Broker();
+  return ::POA_CORBA_TAO_Policy_Strategized_Proxy_Broker::the_TAO_Policy_Strategized_Proxy_Broker();
 }
 
 int
-_TAO_CORBA_Policy_Proxy_Broker_Factory_Initializer (long _dummy_)
+CORBA_CORBA_TAO_Policy_Proxy_Broker_Factory_Initializer (long)
 {
-  ACE_UNUSED_ARG (_dummy_);
-  
-  _TAO_CORBA_Policy_Proxy_Broker_Factory_function_pointer = 
-    _TAO_CORBA_Policy_Proxy_Broker_Factory_function;
-  
+  CORBA_CORBA_TAO_Policy_Proxy_Broker_Factory_function_pointer =
+    CORBA_CORBA_TAO_Policy_Proxy_Broker_Factory_function;
+
   return 0;
 }
 
-static int _TAO_CORBA_Policy_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-  _TAO_CORBA_Policy_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_Policy_Proxy_Broker_Factory_Initializer));
+static int CORBA_CORBA_TAO_Policy_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+  CORBA_CORBA_TAO_Policy_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA_CORBA_TAO_Policy_Proxy_Broker_Factory_Initializer));
 
 
 ///////////////////////////////////////////////////////////////////////
 //                 ThruPOA Proxy  Implementation
 //
 
-_TAO_CORBA_Policy_ThruPOA_Proxy_Impl::_TAO_CORBA_Policy_ThruPOA_Proxy_Impl (void)
+POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
-CORBA::PolicyType _TAO_CORBA_Policy_ThruPOA_Proxy_Impl::policy_type (
-    CORBA_Object *_collocated_tao_target_,
+CORBA::PolicyType POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::policy_type (
+    CORBA::Object_ptr _collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -661,22 +659,22 @@ CORBA::PolicyType _TAO_CORBA_Policy_ThruPOA_Proxy_Impl::policy_type (
     return ACE_reinterpret_cast (
       POA_CORBA_Policy_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Policy:1.0"
+          "IDL:omg.org/CORBA/Policy:1.0"
         )
     )->policy_type (
         ACE_TRY_ENV
       );
 }
 
-CORBA_Policy_ptr _TAO_CORBA_Policy_ThruPOA_Proxy_Impl::copy (
-    CORBA_Object *_collocated_tao_target_,
+CORBA::Policy_ptr POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::copy (
+    CORBA::Object_ptr _collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-    CORBA_Policy_var _tao_retval;
+    CORBA::Policy_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -692,15 +690,15 @@ CORBA_Policy_ptr _TAO_CORBA_Policy_ThruPOA_Proxy_Impl::copy (
     return ACE_reinterpret_cast (
       POA_CORBA_Policy_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Policy:1.0"
+          "IDL:omg.org/CORBA/Policy:1.0"
         )
     )->copy (
         ACE_TRY_ENV
       );
 }
 
-void _TAO_CORBA_Policy_ThruPOA_Proxy_Impl::destroy (
-    CORBA_Object *_collocated_tao_target_,
+void POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::destroy (
+    CORBA::Object_ptr _collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -721,7 +719,7 @@ void _TAO_CORBA_Policy_ThruPOA_Proxy_Impl::destroy (
     ACE_reinterpret_cast (
       POA_CORBA_Policy_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Policy:1.0"
+          "IDL:omg.org/CORBA/Policy:1.0"
         )
     )->destroy (
         ACE_TRY_ENV
@@ -733,7 +731,6 @@ void _TAO_CORBA_Policy_ThruPOA_Proxy_Impl::destroy (
 //           End ThruPOA Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-
 ///////////////////////////////////////////////////////////////////////
 //                 Direct Proxy  Implementation
 //
@@ -742,60 +739,61 @@ _TAO_CORBA_Policy_Direct_Proxy_Impl::_TAO_CORBA_Policy_Direct_Proxy_Impl (void)
 {}
 
 CORBA::PolicyType _TAO_CORBA_Policy_Direct_Proxy_Impl::policy_type  (
-    CORBA_Object *_collocated_tao_target_,
+    CORBA::Object_ptr _collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
-  )
+    )
   ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
+                   CORBA::SystemException
+                   ))
 {
   return ACE_reinterpret_cast (
-      POA_CORBA_Policy_ptr,
-      _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA_Policy:1.0")
-    )->policy_type (
-          ACE_TRY_ENV
-        );
-  
+           POA_CORBA_Policy_ptr,
+           _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA/Policy:1.0")
+           )->policy_type (
+                           ACE_TRY_ENV
+                           );
+
 }
 
 CORBA_Policy_ptr _TAO_CORBA_Policy_Direct_Proxy_Impl::copy  (
-    CORBA_Object *_collocated_tao_target_,
+    CORBA::Object_ptr _collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
-  )
+    )
   ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
+                   CORBA::SystemException
+                   ))
 {
   return ACE_reinterpret_cast (
-      POA_CORBA_Policy_ptr,
-      _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA_Policy:1.0")
-    )->copy (
-          ACE_TRY_ENV
-        );
-  
+           POA_CORBA_Policy_ptr,
+           _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA/Policy:1.0")
+           )->copy (
+                    ACE_TRY_ENV
+                    );
+
 }
 
 void _TAO_CORBA_Policy_Direct_Proxy_Impl::destroy  (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
-  )
+              CORBA::Object_ptr _collocated_tao_target_,
+              CORBA::Environment &ACE_TRY_ENV
+              )
   ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
+                   CORBA::SystemException
+                   ))
 {
   ACE_reinterpret_cast (
-      POA_CORBA_Policy_ptr,
-      _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA_Policy:1.0")
+    POA_CORBA_Policy_ptr,
+    _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA/Policy:1.0")
     )->destroy (
-          ACE_TRY_ENV
-        );
-  
+                ACE_TRY_ENV
+                );
+
 }
 
 
 //
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
+
 // skeleton constructor
 POA_CORBA_Policy::POA_CORBA_Policy (void)
 {
@@ -814,13 +812,17 @@ POA_CORBA_Policy::~POA_CORBA_Policy (void)
 
 void POA_CORBA_Policy::_get_policy_type_skel (
     TAO_ServerRequest &_tao_server_request,
-    void *_tao_object_reference, 
-    void * /* context */, 
+    void *_tao_object_reference,
+    void *_tao_servant_upcall,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA_Policy *_tao_impl = (POA_CORBA_Policy *)_tao_object_reference;
-  
+  POA_CORBA_Policy *_tao_impl =
+    ACE_static_cast (POA_CORBA_Policy *, _tao_object_reference);
+
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+
     CORBA::PolicyType _tao_retval = 0;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -828,25 +830,26 @@ void POA_CORBA_Policy::_get_policy_type_skel (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_CORBA_Policy_policy_type_get ri (
       _tao_server_request,
+      _tao_upcall,
       _tao_impl,
       ACE_TRY_ENV
     );
-  
+
   ACE_TRY
     {
       _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
+      _tao_retval =
       _tao_impl->policy_type (
           ACE_TRY_ENV
         );
       TAO_INTERCEPTOR_CHECK;
-      
+
 #if (TAO_HAS_INTERCEPTORS == 1)
       CORBA::PolicyType _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
@@ -854,16 +857,6 @@ void POA_CORBA_Policy::_get_policy_type_skel (
       _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
@@ -872,78 +865,81 @@ void POA_CORBA_Policy::_get_policy_type_skel (
           ACE_TRY_ENV
         );
       ACE_TRY_CHECK;
-      ACE_RE_THROW;
+
+      PortableInterceptor::ReplyStatus _tao_status =
+        ri.reply_status (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+          || _tao_status == PortableInterceptor::USER_EXCEPTION)
+        ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
+
   if (!(
       (_tao_out << _tao_retval)
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  ACE_UNUSED_ARG (_tao_upcall);
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Policy::copy_skel (
     TAO_ServerRequest &_tao_server_request,
-    void *_tao_object_reference, 
-    void * /* context */, 
+    void *_tao_object_reference,
+    void *_tao_servant_upcall,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA_Policy *_tao_impl = (POA_CORBA_Policy *)_tao_object_reference;
-  
-    CORBA_Policy_var _tao_retval;
+  POA_CORBA_Policy *_tao_impl =
+    ACE_static_cast (POA_CORBA_Policy *, _tao_object_reference);
+
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+
+    CORBA::Policy_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_CORBA_Policy_copy ri (
       _tao_server_request,
+      _tao_upcall,
       _tao_impl,
       ACE_TRY_ENV
     );
-  
+
   ACE_TRY
     {
       _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
+      _tao_retval =
       _tao_impl->copy (
           ACE_TRY_ENV
         );
       TAO_INTERCEPTOR_CHECK;
-      
+
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA_Policy_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA::Policy_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
       _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
@@ -952,75 +948,79 @@ void POA_CORBA_Policy::copy_skel (
           ACE_TRY_ENV
         );
       ACE_TRY_CHECK;
-      ACE_RE_THROW;
+
+      PortableInterceptor::ReplyStatus _tao_status =
+        ri.reply_status (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+          || _tao_status == PortableInterceptor::USER_EXCEPTION)
+        ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
+
   if (!(
       (_tao_out << _tao_retval.in ())
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  ACE_UNUSED_ARG (_tao_upcall);
+
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Policy::destroy_skel (
     TAO_ServerRequest &_tao_server_request,
-    void *_tao_object_reference, 
-    void * /* context */, 
+    void *_tao_object_reference,
+    void *_tao_servant_upcall,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA_Policy *_tao_impl = (POA_CORBA_Policy *)_tao_object_reference;
-  
+  POA_CORBA_Policy *_tao_impl =
+    ACE_static_cast (POA_CORBA_Policy *, _tao_object_reference);
+
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+
   _tao_server_request.argument_flag (0);
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_CORBA_Policy_destroy ri (
       _tao_server_request,
+      _tao_upcall,
       _tao_impl,
       ACE_TRY_ENV
     );
-  
+
   ACE_TRY
     {
       _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       _tao_impl->destroy (
           ACE_TRY_ENV
         );
       TAO_INTERCEPTOR_CHECK;
-      
+
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
       _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
@@ -1029,22 +1029,31 @@ void POA_CORBA_Policy::destroy_skel (
           ACE_TRY_ENV
         );
       ACE_TRY_CHECK;
-      ACE_RE_THROW;
+
+      PortableInterceptor::ReplyStatus _tao_status =
+        ri.reply_status (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+          || _tao_status == PortableInterceptor::USER_EXCEPTION)
+        ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
+  ACE_UNUSED_ARG (_tao_upcall);
+
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Policy::_is_a_skel (
-    TAO_ServerRequest &_tao_server_request, 
+    TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* context */,
+    void * /* Servant_Upcall */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -1054,10 +1063,10 @@ void POA_CORBA_Policy::_is_a_skel (
   CORBA::String_var value;
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
-  
+
   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -1065,16 +1074,16 @@ void POA_CORBA_Policy::_is_a_skel (
 }
 
 void POA_CORBA_Policy::_non_existent_skel (
-    TAO_ServerRequest &_tao_server_request, 
+    TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* context */,
+    void * /* Servant_Upcall */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   POA_CORBA_Policy *_tao_impl = (POA_CORBA_Policy *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -1082,35 +1091,35 @@ void POA_CORBA_Policy::_non_existent_skel (
 }
 
 void POA_CORBA_Policy::_interface_skel (
-    TAO_ServerRequest &_tao_server_request, 
+    TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* context */,
+    void * /* Servant_Upcall */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   POA_CORBA_Policy *_tao_impl = (POA_CORBA_Policy *) _tao_object_reference;
   CORBA_InterfaceDef_ptr _tao_retval = 0;
   CORBA::Boolean _tao_result = 0;
-  
+
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS ());
     }
-  
+
   ACE_TRY
     {
       _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      
+
       _tao_server_request.init_reply ();
-      
+
       TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-      
+
       _tao_result =
         _tao_adapter->interfacedef_cdr_insert (
             _tao_out,
@@ -1122,7 +1131,7 @@ void POA_CORBA_Policy::_interface_skel (
       _tao_adapter->dispose (_tao_retval);
     }
   ACE_ENDTRY;
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -1136,9 +1145,9 @@ CORBA::Boolean POA_CORBA_Policy::_is_a (
 {
   const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Policy:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -1149,38 +1158,46 @@ void* POA_CORBA_Policy::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Policy:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Policy_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_CORBA_Policy::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_Policy::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
 {
-  this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
+  this->synchronous_upcall_dispatch (req,
+                                     servant_upcall,
+                                     this,
+                                     ACE_TRY_ENV);
 }
 
 const char* POA_CORBA_Policy::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_Policy:1.0";
+  return "IDL:omg.org/CORBA/Policy:1.0";
 }
 
-CORBA_Policy*
+CORBA::Policy*
 POA_CORBA_Policy::_this (CORBA_Environment &ACE_TRY_ENV)
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-  
+
+  TAO_Stub_Auto_Ptr safe_stub (stub);
+
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
   else
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-  
+
   CORBA::Object_var obj = tmp;
-  return ::CORBA_Policy::_unchecked_narrow (obj.in ());
+
+  (void) safe_stub.release ();
+
+  return ::CORBA::Policy::_unchecked_narrow (obj.in ());
 }
 
 
diff --git a/TAO/tao/PortableServer/PolicyS.h b/TAO/tao/PortableServer/PolicyS.h
index 3945d35240f..0a9b6d855b9 100644
--- a/TAO/tao/PortableServer/PolicyS.h
+++ b/TAO/tao/PortableServer/PolicyS.h
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_ORIG_POLICYS_H_
-#define _TAO_IDL_ORIG_POLICYS_H_
+#ifndef _TAO_IDL_CORBA_POLICYS_H_
+#define _TAO_IDL_CORBA_POLICYS_H_
 
 #include "ace/pre.h"
 #include "tao/PolicyC.h"
@@ -35,8 +35,6 @@
 #include "tao/PortableServer/Collocated_Object.h"
 #include "tao/PortableServer/ThruPOA_Object_Proxy_Impl.h"
 #include "tao/PortableServer/Direct_Object_Proxy_Impl.h"
-#include "tao/PortableInterceptor.h"
-
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
 #pragma warning(push)
@@ -48,222 +46,210 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-class POA_CORBA_Policy;
-typedef POA_CORBA_Policy *POA_CORBA_Policy_ptr;
-// Forward Classes Declaration
-class _TAO_CORBA_Policy_ThruPOA_Proxy_Impl;
-class _TAO_CORBA_Policy_Direct_Proxy_Impl;
-class _TAO_CORBA_Policy_Strategized_Proxy_Broker;
-
-class TAO_PortableServer_Export POA_CORBA_Policy :  public virtual PortableServer::ServantBase
-{
-protected:
-  POA_CORBA_Policy (void);
-
-public:
-  POA_CORBA_Policy (const POA_CORBA_Policy& rhs);
-  virtual ~POA_CORBA_Policy (void);
-
-
-  virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-
-  virtual void* _downcast (
-      const char* logical_type_id
-    );
-
-  static void _is_a_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-
-  static void _non_existent_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-
-  static void _interface_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-
-  virtual void _dispatch (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-
-  ::CORBA_Policy *_this (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-
-  virtual const char* _interface_repository_id (void) const;
-
-  virtual CORBA::PolicyType policy_type (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  static void _get_policy_type_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_obj,
-      void *_tao_context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+  class POA_CORBA_Policy;
+  typedef POA_CORBA_Policy *POA_CORBA_Policy_ptr;
+  // Forward Classes Declaration
+  class POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl;
+  class POA_CORBA_TAO_Policy_Strategized_Proxy_Broker;
+
+  class TAO_PortableServer_Export POA_CORBA_Policy :  public virtual PortableServer::ServantBase
+  {
+  protected:
+    POA_CORBA_Policy (void);
+
+  public:
+    POA_CORBA_Policy (const POA_CORBA_Policy& rhs);
+    virtual ~POA_CORBA_Policy (void);
+
+
+    virtual CORBA::Boolean _is_a (
+        const char* logical_type_id,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
+
+    virtual void* _downcast (
+        const char* logical_type_id
+      );
+
+    static void _is_a_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *servant_upcall,
+        CORBA::Environment &ACE_TRY_ENV
+      );
+
+    static void _non_existent_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *servant_upcall,
+        CORBA::Environment &ACE_TRY_ENV
+      );
+
+    static void _interface_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *servant_upcall,
+        CORBA::Environment &ACE_TRY_ENV
+      );
+
+    virtual void _dispatch (
+        TAO_ServerRequest &req,
+        void *_servant_upcall,
+        CORBA::Environment &ACE_TRY_ENV
+      );
+
+    ::CORBA::Policy *_this (
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
+
+    virtual const char* _interface_repository_id (void) const;
 
-  virtual CORBA_Policy_ptr copy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  static void copy_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_obj,
-      void *_tao_context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
+    virtual CORBA::PolicyType policy_type (
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    static void _get_policy_type_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_obj,
+        void *_tao_servant_upcall,
+        CORBA::Environment &ACE_TRY_ENV
+      );
+
+    virtual CORBA::Policy_ptr copy (
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    static void copy_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_obj,
+        void *_tao_servant_upcall,
+        CORBA::Environment &ACE_TRY_ENV
+      );
+
+    virtual void destroy (
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    static void destroy_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_obj,
+        void *_tao_servant_upcall,
+        CORBA::Environment &ACE_TRY_ENV
+      );
+
+
+  };
+
+
+  ///////////////////////////////////////////////////////////////////////
+  //               Strategized Proxy Broker Declaration
+  //
+
+  class TAO_PortableServer_Export POA_CORBA_TAO_Policy_Strategized_Proxy_Broker : public virtual CORBA_TAO_Policy_Proxy_Broker
+  {
+  public:
+   POA_CORBA_TAO_Policy_Strategized_Proxy_Broker (void);
+
+    virtual ~POA_CORBA_TAO_Policy_Strategized_Proxy_Broker (void);
+
+    virtual CORBA_TAO_Policy_Proxy_Impl &select_proxy (
+      ::CORBA::Policy *object,
+      CORBA_Environment &ACE_TRY_ENV
     );
 
-  virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  static void destroy_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_obj,
-      void *_tao_context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
+  private:
+    // Helper methods that takes care to create the proxy
+    // as soon as their use is necessary.
+    void create_proxy (
+      int collocation_strategy,
+      CORBA::Environment &ACE_TRY_ENV
     );
 
+    // Caches the proxy implementations. The proxy implementation
+    // are totally stateless, and those can be shared by all the
+    // instances of a given IDL interface type.
+    CORBA_TAO_Policy_Proxy_Impl
+    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
 
-};
-
-
-///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration
-//
+    TAO_SYNCH_MUTEX mutex_;
+    // This funxtion is used to get an handle to the unique instance
+    // of the Strategized Proxy Broker that is available for a given
+    // interface.
 
-class TAO_PortableServer_Export _TAO_CORBA_Policy_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_Policy_Proxy_Broker
-{
-public:
-  _TAO_CORBA_Policy_Strategized_Proxy_Broker (void);
+  public:
+    static POA_CORBA_TAO_Policy_Strategized_Proxy_Broker *the_TAO_Policy_Strategized_Proxy_Broker (void);
+  };
 
-  virtual ~_TAO_CORBA_Policy_Strategized_Proxy_Broker (void);
 
-  virtual ::_TAO_CORBA_Policy_Proxy_Impl &select_proxy (
-    ::CORBA_Policy *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-  );
+  //
+  //            End Strategized Proxy Broker Declaration
+  ///////////////////////////////////////////////////////////////////////
 
-private:
 
-// Helper methods that takes care to create the proxy
-// as soon as their use is necessary.
-  void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
-  );
+  ///////////////////////////////////////////////////////////////////////
+  //                    ThruPOA  Impl. Declaration
+  //
 
-private:
+  class TAO_PortableServer_Export POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl :
+    public virtual CORBA_TAO_Policy_Proxy_Impl,
+    public virtual TAO_ThruPOA_Object_Proxy_Impl
+  {
+  public:
+   POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl (void);
 
-  // Caches the proxy implementations. The proxy implementation
-  // are totally stateless, and those can be shared by all the
-  // instances of a given IDL interface type.
-  ::_TAO_CORBA_Policy_Proxy_Impl
-   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-
-  TAO_SYNCH_MUTEX mutex_;
-// This funxtion is used to get an handle to the unique instance
-// of the Strategized Proxy Broker that is available for a given
-// interface.
-
-public:
-  static _TAO_CORBA_Policy_Strategized_Proxy_Broker *the_TAO_CORBA_Policy_Strategized_Proxy_Broker (void);
-};
-
-
-//
-//            End Strategized Proxy Broker Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    ThruPOA  Impl. Declaration
-//
-
-class TAO_PortableServer_Export _TAO_CORBA_Policy_ThruPOA_Proxy_Impl :
-  public virtual ::_TAO_CORBA_Policy_Proxy_Impl,
-  public virtual TAO_ThruPOA_Object_Proxy_Impl
-{
-public:
-  _TAO_CORBA_Policy_ThruPOA_Proxy_Impl (void);
-
-  virtual ~_TAO_CORBA_Policy_ThruPOA_Proxy_Impl (void) { }
+    virtual ~POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl (void) { }
 
     virtual CORBA::PolicyType policy_type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA_Policy_ptr copy (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual void destroy (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-};
-
-
-//
-//                ThruPOA  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
+        CORBA::Object_ptr _collocated_tao_target_,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+virtual CORBA::Policy_ptr copy (
+        CORBA::Object_ptr _collocated_tao_target_,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+virtual void destroy (
+        CORBA::Object_ptr _collocated_tao_target_,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+
+  };
+
+  //
+  //                ThruPOA  Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////
 //                    Direct  Impl. Declaration
 //
 
 class TAO_PortableServer_Export _TAO_CORBA_Policy_Direct_Proxy_Impl :
-  public virtual _TAO_CORBA_Policy_Proxy_Impl,
+  public virtual CORBA_TAO_Policy_Proxy_Impl,
   public virtual TAO_Direct_Object_Proxy_Impl
 {
 public:
@@ -271,38 +257,36 @@ public:
 
   virtual ~_TAO_CORBA_Policy_Direct_Proxy_Impl (void) { }
 
-    virtual CORBA::PolicyType policy_type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
+  virtual CORBA::PolicyType policy_type (
+    CORBA::Object_ptr _collocated_tao_target_,
+    CORBA::Environment &ACE_TRY_ENV
+  )
     ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+                     CORBA::SystemException
+                     ));
 
   virtual CORBA_Policy_ptr copy (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
+                                 CORBA::Object_ptr _collocated_tao_target_,
+                                 CORBA::Environment &ACE_TRY_ENV
+                                 )
     ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+                     CORBA::SystemException
+                     ));
 
-  virtual void destroy (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    virtual void destroy (
+                          CORBA::Object_ptr _collocated_tao_target_,
+                          CORBA::Environment &ACE_TRY_ENV
+                          )
+      ACE_THROW_SPEC ((
+                       CORBA::SystemException
+                       ));
 
 };
 
-
 //
 //                Direct  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
 #include "PolicyS_T.h"
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/PortableServer/PolicyS_T.cpp b/TAO/tao/PortableServer/PolicyS_T.cpp
index 9e19877a5df..003f99fca75 100644
--- a/TAO/tao/PortableServer/PolicyS_T.cpp
+++ b/TAO/tao/PortableServer/PolicyS_T.cpp
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_ORIG_POLICYS_T_CPP_
-#define _TAO_IDL_ORIG_POLICYS_T_CPP_
+#ifndef _TAO_IDL_POLICYS_T_CPP_
+#define _TAO_IDL_POLICYS_T_CPP_
 
 #include "PolicyS_T.h"
 
diff --git a/TAO/tao/PortableServer/PolicyS_T.h b/TAO/tao/PortableServer/PolicyS_T.h
index 3122b415c4b..f6a166c157c 100644
--- a/TAO/tao/PortableServer/PolicyS_T.h
+++ b/TAO/tao/PortableServer/PolicyS_T.h
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_POLICYS_T_H_
-#define _TAO_IDL_POLICYS_T_H_
+#ifndef _TAO_IDL_CORBA_POLICYS_T_H_
+#define _TAO_IDL_CORBA_POLICYS_T_H_
 
 #include "ace/pre.h"
 #if defined(_MSC_VER)
@@ -32,77 +32,72 @@
 
 #if defined (ACE_HAS_USING_KEYWORD)
 
-TAO_NAMESPACE  POA_CORBA
-{
-}
-TAO_NAMESPACE_CLOSE // module CORBA
-
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class TAO_PortableServer_Export POA_CORBA_Policy_tie : public POA_CORBA_Policy
-{
-public:
-  POA_CORBA_Policy_tie (T &t);
-  // the T& ctor
-  POA_CORBA_Policy_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  POA_CORBA_Policy_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  POA_CORBA_Policy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~POA_CORBA_Policy_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA::PolicyType policy_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Policy_ptr copy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  POA_CORBA_Policy_tie (const POA_CORBA_Policy_tie &);
-  void operator= (const POA_CORBA_Policy_tie &);
-};
+  // TIE class: Refer to CORBA v2.2, Section 20.34.4
+  template <class T>
+  class TAO_PortableServer_Export POA_CORBA_Policy_tie : public POA_CORBA_Policy
+  {
+  public:
+    POA_CORBA_Policy_tie (T &t);
+    // the T& ctor
+    POA_CORBA_Policy_tie (T &t, PortableServer::POA_ptr poa);
+    // ctor taking a POA
+    POA_CORBA_Policy_tie (T *tp, CORBA::Boolean release=1);
+    // ctor taking pointer and an ownership flag
+    POA_CORBA_Policy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+    // ctor with T*, ownership flag and a POA
+    ~POA_CORBA_Policy_tie (void);
+    // dtor
+
+    // TIE specific functions
+    T *_tied_object (void);
+    // return the underlying object
+    void _tied_object (T &obj);
+    // set the underlying object
+    void _tied_object (T *obj, CORBA::Boolean release=1);
+    // set the underlying object and the ownership flag
+    CORBA::Boolean _is_owner (void);
+    // do we own it
+    void _is_owner (CORBA::Boolean b);
+    // set the ownership
+
+    // overridden ServantBase operations
+    PortableServer::POA_ptr _default_POA (
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
+    CORBA::PolicyType policy_type (
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA::Policy_ptr copy (
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void destroy (
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+  private:
+    T *ptr_;
+    PortableServer::POA_var poa_;
+    CORBA::Boolean rel_;
+
+    // copy and assignment are not allowed
+    POA_CORBA_Policy_tie (const POA_CORBA_Policy_tie &);
+    void operator= (const POA_CORBA_Policy_tie &);
+  };
 
 #endif /* ACE_HAS_USING_KEYWORD */
 
diff --git a/TAO/tao/PortableServer/PolicyS_T.i b/TAO/tao/PortableServer/PolicyS_T.i
index c79cbc73651..8834615050c 100644
--- a/TAO/tao/PortableServer/PolicyS_T.i
+++ b/TAO/tao/PortableServer/PolicyS_T.i
@@ -112,7 +112,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA_Policy_ptr POA_CORBA_Policy_tie<T>::copy  (
+CORBA::Policy_ptr POA_CORBA_Policy_tie<T>::copy  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
diff --git a/TAO/tao/PortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/PortableServer/RT_Servant_Dispatcher.cpp
index 983668f7ac5..d27bee4ef79 100644
--- a/TAO/tao/PortableServer/RT_Servant_Dispatcher.cpp
+++ b/TAO/tao/PortableServer/RT_Servant_Dispatcher.cpp
@@ -1,4 +1,4 @@
-// @(#) $Id$
+// $Id$
 
 #include "RT_Servant_Dispatcher.h"
 #include "POA.h"
@@ -6,7 +6,9 @@
 #include "tao/TAO_Server_Request.h"
 #include "tao/debug.h"
 
-ACE_RCSID(tao, Default_Acceptor_Filter, "$Id$")
+ACE_RCSID (tao,
+           Default_Acceptor_Filter,
+           "$Id$")
 
 #if (TAO_HAS_RT_CORBA == 1)
 
@@ -20,24 +22,33 @@ RT_Priority_Model_Processing::RT_Priority_Model_Processing (TAO_POA &poa)
 RT_Priority_Model_Processing::~RT_Priority_Model_Processing (void)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
-
-  if (this->state_ == PRIORITY_RESET_REQUIRED)
+  ACE_TRY
     {
-      this->state_ = NO_ACTION_REQUIRED;
-
-      // Reset the priority of the current thread back to its original
-      // value.
-      if (poa_.orb_core ().get_protocols_hooks ()->
-          set_thread_priority (&poa_.orb_core (),
-                               this->original_priority_,
-                               ACE_TRY_ENV)
-          == -1)
-        // At this point we cannot throw an exception.  Just log the
-        // error.
-        ACE_DEBUG ((LM_ERROR,
-                    ACE_TEXT ("TAO (%P|%t) - Priority_Model_Processing:: ")
-                    ACE_TEXT (" Priority_Model_Processing\n")));
+      if (this->state_ == PRIORITY_RESET_REQUIRED)
+        {
+          this->state_ = NO_ACTION_REQUIRED;
+
+          // Reset the priority of the current thread back to its original
+          // value.
+          int result =
+            poa_.orb_core ().get_protocols_hooks ()->
+            set_thread_priority (&poa_.orb_core (),
+                                 this->original_priority_,
+                                 ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
+          if (result == -1)
+            ACE_DEBUG ((LM_ERROR,
+                        ACE_TEXT ("TAO (%P|%t) - Priority_Model_Processing:: ")
+                        ACE_TEXT (" Priority_Model_Processing\n")));
+        }
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "~RT_Priority_Model_Processing:");
     }
+  ACE_ENDTRY;
 }
 
 void
@@ -55,12 +66,15 @@ RT_Priority_Model_Processing::pre_invoke (
       != TAO_INVALID_PRIORITY)
     {
       // Remember current thread's priority.
-      if (poa_.orb_core ().get_protocols_hooks ()->
+      int result =
+        poa_.orb_core ().get_protocols_hooks ()->
           get_thread_priority (&poa_.orb_core (),
                                this->original_priority_,
-                               ACE_TRY_ENV)
-          == -1)
-        ACE_THROW (CORBA::DATA_CONVERSION (1,
+                               ACE_TRY_ENV);
+      ACE_CHECK;
+
+      if (result == -1)
+        ACE_THROW (CORBA::DATA_CONVERSION (TAO_OMG_VMCID | 1, // @@ Correct?
                                            CORBA::COMPLETED_NO));
 
       // Attempt to extract client-propagated priority from the
@@ -79,7 +93,7 @@ RT_Priority_Model_Processing::pre_invoke (
           CORBA::Boolean byte_order;
           if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
             ACE_THROW (CORBA::MARSHAL ());
-          cdr.reset_byte_order (ACE_static_cast(int,byte_order));
+          cdr.reset_byte_order (ACE_static_cast (int, byte_order));
 
           if ((cdr >> target_priority) == 0)
             ACE_THROW (CORBA::MARSHAL ());
@@ -108,12 +122,16 @@ RT_Priority_Model_Processing::pre_invoke (
                         ACE_TEXT (" temporarily changed to %d\n"),
                         original_priority_, target_priority));
 
-          if (poa_.orb_core ().get_protocols_hooks ()->
+          result =
+            poa_.orb_core ().get_protocols_hooks ()->
               set_thread_priority (&poa_.orb_core (),
                                    target_priority,
-                                   ACE_TRY_ENV)
-              == -1)
-            ACE_THROW (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO));
+                                   ACE_TRY_ENV);
+          ACE_CHECK;
+
+          if (result == -1)
+            ACE_THROW (CORBA::DATA_CONVERSION (TAO_OMG_VMCID | 1, //@@ Correct?
+                                               CORBA::COMPLETED_NO));
 
           this->state_ = PRIORITY_RESET_REQUIRED;
         }
@@ -136,12 +154,16 @@ RT_Priority_Model_Processing::post_invoke (
 
       // Reset the priority of the current thread back to its original
       // value.
-      if (poa_.orb_core ().get_protocols_hooks ()->
+      int result =
+        poa_.orb_core ().get_protocols_hooks ()->
           set_thread_priority (&poa_.orb_core (),
                                this->original_priority_,
-                               ACE_TRY_ENV)
-          == -1)
-        ACE_THROW (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO));
+                               ACE_TRY_ENV);
+      ACE_CHECK;
+
+      if (result == -1)
+        ACE_THROW (CORBA::DATA_CONVERSION (TAO_OMG_VMCID | 1, //@@ Correct?
+                                           CORBA::COMPLETED_NO));
     }
 }
 
@@ -154,7 +176,6 @@ TAO_RT_Servant_Dispatcher::~TAO_RT_Servant_Dispatcher (void)
 void
 TAO_RT_Servant_Dispatcher::dispatch (TAO_Object_Adapter::Servant_Upcall &servant_upcall,
                                      TAO_ServerRequest &req,
-                                     void *context,
                                      CORBA::Environment &ACE_TRY_ENV)
 {
   // RTCORBA PriorityModelPolicy processing (may need to be
@@ -172,7 +193,7 @@ TAO_RT_Servant_Dispatcher::dispatch (TAO_Object_Adapter::Servant_Upcall &servant
 
   // Servant dispatch.
   servant_upcall.servant ()->_dispatch (req,
-                                        context,
+                                        &servant_upcall,
                                         ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -184,4 +205,3 @@ TAO_RT_Servant_Dispatcher::dispatch (TAO_Object_Adapter::Servant_Upcall &servant
 }
 
 #endif /* TAO_HAS_RT_CORBA == 1 */
-
diff --git a/TAO/tao/PortableServer/RT_Servant_Dispatcher.h b/TAO/tao/PortableServer/RT_Servant_Dispatcher.h
index 08dcf882b24..14e4d543faf 100644
--- a/TAO/tao/PortableServer/RT_Servant_Dispatcher.h
+++ b/TAO/tao/PortableServer/RT_Servant_Dispatcher.h
@@ -40,7 +40,6 @@ public:
   /// Dispatch the request to the servant.
   virtual void dispatch (TAO_Object_Adapter::Servant_Upcall &servant_upcall,
                          TAO_ServerRequest &req,
-                         void *context,
                          CORBA::Environment &ACE_TRY_ENV);
 };
 
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index 9c73a8dcc87..f16a5be3f79 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -14,7 +14,9 @@
 
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID(tao, Servant_Base, "$Id$")
+ACE_RCSID (tao,
+           Servant_Base,
+           "$Id$")
 
 
 #if !defined (__ACE_INLINE__)
@@ -177,7 +179,7 @@ TAO_ServantBase::_create_stub (CORBA_Environment &ACE_TRY_ENV)
 
 void TAO_ServantBase::synchronous_upcall_dispatch (
     TAO_ServerRequest &req,
-    void *context,
+    void *servant_upcall,
     void *derived_this,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -196,7 +198,7 @@ void TAO_ServantBase::synchronous_upcall_dispatch (
     }
 
   // Fetch the skeleton for this operation
-  if (this->_find(opname,skel,req.operation_length()) == -1)
+  if (this->_find (opname, skel, req.operation_length()) == -1)
     {
       ACE_THROW (CORBA_BAD_OPERATION());
     }
@@ -206,39 +208,53 @@ void TAO_ServantBase::synchronous_upcall_dispatch (
                               && !req.deferred_reply ();
 
   ACE_TRY
-  {
-    // Log the message state to FT_Service Logging facility
-    req.orb_core ()->services_log_msg_pre_upcall (req);
-
-    // Invoke the skeleton, it will demarshal the arguments,
-    // invoke the right operation on the skeleton class (<derived_this>).
-    // and marshal any results
-    skel (req, derived_this, context, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-
-    // It is our job to send the already marshaled reply, but only
-    // send if it is expected and it has not already been sent
-
-    // Log the message state to FT_Service Logging facility
-    req.orb_core ()->services_log_msg_post_upcall (req);
-
-    // We send the reply only if it is NOT a SYNC_WITH_SERVER, a
-    // response is expected and if the reply is not deferred.
-    if (send_reply)
-      {
-        req.tao_send_reply ();
-      }
+    {
+      // @@ Do we really need the following "callback?"  The
+      //    STANDARD receive_request_service_contexts() interception
+      //    point appears to be placed at around the same point in the
+      //    upcall, i.e. just before the upcall is dispatched.  It is
+      //    slightly earlier than this callback function().  It also
+      //    potentially provides more information than is available in
+      //    this callback.
+      //        -Ossama
+      req.orb_core ()->services_log_msg_pre_upcall (req);
+
+      // Invoke the skeleton, it will demarshal the arguments,
+      // invoke the right operation on the skeleton class
+      // (<derived_this>), and marshal any results.
+      skel (req, derived_this, servant_upcall, ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      // It is our job to send the already marshaled reply, but only
+      // send if it is expected and it has not already been sent
+
+      // @@ Same here...
+      //    Do we really need the following "callback?"  The
+      //    STANDARD send_reply()/send_other()/send_exception
+      //    interception points appear to do the same thing.  They
+      //    even provide more information than is available in this
+      //    callback.
+      //        -Ossama
+      // Log the message state to FT_Service Logging facility
+      req.orb_core ()->services_log_msg_post_upcall (req);
+
+      // We send the reply only if it is NOT a SYNC_WITH_SERVER, a
+      // response is expected and if the reply is not deferred.
+      if (send_reply)
+        {
+          req.tao_send_reply ();
+        }
 
-  }
-  ACE_CATCH(CORBA::Exception,ex)
-  {
-    // If an exception was raised we should marshal it and send
-    // the appropriate reply to the client
-    if (send_reply)
-      {
-        req.tao_send_reply_exception(ex);
-      }
-  }
+    }
+  ACE_CATCH (CORBA::Exception,ex)
+    {
+      // If an exception was raised we should marshal it and send
+      // the appropriate reply to the client
+      if (send_reply)
+        {
+          req.tao_send_reply_exception(ex);
+        }
+    }
   ACE_ENDTRY;
   ACE_CHECK;
 
diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h
index 77273d7161c..8b982192173 100644
--- a/TAO/tao/PortableServer/Servant_Base.h
+++ b/TAO/tao/PortableServer/Servant_Base.h
@@ -68,20 +68,20 @@ public:
   virtual void *_downcast (const char *repository_id) = 0;
   // Get the correct vtable.
 
-  virtual TAO_Stub *_create_stub (CORBA_Environment &ACE_TRY_ENV =
-                                    TAO_default_environment ());
+  virtual TAO_Stub *_create_stub (CORBA_Environment &ACE_TRY_ENV);
   // This is an auxiliar method for _this() and _narrow().
 
   virtual void _dispatch (TAO_ServerRequest &request,
-                          void *context,
-                          CORBA_Environment &ACE_TRY_ENV =
-                            TAO_default_environment ()) = 0;
+                          void *servant_upcall,
+                          CORBA_Environment &ACE_TRY_ENV) = 0;
   // Dispatches a request to the object: find the operation, cast the
   // type to the most derived type, demarshall all the parameters from
   // the request and finally invokes the operation, storing the
   // results and out parameters (if any) or the exceptions thrown into
   // <request>.
+
 protected:
+
   TAO_ServantBase (void);
   // Default constructor, only derived classes can be created.
 
@@ -91,8 +91,9 @@ protected:
   TAO_ServantBase &operator= (const TAO_ServantBase &);
   // assignment operator.
 
+
   virtual void synchronous_upcall_dispatch (TAO_ServerRequest &req,
-                                            void *context,
+                                            void *servant_upcall,
                                             void *derived_this,
                                             CORBA::Environment &ACE_TRY_ENV);
 
@@ -244,9 +245,8 @@ protected:
   // register with the default POA.
 
   void _dispatch (TAO_ServerRequest &request,
-                  void *context,
-                  CORBA_Environment &ACE_TRY_ENV =
-                    TAO_default_environment ());
+                  void *servant_upcall,
+                  CORBA_Environment &ACE_TRY_ENV);
   // Throws CORBA::BAD_OPERATION exception.
 };
 
diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.h b/TAO/tao/PortableServer/Servant_Dispatcher.h
index 266dbd4d4c1..550a16ce0be 100644
--- a/TAO/tao/PortableServer/Servant_Dispatcher.h
+++ b/TAO/tao/PortableServer/Servant_Dispatcher.h
@@ -36,7 +36,6 @@ public:
   /// Dispatch the request to the servant.
   virtual void dispatch (TAO_Object_Adapter::Servant_Upcall &servant_upcall,
                          TAO_ServerRequest &req,
-                         void *context,
                          CORBA::Environment &ACE_TRY_ENV) = 0;
 };
 
diff --git a/TAO/tao/PortableServer/ServerRequestInfo.cpp b/TAO/tao/PortableServer/ServerRequestInfo.cpp
index 9a990de852b..a9a17300ca2 100644
--- a/TAO/tao/PortableServer/ServerRequestInfo.cpp
+++ b/TAO/tao/PortableServer/ServerRequestInfo.cpp
@@ -3,6 +3,7 @@
 // $Id$
 
 #include "ServerRequestInfo.h"
+#include "POA.h"
 
 #include "tao/TAO_Server_Request.h"
 #include "tao/PolicyC.h"
@@ -18,11 +19,10 @@ ACE_RCSID (TAO_PortableServer,
 # endif /* !__ACE_INLINE__ */
 
 TAO_ServerRequestInfo::TAO_ServerRequestInfo (
-  TAO_ServerRequest &server_request)
+  TAO_ServerRequest &server_request,
+  TAO_Object_Adapter::Servant_Upcall *servant_upcall)
   : server_request_ (server_request),
-    forward_reference_ (),
-    //    poa_current_ (),
-    //    adapter_id_ (),
+    servant_upcall_ (servant_upcall),
     caught_exception_ (0),
     reply_status_ (-1)
 {
@@ -82,7 +82,7 @@ Dynamic::ParameterList *
 TAO_ServerRequestInfo::arguments (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 10,
+  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
                                           CORBA::COMPLETED_NO),
                     0);
 }
@@ -91,7 +91,7 @@ Dynamic::ExceptionList *
 TAO_ServerRequestInfo::exceptions (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 10,
+  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
                                           CORBA::COMPLETED_NO),
                     0);
 }
@@ -100,7 +100,7 @@ Dynamic::ContextList *
 TAO_ServerRequestInfo::contexts (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 10,
+  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
                                           CORBA::COMPLETED_NO),
                     0);
 }
@@ -109,7 +109,7 @@ Dynamic::RequestContext *
 TAO_ServerRequestInfo::operation_context (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 10,
+  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
                                           CORBA::COMPLETED_NO),
                     0);
 }
@@ -118,7 +118,7 @@ CORBA::Any *
 TAO_ServerRequestInfo::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 10,
+  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
                                           CORBA::COMPLETED_NO),
                     0);
 }
@@ -138,7 +138,7 @@ TAO_ServerRequestInfo::sync_scope (CORBA::Environment &ACE_TRY_ENV)
   if (this->server_request_.sync_with_server ())
     return Messaging::SYNC_WITH_SERVER;
 
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 10,
+  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
                                           CORBA::COMPLETED_NO),
                     -1);
 }
@@ -150,7 +150,7 @@ TAO_ServerRequestInfo::reply_status (CORBA::Environment &ACE_TRY_ENV)
 {
   if (this->reply_status_ == -1)
     // A reply hasn't been received yet.
-    ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 10,
+    ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
                                             CORBA::COMPLETED_NO),
                       -1);
 
@@ -162,17 +162,13 @@ TAO_ServerRequestInfo::forward_reference (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->reply_status_ != PortableInterceptor::LOCATION_FORWARD)
-    ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 10,
+    ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
                                             CORBA::COMPLETED_NO),
                       CORBA::Object::_nil ());
 
-  // We don't get the forward reference from the TAO_ServerRequest
-  // object since it may not have been set there.  For example, this
-  // is the case when a Servant Manager throws a
-  // PortableServer::ForwardRequest exception.  As such, we only
-  // return the one stored in this object since it is explicitly set
-  // by the responsible request forwarding code.
-  return CORBA::Object::_duplicate (this->forward_reference_.in ());
+  // TAO_ServerRequest::forward_location() already duplicates the
+  // object reference.  There is no need to duplicate it here.
+  return this->server_request_.forward_location ();
 }
 
 CORBA::Any *
@@ -247,7 +243,7 @@ TAO_ServerRequestInfo::get_service_context_i (
   else
     {
       // Not found.
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (TAO_OMG_VMCID | 23,
+      ACE_THROW_RETURN (CORBA::BAD_PARAM (TAO_OMG_VMCID | 26,
                                           CORBA::COMPLETED_NO),
                         0);
     }
@@ -263,7 +259,7 @@ TAO_ServerRequestInfo::sending_exception (CORBA::Environment &ACE_TRY_ENV)
   if (this->reply_status_ != PortableInterceptor::SYSTEM_EXCEPTION
       && this->reply_status_ != PortableInterceptor::USER_EXCEPTION)
     {
-      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 10,
+      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
                                               CORBA::COMPLETED_NO),
                         0);
     }
@@ -304,45 +300,40 @@ CORBA::OctetSeq *
 TAO_ServerRequestInfo::object_id (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-#if 0
-  if (CORBA::is_nil (this->poa_current_.in ()))
+  if (this->servant_upcall_ != 0)
     {
-      CORBA::Object_var p =
-        this->server_request_.orb_core ()->poa_current ();
-
-      this->poa_current_ =
-        PortableServer::Current::_narrow (p.in (),
-                                          ACE_TRY_ENV);
+      const PortableServer::ObjectId &id =
+        this->servant_upcall_->user_id ();
+
+      CORBA::OctetSeq *obj_id = 0;
+
+      ACE_NEW_THROW_EX (obj_id,
+                        CORBA::OctetSeq,
+                        CORBA::NO_MEMORY (
+                          CORBA::SystemException::_tao_minor_code (
+                            TAO_DEFAULT_MINOR_CODE,
+                            ENOMEM),
+                          CORBA::COMPLETED_NO));
       ACE_CHECK_RETURN (0);
 
-      if (CORBA::is_nil (this->poa_current_.in ()))
-        ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-    }
-
-  ACE_TRY
-    {
-      CORBA::OctetSeq_var obj_id =
-        this->poa_current_->get_object_id (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return obj_id._retn ();
+      // @@ It would be nice to avoid this copy.  However, we can't be
+      //    sure if the octet sequence will out live the POA from
+      //    which the object ID is ultimately obtained.  In the event
+      //    the octet sequence does out live the POA, a copy is indeed
+      //    necessary.  Do a copy to be on the safe side.  In any
+      //    case, this is still faster than the
+      //    PortableServer::Current::object_id() method since no TSS
+      //    access is involved.
+      CORBA::ULong len = id.length ();
+      obj_id->length (len);
+      CORBA::Octet *buffer = obj_id->get_buffer ();
+      ACE_OS_String::memcpy (buffer, id.get_buffer (), len);
+
+      return obj_id;
     }
-  ACE_CATCH (PortableServer::Current::NoContext, exc)
-    {
-      // Convert the NoContext exception to a NO_RESOURCES exception.
 
-      ACE_THROW_RETURN (CORBA::NO_RESOURCES (TAO_OMG_VMCID | 1,
-                                             CORBA::COMPLETED_NO),
-                        0);
-    }
-  ACE_ENDTRY;
-#endif  /* 0 */
-
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
-                        ENOTSUP),
-                      CORBA::COMPLETED_NO),
+  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
+                                          CORBA::COMPLETED_NO),
                     0);
 }
 
@@ -350,18 +341,11 @@ CORBA::OctetSeq *
 TAO_ServerRequestInfo::adapter_id (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-//   if (this->adapter_id_.in () == 0)
-//     {
-//       ACE_THROW_RETURN (CORBA::NO_RESOURCES (TAO_OMG_VMCID | 1,
-//                                              CORBA::COMPLETED_NO),
-//                         0);
-//     }
+  if (this->servant_upcall_ != 0)
+    return this->servant_upcall_->poa ().id (ACE_TRY_ENV);
 
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
-                        ENOTSUP),
-                      CORBA::COMPLETED_NO),
+  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
+                                          CORBA::COMPLETED_NO),
                     0);
 }
 
@@ -422,7 +406,7 @@ TAO_ServerRequestInfo::add_reply_service_context (
 
   if (service_context_list.set_context (service_context, replace) == 0)
     {
-      ACE_THROW (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 11,
+      ACE_THROW (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 15,
                                        CORBA::COMPLETED_NO));
     }
 }
diff --git a/TAO/tao/PortableServer/ServerRequestInfo.h b/TAO/tao/PortableServer/ServerRequestInfo.h
index 970904e8300..800fa901bf7 100644
--- a/TAO/tao/PortableServer/ServerRequestInfo.h
+++ b/TAO/tao/PortableServer/ServerRequestInfo.h
@@ -32,8 +32,9 @@
 #include "tao/StringSeqC.h"
 #include "tao/OctetSeqC.h"
 #include "tao/Service_Context.h"
+#include "tao/TAO_Server_Request.h"
 
-//#include "PortableServerC.h"
+#include "Object_Adapter.h"
 
 #include "portableserver_export.h"
 
@@ -44,13 +45,11 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-class TAO_ServerRequest;
-
 
 /**
- * @class TAO_ClientRequestInfo
+ * @class TAO_ServerRequestInfo
  *
- * @brief Implementation of the PortableInterceptor::ClientRequestInfo
+ * @brief Implementation of the PortableInterceptor::ServerRequestInfo
  *        interface.
  */
 class TAO_PortableServer_Export TAO_ServerRequestInfo
@@ -60,7 +59,8 @@ class TAO_PortableServer_Export TAO_ServerRequestInfo
 public:
 
   /// Constructor.
-  TAO_ServerRequestInfo (TAO_ServerRequest &server_request);
+  TAO_ServerRequestInfo (TAO_ServerRequest &server_request,
+                         TAO_Object_Adapter::Servant_Upcall *servant_upcall);
 
   /// Return an ID unique to the current request.  This request ID may
   /// or may not be the same as the GIOP request ID.
@@ -251,13 +251,9 @@ protected:
   /// encapsulated by this TAO_ServerRequestInfo class.
   TAO_ServerRequest &server_request_;
 
-  /// Reference to the target the request will be forwarded.  This
-  /// reference is only valid if the reply status is
-  /// PortableInterceptor::LOCATION_FORWARD or LOCATION_FORWARD_PERMANENT.
-  CORBA::Object_var forward_reference_;
-
-  //  PortableServer::Current_var poa_current_;
-  //  CORBA::OctetSeq_var adapter_id_;
+  /// Pointer to the Servant_Upcall object that contains the object
+  /// ID, among other things.
+  TAO_Object_Adapter::Servant_Upcall *servant_upcall_;
 
   /// Pointer to the caught exception.
   CORBA::Exception *caught_exception_;
diff --git a/TAO/tao/PortableServer/ServerRequestInfo.inl b/TAO/tao/PortableServer/ServerRequestInfo.inl
index 6f548eae3c9..b0bc239247f 100644
--- a/TAO/tao/PortableServer/ServerRequestInfo.inl
+++ b/TAO/tao/PortableServer/ServerRequestInfo.inl
@@ -30,8 +30,8 @@ TAO_ServerRequestInfo::forward_reference (
 
   this->reply_status_ = PortableInterceptor::LOCATION_FORWARD;
 
-  this->forward_reference_ =
-    CORBA::Object::_duplicate (exc.forward.in ());
+  // Store the forward reference in the TAO_ServerRequest object.
+  this->server_request_.forward_location (exc.forward.in ());
 }
 
 ACE_INLINE void
@@ -42,5 +42,6 @@ TAO_ServerRequestInfo::forward_reference (CORBA::Object_ptr obj)
 
   this->reply_status_ = PortableInterceptor::LOCATION_FORWARD;
 
-  this->forward_reference_ = CORBA::Object::_duplicate (obj);
+  // Store the forward reference in the TAO_ServerRequest object.
+  this->server_request_.forward_location (obj);
 }
diff --git a/TAO/tao/PortableServer/TAO_PortableServer.dsp b/TAO/tao/PortableServer/TAO_PortableServer.dsp
index 824b3c83348..902c2aae567 100644
--- a/TAO/tao/PortableServer/TAO_PortableServer.dsp
+++ b/TAO/tao/PortableServer/TAO_PortableServer.dsp
@@ -248,6 +248,10 @@ SOURCE=.\Servant_Dispatcher.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\ServerInterceptorAdapter.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\ServerRequestInfo.cpp

 # End Source File

 # Begin Source File

@@ -372,6 +376,10 @@ SOURCE=.\Servant_Dispatcher.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\ServerInterceptorAdapter.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\ServerRequestInfo.h

 # End Source File

 # Begin Source File

@@ -448,6 +456,10 @@ SOURCE=.\Servant_Base.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\ServerInterceptorAdapter.inl

+# End Source File

+# Begin Source File

+

 SOURCE=.\ServerRequestInfo.inl

 # End Source File

 # End Group

diff --git a/TAO/tao/PortableServer/TAO_PortableServer_Static.dsp b/TAO/tao/PortableServer/TAO_PortableServer_Static.dsp
index 4b1bfa80557..93fc3709c9b 100644
--- a/TAO/tao/PortableServer/TAO_PortableServer_Static.dsp
+++ b/TAO/tao/PortableServer/TAO_PortableServer_Static.dsp
@@ -40,8 +40,8 @@ RSC=rc.exe
 # PROP Output_Dir ""

 # PROP Intermediate_Dir "LIB\Release\PortableServer"

 # PROP Target_Dir ""

-MTL=midl.exe

 LINK32=link.exe -lib

+MTL=midl.exe

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

 # ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "_WINDOWS" /D "_CONSOLE" /D "NDEBUG" /D "WIN32" /D "TAO_AS_STATIC_LIBS" /D "ACE_AS_STATIC_LIBS" /FD /c

 # SUBTRACT CPP /YX

@@ -66,8 +66,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir ""

 # PROP Intermediate_Dir "LIB\Debug\PortableServer"

 # PROP Target_Dir ""

-MTL=midl.exe

 LINK32=link.exe -lib

+MTL=midl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

 # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_WINDOWS" /D "_CONSOLE" /D "_DEBUG" /D "WIN32" /D "ACE_AS_STATIC_LIBS" /D "TAO_AS_STATIC_LIBS" /FD /c

 # SUBTRACT CPP /YX

@@ -165,6 +165,10 @@ SOURCE=.\Servant_Base.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\ServerInterceptorAdapter.inl

+# End Source File

+# Begin Source File

+

 SOURCE=.\ServerRequestInfo.inl

 # End Source File

 # End Group

@@ -193,6 +197,10 @@ SOURCE=.\Direct_Object_Proxy_Impl.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\ImplRepo_i.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\ImplRepoC.h

 # End Source File

 # Begin Source File

@@ -277,6 +285,10 @@ SOURCE=.\Servant_Dispatcher.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\ServerInterceptorAdapter.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\ServerRequestInfo.h

 # End Source File

 # Begin Source File

@@ -313,6 +325,10 @@ SOURCE=.\Direct_Object_Proxy_Impl.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\ImplRepo_i.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\ImplRepoC.cpp

 # End Source File

 # Begin Source File

@@ -381,6 +397,10 @@ SOURCE=.\Servant_Dispatcher.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\ServerInterceptorAdapter.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\ServerRequestInfo.cpp

 # End Source File

 # Begin Source File

diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
index b8f1604801f..170a6b353b0 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
@@ -318,6 +318,11 @@ TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core)
     }
   this->host_ = tmp_host;
 
+  (void) this->base_acceptor_.acceptor().enable (ACE_CLOEXEC);
+  // This avoids having child processes acquire the listen socket thereby
+  // denying the server the opportunity to restart on a well-known endpoint.
+  // This does not affect the aberrent behavior on Win32 platforms. 
+
   if (TAO_debug_level > 5)
     {
       ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tao/Strategies/UIOP_Acceptor.cpp b/TAO/tao/Strategies/UIOP_Acceptor.cpp
index a41f51b7133..cbb5592d386 100644
--- a/TAO/tao/Strategies/UIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/UIOP_Acceptor.cpp
@@ -312,6 +312,11 @@ TAO_UIOP_Acceptor::open_i (const char *rendezvous)
       return -1;
     }
 
+  (void) this->base_acceptor_.acceptor().enable (ACE_CLOEXEC);
+  // This avoids having child processes acquire the listen socket thereby
+  // denying the server the opportunity to restart on a well-known endpoint.
+  // This does not affect the aberrent behavior on Win32 platforms. 
+
   // @@ If Profile creation is slow we may need to cache the
   //    rendezvous point here
 
diff --git a/TAO/tao/TAO_Singleton.cpp b/TAO/tao/TAO_Singleton.cpp
index f41683c33e7..bec55534780 100644
--- a/TAO/tao/TAO_Singleton.cpp
+++ b/TAO/tao/TAO_Singleton.cpp
@@ -20,7 +20,9 @@
 #include "tao/TAO_Singleton.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (tao, TAO_Singleton, "$Id$")
+ACE_RCSID (tao,
+           TAO_Singleton,
+           "$Id$")
 
 template <class TYPE, class ACE_LOCK> void
 TAO_Singleton<TYPE, ACE_LOCK>::dump (void)
@@ -59,7 +61,6 @@ TAO_Singleton<TYPE, ACE_LOCK>::instance (void)
   // Perform the Double-Check pattern...
   if (singleton == 0)
     {
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
       if (TAO_Singleton_Manager::starting_up () ||
           TAO_Singleton_Manager::shutting_down ())
         {
@@ -69,13 +70,12 @@ TAO_Singleton<TYPE, ACE_LOCK>::instance (void)
           // so the preallocated lock is not available.  Either way,
           // don't register for destruction with the
           // TAO_Singleton_Manager:  we'll have to leak this instance.
-#endif /* ACE_MT_SAFE */
 
           ACE_NEW_RETURN (singleton, (TAO_Singleton<TYPE, ACE_LOCK>), 0);
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
         }
       else
         {
+#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
           // Obtain a lock from the ACE_Object_Manager.  The pointer
           // is static, so we only obtain one per TAO_Singleton
           // instantiation.
@@ -88,13 +88,15 @@ TAO_Singleton<TYPE, ACE_LOCK>::instance (void)
 
           if (singleton == 0)
             {
+#endif /* ACE_MT_SAFE */
               ACE_NEW_RETURN (singleton, (TAO_Singleton<TYPE, ACE_LOCK>), 0);
 
               // Register for destruction with TAO_Singleton_Manager.
               TAO_Singleton_Manager::at_exit (singleton);
+#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
             }
-        }
 #endif /* ACE_MT_SAFE */
+        }
     }
 
   return &singleton->instance_;
@@ -154,7 +156,6 @@ TAO_TSS_Singleton<TYPE, ACE_LOCK>::instance (void)
   // Perform the Double-Check pattern...
   if (singleton == 0)
     {
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
       if (TAO_Singleton_Manager::starting_up () ||
           TAO_Singleton_Manager::shutting_down ())
         {
@@ -164,13 +165,12 @@ TAO_TSS_Singleton<TYPE, ACE_LOCK>::instance (void)
           // so the preallocated lock is not available.  Either way,
           // don't register for destruction with the
           // TAO_Singleton_Manager:  we'll have to leak this instance.
-#endif /* ACE_MT_SAFE */
 
           ACE_NEW_RETURN (singleton, (TAO_TSS_Singleton<TYPE, ACE_LOCK>), 0);
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
         }
       else
         {
+#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
           // Obtain a lock from the ACE_Object_Manager.  The pointer
           // is static, so we only obtain one per TAO_Singleton
           // instantiation.
@@ -183,14 +183,16 @@ TAO_TSS_Singleton<TYPE, ACE_LOCK>::instance (void)
 
           if (singleton == 0)
             {
+#endif /* ACE_MT_SAFE */
               ACE_NEW_RETURN (singleton, (TAO_TSS_Singleton<TYPE, ACE_LOCK>),
                               0);
 
               // Register for destruction with TAO_Singleton_Manager.
               TAO_Singleton_Manager::at_exit (singleton);
+#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
             }
-        }
 #endif /* ACE_MT_SAFE */
+        }
     }
 
   return ACE_TSS_GET (&singleton->instance_, TYPE);
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
index 04c3e871565..f76c852b140 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
@@ -293,12 +293,18 @@ TAO_TypeCodeFactory_i::create_union_tc (
       cdr << members[index].type.in ();
     }
 
+  ACE_Message_Block consolidated_block;
+
+  ACE_CDR::consolidate (&consolidated_block, 
+                        cdr.begin ());
+
   CORBA::TypeCode_ptr union_typecode = 
     CORBA::TypeCode::_nil ();
+
   ACE_NEW_THROW_EX (union_typecode,
                     CORBA_TypeCode (CORBA::tk_union,
-                                    cdr.total_length (),
-                                    cdr.buffer (),
+                                    consolidated_block.length (),
+                                    consolidated_block.base (),
                                     0,
                                     0),
                     CORBA::NO_MEMORY ());
@@ -336,8 +342,14 @@ TAO_TypeCodeFactory_i::create_enum_tc (
 
   cdr << id;
 
+  this->string_pad (cdr,
+                    ACE_OS::strlen (id) + 1);
+
   cdr << name;
 
+  this->string_pad (cdr,
+                    ACE_OS::strlen (name) + 1);
+
   CORBA::ULong len = members.length ();
 
   cdr << len;
@@ -357,15 +369,24 @@ TAO_TypeCodeFactory_i::create_enum_tc (
                             CORBA::TypeCode::_nil ());
         }
 
-      cdr << members[index];
+      cdr << members[index].in ();
+
+      this->string_pad (cdr,
+                        ACE_OS::strlen (members[index].in ()) + 1);
     }
 
+  ACE_Message_Block consolidated_block;
+
+  ACE_CDR::consolidate (&consolidated_block, 
+                        cdr.begin ());
+
   CORBA::TypeCode_ptr enum_typecode = 
     CORBA::TypeCode::_nil ();
+
   ACE_NEW_THROW_EX (enum_typecode,
                     CORBA_TypeCode (CORBA::tk_enum,
-                                    cdr.total_length (),
-                                    cdr.buffer (),
+                                    consolidated_block.length (),
+                                    consolidated_block.base (),
                                     0,
                                     0),
                     CORBA::NO_MEMORY ());
@@ -415,17 +436,28 @@ TAO_TypeCodeFactory_i::create_alias_tc (
 
   cdr << id;
 
+  this->string_pad (cdr,
+                    ACE_OS::strlen (id) + 1);
+
   cdr << name;
 
+  this->string_pad (cdr,
+                    ACE_OS::strlen (name) + 1);
+
   cdr << original_type;
 
+  ACE_Message_Block consolidated_block;
+
+  ACE_CDR::consolidate (&consolidated_block, 
+                        cdr.begin ());
+
   CORBA::TypeCode_ptr alias_typecode = 
     CORBA::TypeCode::_nil ();
 
   ACE_NEW_THROW_EX (alias_typecode,
                     CORBA_TypeCode (CORBA::tk_alias,
-                                    cdr.total_length (),
-                                    cdr.buffer (),
+                                    consolidated_block.length (),
+                                    consolidated_block.base (),
                                     0,
                                     0),
                     CORBA::NO_MEMORY ());
@@ -479,6 +511,7 @@ TAO_TypeCodeFactory_i::create_string_tc (
 
   CORBA::TypeCode_ptr string_typecode = 
     CORBA::TypeCode::_nil ();
+
   ACE_NEW_THROW_EX (string_typecode,
                     CORBA_TypeCode (CORBA::tk_string,
                                     cdr.total_length (),
@@ -506,6 +539,7 @@ TAO_TypeCodeFactory_i::create_wstring_tc (
 
   CORBA::TypeCode_ptr wstring_typecode = 
     CORBA::TypeCode::_nil ();
+
   ACE_NEW_THROW_EX (wstring_typecode,
                     CORBA_TypeCode (CORBA::tk_wstring,
                                     cdr.total_length (),
@@ -558,12 +592,18 @@ TAO_TypeCodeFactory_i::create_sequence_tc (
 
   cdr << bound;
 
+  ACE_Message_Block consolidated_block;
+
+  ACE_CDR::consolidate (&consolidated_block, 
+                        cdr.begin ());
+
   CORBA::TypeCode_ptr sequence_typecode = 
     CORBA::TypeCode::_nil ();
+
   ACE_NEW_THROW_EX (sequence_typecode,
                     CORBA_TypeCode (CORBA::tk_sequence,
-                                    cdr.total_length (),
-                                    cdr.buffer (),
+                                    consolidated_block.length (),
+                                    consolidated_block.base (),
                                     0,
                                     0),
                     CORBA::NO_MEMORY ());
@@ -600,12 +640,18 @@ TAO_TypeCodeFactory_i::create_array_tc (
 
   cdr << length;
 
+  ACE_Message_Block consolidated_block;
+
+  ACE_CDR::consolidate (&consolidated_block, 
+                        cdr.begin ());
+
   CORBA::TypeCode_ptr array_typecode = 
     CORBA::TypeCode::_nil ();
+
   ACE_NEW_THROW_EX (array_typecode,
                     CORBA_TypeCode (CORBA::tk_array,
-                                    cdr.total_length (),
-                                    cdr.buffer (),
+                                    consolidated_block.length (),
+                                    consolidated_block.base (),
                                     0,
                                     0),
                     CORBA::NO_MEMORY ());
@@ -675,13 +721,18 @@ TAO_TypeCodeFactory_i::create_value_box_tc (
 
   cdr << boxed_type;
 
+  ACE_Message_Block consolidated_block;
+
+  ACE_CDR::consolidate (&consolidated_block, 
+                        cdr.begin ());
+
   CORBA::TypeCode_ptr value_box_typecode = 
     CORBA::TypeCode::_nil ();
 
   ACE_NEW_THROW_EX (value_box_typecode,
                     CORBA_TypeCode (CORBA::tk_value_box,
-                                    cdr.total_length (),
-                                    cdr.buffer (),
+                                    consolidated_block.length (),
+                                    consolidated_block.base (),
                                     0,
                                     0),
                     CORBA::NO_MEMORY ());
@@ -984,13 +1035,18 @@ TAO_TypeCodeFactory_i::create_tc_common (
 
   cdr << name;
 
+  ACE_Message_Block consolidated_block;
+
+  ACE_CDR::consolidate (&consolidated_block, 
+                        cdr.begin ());
+
   CORBA::TypeCode_ptr result = 
     CORBA::TypeCode::_nil ();
 
   ACE_NEW_THROW_EX (result,
                     CORBA_TypeCode (kind,
-                                    cdr.total_length (),
-                                    cdr.buffer (),
+                                    consolidated_block.length (),
+                                    consolidated_block.base (),
                                     0,
                                     0),
                     CORBA::NO_MEMORY ());
@@ -1031,8 +1087,14 @@ TAO_TypeCodeFactory_i::struct_except_tc_common (
 
   cdr << id;
 
+  this->string_pad (cdr,
+                    ACE_OS::strlen (id) + 1);
+
   cdr << name;
 
+  this->string_pad (cdr,
+                    ACE_OS::strlen (name) + 1);
+
   // Number of members..
   CORBA::ULong len = members.length ();
 
@@ -1081,15 +1143,24 @@ TAO_TypeCodeFactory_i::struct_except_tc_common (
 
       cdr << member_name;
 
+      this->string_pad (cdr,
+                        ACE_OS::strlen (member_name) + 1);
+
       cdr << tc_holder;
     }
 
+  ACE_Message_Block consolidated_block;
+
+  ACE_CDR::consolidate (&consolidated_block, 
+                        cdr.begin ());
+
   CORBA::TypeCode_ptr new_typecode = 
     CORBA::TypeCode::_nil ();
+
   ACE_NEW_THROW_EX (new_typecode,
                     CORBA_TypeCode (kind,
-                                    cdr.total_length (),
-                                    cdr.buffer (),
+                                    consolidated_block.length (),
+                                    consolidated_block.base (),
                                     0,
                                     0),
                     CORBA::NO_MEMORY ());
@@ -1282,7 +1353,7 @@ TAO_TypeCodeFactory_i::unique_label_values (const CORBA_UnionMemberSeq &members,
             case CORBA::tk_ushort:
               members[i].label >>= s.ushort_val;
 
-              if (checker.insert (s.short_val) != 0)
+              if (checker.insert (s.ushort_val) != 0)
                 {
                   return 0;
                 }
@@ -1343,6 +1414,18 @@ TAO_TypeCodeFactory_i::valid_disc_type (CORBA::TypeCode_ptr tc,
   return 0;
 }
 
+void
+TAO_TypeCodeFactory_i::string_pad (TAO_OutputCDR &cdr,
+                                   CORBA::ULong slen)
+{
+  CORBA::ULong padlen = (4 - (slen % 4)) % 4;
+
+  for (CORBA::ULong i = 0; i < padlen; ++i)
+    {
+      cdr.write_char ('\0');
+    }
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class ACE_Hash_Map_Entry<ACE_CString, int>;
diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h
index b771dd7afb4..1eb4e39b4a6 100644
--- a/TAO/tao/corba.h
+++ b/TAO/tao/corba.h
@@ -2,20 +2,20 @@
 
 //=============================================================================
 /**
- *  @file    corba.h
+ *  @file corba.h
  *
  *  $Id$
  *
  *   Master Header file for the TAO CORBA ORB.  Include only this
  *   file, to see all public ORB interfaces declared by TAO.
- *
+ *   @par
  *   This follows the OMG C++ mapping for compilers that don't
  *   support C++ exceptions or namespaces.
  *
  *
  *  @author  Copyright 1994-1995 by Sun Microsystems Inc.
- *  @author Chris Cleeland
- *  @author  and Douglas C. Schmidt.
+ *  @author  Chris Cleeland
+ *  @author  Douglas C. Schmidt
  */
 //=============================================================================
 
@@ -68,10 +68,13 @@
 
 #include "tao/Remote_Object_Proxy_Impl.h"
 
-#include "tao/PortableInterceptor.h" /* This needs to remain visible. */
 #include "tao/StringSeqC.h"
 #include "tao/OctetSeqC.h"
 
+#if TAO_HAS_INTERCEPTORS == 1
+#include "tao/PortableInterceptorC.h"
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+
 #if !defined (ACE_NESTED_CLASS)
 #if defined (ACE_WIN32)
 #define ACE_NESTED_CLASS(SCOPE,CLASS) CLASS