ChangeLogTag: Fri Apr 5 19:49:57 2002 Balachandran Natarajan <bala@cs.wustl.edu>

35 files changed, 7485 insertions, 4552 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index a784de1c79b..cdf767551c9 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,64 @@
+Fri Apr  5 19:49:57 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+	* TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp: Fix for part of
+	  bug #1159. Changed the way we perform a check for malformed GIOP
+	  message containing a sequence. The procedure we followed was to
+	  extract the length of the sequence, resize the length of
+	  sequence (this involved allocation) into which we need to
+	  extract and then perform a sanity check. This sanity check was
+	  too late. Malformed GIOP messages had very big size of sequences
+	  and allocations took time and sometimes crashed the
+	  application. 
+
+	  We extract the length of the sequence and then check to see if
+	  the length of the sequence is greater than the size of the
+	  incoming stream. If it is greater we return an error. Thanks to
+	  Duane Binder <duane.binder@veritas.com> for reporting the
+	  problem. 
+	
+	* tao/DomainC.cpp:
+	* tao/DomainC.h:
+	* tao/DomainC.i:
+	* tao/DynamicC.cpp:
+	* tao/DynamicC.h:
+	* tao/DynamicC.i:
+	* tao/IOPC.cpp:
+	* tao/IOPC.h:
+	* tao/IOPC.i:
+	* tao/Messaging_PolicyValueC.cpp:
+	* tao/Messaging_PolicyValueC.h:
+	* tao/Messaging_PolicyValueC.i:
+	* tao/ObjectReferenceTemplateC.cpp:
+	* tao/ObjectReferenceTemplateC.h:
+	* tao/ObjectReferenceTemplateC.i:
+	* tao/PolicyC.cpp:
+	* tao/PolicyC.h:
+	* tao/PolicyC.i:
+	* tao/PolicyS.h:
+	* tao/Policy_ForwardC.cpp:
+	* tao/Policy_ForwardC.h:
+	* tao/Policy_ForwardC.i:
+	* tao/Domain/DomainS.cpp:
+	* tao/Domain/DomainS.h:
+	* tao/Domain/DomainS.i:
+	* tao/Domain/DomainS_T.cpp:
+	* tao/Domain/DomainS_T.h:
+	* tao/Domain/DomainS_T.i:
+	* tao/DynamicAny/DynamicAnyC.cpp:
+	* tao/PortableServer/ImplRepoC.cpp:
+	* tao/PortableServer/ImplRepoC.h:
+	* tao/PortableServer/ImplRepoC.i:
+	* tao/PortableServer/ImplRepoS.cpp:
+	* tao/PortableServer/ImplRepoS.h:
+	* tao/PortableServer/ImplRepoS_T.cpp:
+	* tao/PortableServer/ImplRepoS_T.h:
+	* tao/PortableServer/ImplRepoS_T.i:
+	* tao/PortableServer/PortableServerC.cpp:
+	* tao/RTCORBA/RTCORBAC.cpp:
+	* tao/diffs/IOP.diff:
+	* tao/diffs/Policy_Forward.diff: Regenerated all the code that
+	  needed to be changed with above change to the IDL compiler.
+
 Fri Apr  5 12:10:38 2002  Jeff Parsons <parsons@cs.wustl.edu>
 
         * TAO_IDL/be/be_visitor_exception/any_op_ch.cpp:
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
index 3258ee8ddc0..22cb2f8d323 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
@@ -151,9 +151,16 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
       *os << "CORBA::ULong _tao_seq_len;" << be_nl;
       *os << "if (strm >> _tao_seq_len)" << be_nl
           << "{" << be_idt_nl;
+
+      // Add a sanity check for the length of a sequence.
+      *os << "// Add a check to the length of the sequence" << be_nl;
+      *os << "// to make sure it does not exceed the length" << be_nl;
+      *os << "// of the stream. (See bug 1159.)" << be_nl;
+      *os << "if (_tao_seq_len > strm.length())" << be_idt_nl;
+      *os << "return 0;" << be_uidt_nl;
+
       // now check if the length does not exceed the maximum. We do this only
       // for bounded sequences
-
       AST_Expression *expr = node->max_size ();
       // dimension value
       if ((expr == NULL) || ((expr != NULL) && (expr->ev () == NULL)))
@@ -192,12 +199,7 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
       *os << "if (0 >= _tao_seq_len) " << be_idt_nl;
       *os << "return 1;" << be_uidt_nl;
 
-      // Add a sanity check for the length of a sequence.
-      *os << "// Add a check to the length of the sequence" << be_nl;
-      *os << "// to make sure it does not exceed the length" << be_nl;
-      *os << "// of the stream. (See bug 58.)" << be_nl;
-      *os << "if (_tao_seq_len > strm.length())" << be_idt_nl;
-      *os << "return 0;" << be_uidt_nl;
+
 
       *os << "// retrieve all the elements" << be_nl;
 
diff --git a/TAO/tao/Domain/DomainS.cpp b/TAO/tao/Domain/DomainS.cpp
index 1646dc2e8b5..85a2fdd2edc 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"
 
@@ -57,9 +57,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 17:27:57 */
+/* starting time is 11:13:07 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/sirion/coryan/amh/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: /project/beguine/bala/patches/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)
 {
@@ -152,7 +152,7 @@ TAO_CORBA_DomainManager_Perfect_Hash_OpTable::lookup (const char *str, unsigned
     }
   return 0;
 }
-/* ending time is 17:27:57 */
+/* ending time is 11:13:07 */
 static TAO_CORBA_DomainManager_Perfect_Hash_OpTable tao_CORBA_DomainManager_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -170,21 +170,21 @@ public:
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
@@ -195,7 +195,7 @@ public:
 private:
   TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy (const TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy &);
   void operator= (const TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy &);
-
+  
 private:
   POA_CORBA::DomainManager *_tao_impl;
   const CORBA::PolicyType & policy_type_;
@@ -221,16 +221,16 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::arguments (ACE_ENV_
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   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 ();
 }
 
@@ -242,12 +242,12 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::exceptions (ACE_ENV
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -256,11 +256,11 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::result (ACE_ENV_SIN
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
-
+  
   return safe_result_any._retn ();
 }
 
@@ -282,7 +282,7 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::target_is_a (
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::result (::CORBA::Policy_ptr result)
 {
   // Update the result.
@@ -306,14 +306,14 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::_TAO_DomainManager_Strat
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
-
+  
 }
 
 POA_CORBA::_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];
-
+  
 }
 
 CORBA::_TAO_DomainManager_Proxy_Impl&
@@ -325,25 +325,25 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::select_proxy (
   int strategy =
     TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-
+  
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
-
+  
   this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-
+  
   return *this->proxy_cache_[strategy];
-
+  
 }
 
-void
+void 
 POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::create_proxy (
     int strategy
     ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
-
+  
   if (this->proxy_cache_[strategy] == 0)
     {
       switch (strategy)
@@ -356,7 +356,7 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::create_proxy (
           );
           ACE_CHECK;
           break;
-
+          
         case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
@@ -365,7 +365,7 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::create_proxy (
           );
           ACE_CHECK;
           break;
-
+          
         case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY:
         default:
           ACE_NEW_THROW_EX (
@@ -375,9 +375,9 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::create_proxy (
           );
           ACE_CHECK;
           break;
-
+        
       }
-
+    
   }
 }
 
@@ -397,13 +397,13 @@ CORBA__TAO_DomainManager_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 int
 CORBA__TAO_DomainManager_Proxy_Broker_Factory_Initializer (long)
 {
-  CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer =
+  CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer = 
     CORBA__TAO_DomainManager_Proxy_Broker_Factory_function;
-
+  
   return 0;
 }
 
-static int CORBA__TAO_DomainManager_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+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));
 
 
@@ -475,14 +475,14 @@ POA_CORBA::_TAO_DomainManager_Direct_Proxy_Impl::_TAO_DomainManager_Direct_Proxy
     )->get_domain_policy (
           policy_type ACE_ENV_ARG_PARAMETER
         );
-
+  
 }
 
 
 //
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be/be_visitor_interface/interface_ss.cpp:100
 POA_CORBA::DomainManager::DomainManager (void)
 {
@@ -521,38 +521,38 @@ ACE_THROW (CORBA::MARSHAL ());
 #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 ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
       policy_type ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                            1  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
 #endif /* TAO_HAS_INTERCEPTORS */
-        _tao_retval =
+        _tao_retval = 
         _tao_impl->get_domain_policy (
             policy_type ACE_ENV_ARG_PARAMETER
           );
         TAO_INTERCEPTOR_CHECK;
-
+        
 #if (TAO_HAS_INTERCEPTORS == 1)
         }
-
+      
       ::CORBA::Policy_ptr _tao_retval_info = _tao_retval._retn ();
       _tao_ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
@@ -568,11 +568,11 @@ ACE_THROW (CORBA::MARSHAL ());
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         ACE_RE_THROW;
@@ -580,11 +580,11 @@ ACE_THROW (CORBA::MARSHAL ());
   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 ())
     ))
@@ -592,11 +592,11 @@ ACE_THROW (CORBA::MARSHAL ());
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
+  
   }
 
 void POA_CORBA::DomainManager::_is_a_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -608,10 +608,10 @@ void POA_CORBA::DomainManager::_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_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -619,7 +619,7 @@ void POA_CORBA::DomainManager::_is_a_skel (
 }
 
 void POA_CORBA::DomainManager::_non_existent_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -629,7 +629,7 @@ void POA_CORBA::DomainManager::_non_existent_skel (
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -637,7 +637,7 @@ void POA_CORBA::DomainManager::_non_existent_skel (
 }
 
 void POA_CORBA::DomainManager::_interface_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -646,27 +646,27 @@ void POA_CORBA::DomainManager::_interface_skel (
   POA_CORBA::DomainManager *_tao_impl = (POA_CORBA::DomainManager *) _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_retval = 
         _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       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,
@@ -678,7 +678,7 @@ void POA_CORBA::DomainManager::_interface_skel (
       _tao_adapter->dispose (_tao_retval);
     }
   ACE_ENDTRY;
-
+  
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -733,20 +733,20 @@ POA_CORBA::DomainManager::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   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 ::CORBA::DomainManager::_unchecked_narrow (obj.in ());
 }
 
@@ -758,9 +758,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 17:27:57 */
+/* starting time is 11:13:07 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/sirion/coryan/amh/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: /project/beguine/bala/patches/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)
 {
@@ -858,7 +858,7 @@ TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsi
     }
   return 0;
 }
-/* ending time is 17:27:57 */
+/* ending time is 11:13:07 */
 static TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable tao_CORBA_ConstructionPolicy_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -877,36 +877,36 @@ public:
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-
+  
 private:
   TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager (const TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager &);
   void operator= (const TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager &);
-
+  
 private:
   POA_CORBA::ConstructionPolicy *_tao_impl;
   CORBA::InterfaceDef_ptr object_type_;
   const CORBA::Boolean & constr_policy_;
-
+  
 };
 
 TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager (
@@ -930,19 +930,19 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (A
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   parameter_list->length (2);
   CORBA::ULong len = 0;
-
-    (*parameter_list)[len].argument <<= this->object_type_;
+  
+    (*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 ();
 }
 
@@ -954,12 +954,12 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -968,7 +968,7 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::result (ACE_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -1007,14 +1007,14 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::_TAO_ConstructionPo
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
-
+  
 }
 
 POA_CORBA::_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];
-
+  
 }
 
 CORBA::_TAO_ConstructionPolicy_Proxy_Impl&
@@ -1026,25 +1026,25 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::select_proxy (
   int strategy =
     TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-
+  
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
-
+  
   this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-
+  
   return *this->proxy_cache_[strategy];
-
+  
 }
 
-void
+void 
 POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::create_proxy (
     int strategy
     ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
-
+  
   if (this->proxy_cache_[strategy] == 0)
     {
       switch (strategy)
@@ -1057,7 +1057,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::create_proxy (
           );
           ACE_CHECK;
           break;
-
+          
         case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
@@ -1066,7 +1066,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::create_proxy (
           );
           ACE_CHECK;
           break;
-
+          
         case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY:
         default:
           ACE_NEW_THROW_EX (
@@ -1076,9 +1076,9 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::create_proxy (
           );
           ACE_CHECK;
           break;
-
+        
       }
-
+    
   }
 }
 
@@ -1098,13 +1098,13 @@ CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function (CORBA::Object_ptr o
 int
 CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_Initializer (long)
 {
-  CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer =
+  CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer = 
     CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function;
-
+  
   return 0;
 }
 
-static int CORBA__TAO_ConstructionPolicy_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+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));
 
 
@@ -1179,14 +1179,14 @@ void POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::make_domain_manager
           object_type,
           constr_policy ACE_ENV_ARG_PARAMETER
         );
-
+  
 }
 
 
 //
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be/be_visitor_interface/interface_ss.cpp:100
 POA_CORBA::ConstructionPolicy::ConstructionPolicy (void)
 {
@@ -1228,12 +1228,12 @@ ACE_THROW (CORBA::MARSHAL ());
 #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 ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager _tao_ri (
       _tao_server_request,
       _tao_upcall,
@@ -1241,27 +1241,27 @@ ACE_THROW (CORBA::MARSHAL ());
       object_type.in (),
       constr_policy ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                            1  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
 #endif /* TAO_HAS_INTERCEPTORS */
-
+        
         _tao_impl->make_domain_manager (
             object_type.in (),
             constr_policy ACE_ENV_ARG_PARAMETER
           );
         TAO_INTERCEPTOR_CHECK;
-
+        
 #if (TAO_HAS_INTERCEPTORS == 1)
         }
-
+      
       _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
       _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -1274,11 +1274,11 @@ ACE_THROW (CORBA::MARSHAL ());
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         ACE_RE_THROW;
@@ -1286,16 +1286,16 @@ ACE_THROW (CORBA::MARSHAL ());
   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);
-
+  
   }
 
 void POA_CORBA::ConstructionPolicy::_is_a_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -1307,10 +1307,10 @@ void POA_CORBA::ConstructionPolicy::_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_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -1318,7 +1318,7 @@ void POA_CORBA::ConstructionPolicy::_is_a_skel (
 }
 
 void POA_CORBA::ConstructionPolicy::_non_existent_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -1328,7 +1328,7 @@ void POA_CORBA::ConstructionPolicy::_non_existent_skel (
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -1336,7 +1336,7 @@ void POA_CORBA::ConstructionPolicy::_non_existent_skel (
 }
 
 void POA_CORBA::ConstructionPolicy::_interface_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -1345,27 +1345,27 @@ void POA_CORBA::ConstructionPolicy::_interface_skel (
   POA_CORBA::ConstructionPolicy *_tao_impl = (POA_CORBA::ConstructionPolicy *) _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_retval = 
         _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       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,
@@ -1377,7 +1377,7 @@ void POA_CORBA::ConstructionPolicy::_interface_skel (
       _tao_adapter->dispose (_tao_retval);
     }
   ACE_ENDTRY;
-
+  
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -1435,20 +1435,20 @@ POA_CORBA::ConstructionPolicy::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   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 ::CORBA::ConstructionPolicy::_unchecked_narrow (obj.in ());
 }
 
diff --git a/TAO/tao/Domain/DomainS.h b/TAO/tao/Domain/DomainS.h
index bc756b12d54..82f81e3fc02 100644
--- a/TAO/tao/Domain/DomainS.h
+++ b/TAO/tao/Domain/DomainS.h
@@ -19,8 +19,8 @@
 // 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"
 
@@ -58,7 +58,7 @@ TAO_NAMESPACE  POA_CORBA
   class _TAO_DomainManager_ThruPOA_Proxy_Impl;
   class _TAO_DomainManager_Direct_Proxy_Impl;
   class _TAO_DomainManager_Strategized_Proxy_Broker;
-
+  
   class TAO_Domain_Export DomainManager
     : public virtual PortableServer::ServantBase
   {
@@ -119,7 +119,7 @@ TAO_NAMESPACE  POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
         static void get_domain_policy_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
@@ -130,23 +130,23 @@ TAO_NAMESPACE  POA_CORBA
 
   };
 
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration
+  //               Strategized Proxy Broker Declaration 
   //
-
+  
   class TAO_Domain_Export _TAO_DomainManager_Strategized_Proxy_Broker : public virtual ::CORBA::_TAO_DomainManager_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_DomainManager_Strategized_Proxy_Broker (void);
-
+    
     virtual ~_TAO_DomainManager_Strategized_Proxy_Broker (void);
-
+    
     virtual ::CORBA::_TAO_DomainManager_Proxy_Impl &select_proxy (
       ::CORBA::DomainManager *object
       ACE_ENV_ARG_DECL
     );
-
+  
   private:
     // Helper methods that takes care to create the proxy
     // as soon as their use is necessary.
@@ -154,41 +154,41 @@ TAO_NAMESPACE  POA_CORBA
       int collocation_strategy
       ACE_ENV_ARG_DECL
     );
-
+    
     // 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_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.
-
+  
   public:
     static _TAO_DomainManager_Strategized_Proxy_Broker *the_TAO_DomainManager_Strategized_Proxy_Broker (void);
   };
-
-
+  
+  
   //
-  //            End Strategized Proxy Broker Declaration
+  //            End Strategized Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA  Impl. Declaration
   //
-
+  
   class TAO_Domain_Export _TAO_DomainManager_ThruPOA_Proxy_Impl :
     public virtual ::CORBA::_TAO_DomainManager_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl
   {
   public:
     _TAO_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
@@ -197,15 +197,15 @@ TAO_NAMESPACE  POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
-
+    
+    
   };
-
+  
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
 ///////////////////////////////////////////////////////////////////////
 //                    Direct  Impl. Declaration
 //
@@ -216,9 +216,9 @@ class TAO_Domain_Export _TAO_DomainManager_Direct_Proxy_Impl :
 {
 public:
   _TAO_DomainManager_Direct_Proxy_Impl (void);
-
+  
   virtual ~_TAO_DomainManager_Direct_Proxy_Impl (void) { }
-
+  
   virtual ::CORBA::Policy_ptr get_domain_policy (
       CORBA_Object *_collocated_tao_target_,
       CORBA::PolicyType policy_type
@@ -227,7 +227,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   };
 
 
@@ -304,7 +304,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void make_domain_manager_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -320,14 +320,14 @@ public:
     );
 
   static void copy_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
 
   static void destroy_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -338,16 +338,16 @@ public:
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration
+//               Strategized Proxy Broker Declaration 
 //
 
 class TAO_Domain_Export _TAO_ConstructionPolicy_Strategized_Proxy_Broker : public virtual ::CORBA::_TAO_ConstructionPolicy_Proxy_Broker
 {
-public:
+public: 
   _TAO_ConstructionPolicy_Strategized_Proxy_Broker (void);
-
+  
   virtual ~_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void);
-
+  
   virtual ::CORBA::_TAO_ConstructionPolicy_Proxy_Impl &select_proxy (
     ::CORBA::ConstructionPolicy *object
     ACE_ENV_ARG_DECL
@@ -360,13 +360,13 @@ private:
     int collocation_strategy
     ACE_ENV_ARG_DECL
   );
-
+  
   // 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_ConstructionPolicy_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
@@ -378,7 +378,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration
+//            End Strategized Proxy Broker Declaration 
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -390,13 +390,13 @@ class TAO_Domain_Export _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl :
   public virtual ::CORBA::_TAO_ConstructionPolicy_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl
-
+  
 {
 public:
   _TAO_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,
@@ -406,8 +406,8 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
-
+  
+  
 };
 
 //
@@ -423,13 +423,13 @@ class TAO_Domain_Export _TAO_ConstructionPolicy_Direct_Proxy_Impl :
   public virtual CORBA::_TAO_ConstructionPolicy_Proxy_Impl,
   public virtual TAO_Direct_Object_Proxy_Impl,
   public virtual POA_CORBA::_TAO_Policy_Direct_Proxy_Impl
-
+  
 {
 public:
   _TAO_ConstructionPolicy_Direct_Proxy_Impl (void);
-
+  
   virtual ~_TAO_ConstructionPolicy_Direct_Proxy_Impl (void) { }
-
+  
   virtual void make_domain_manager (
       CORBA_Object *_collocated_tao_target_,
       CORBA::InterfaceDef_ptr object_type,
@@ -439,7 +439,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   };
 
 
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 461cd289fc5..7917bd69268 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)
@@ -35,7 +35,7 @@ TAO_NAMESPACE  POA_CORBA
 {
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
-  class DomainManager_tie : public DomainManager
+  class  DomainManager_tie : public DomainManager
   {
   public:
     DomainManager_tie (T &t);
@@ -48,7 +48,7 @@ TAO_NAMESPACE  POA_CORBA
     // ctor with T*, ownership flag and a POA
     ~DomainManager_tie (void);
     // dtor
-
+    
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -60,7 +60,7 @@ TAO_NAMESPACE  POA_CORBA
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-
+    
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -72,12 +72,12 @@ TAO_NAMESPACE  POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
       private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-
+    
     // copy and assignment are not allowed
     DomainManager_tie (const DomainManager_tie &);
     void operator= (const DomainManager_tie &);
@@ -85,7 +85,7 @@ TAO_NAMESPACE  POA_CORBA
 
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
-  class ConstructionPolicy_tie : public ConstructionPolicy
+  class  ConstructionPolicy_tie : public ConstructionPolicy
   {
   public:
     ConstructionPolicy_tie (T &t);
@@ -98,7 +98,7 @@ TAO_NAMESPACE  POA_CORBA
     // ctor with T*, ownership flag and a POA
     ~ConstructionPolicy_tie (void);
     // dtor
-
+    
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -110,7 +110,7 @@ TAO_NAMESPACE  POA_CORBA
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-
+    
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -123,36 +123,36 @@ TAO_NAMESPACE  POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
         CORBA::PolicyType policy_type (
-
+        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
         ::CORBA::Policy_ptr copy (
-
+        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
         void destroy (
-
+        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
       private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-
+    
     // copy and assignment are not allowed
     ConstructionPolicy_tie (const ConstructionPolicy_tie &);
     void operator= (const ConstructionPolicy_tie &);
diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index 76e26f8e703..aa003c096c2 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -42,6 +42,10 @@
 #include "DomainC.i"
 #endif /* !defined INLINE */
 
+
+// TAO_IDL - Generated from 
+// be/be_visitor_interface/interface_cs.cpp:67
+
 int CORBA::DomainManager::_tao_class_id = 0;
 
 CORBA::DomainManager_ptr
@@ -137,7 +141,7 @@ CORBA::DomainManager_var::operator const ::CORBA::DomainManager_ptr &() const //
   return this->ptr_;
 }
 
-CORBA::DomainManager_var::operator ::CORBA::DomainManager_ptr &() // cast
+CORBA::DomainManager_var::operator ::CORBA::DomainManager_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -286,10 +290,10 @@ public:
 
   virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -306,7 +310,7 @@ private:
 TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA::PolicyType & policy_type ACE_ENV_ARG_DECL_NOT_USED
+    const CORBA::PolicyType & policy_type ACE_ENV_ARG_DECL_NOT_USED    
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     policy_type_ (policy_type)
@@ -320,16 +324,16 @@ TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::arguments (ACE_ENV_
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   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 ();
 }
 
@@ -341,11 +345,11 @@ TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::exceptions (ACE_ENV
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -354,24 +358,24 @@ TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::result (ACE_ENV_SIN
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void
+void 
 TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::result (::CORBA::Policy_ptr result)
 {
-  // update the result
+  // update the result 
   this->_result = result;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation.
+//                Base & Remote Proxy  Implementation. 
 //
 
 CORBA::_TAO_DomainManager_Proxy_Impl::_TAO_DomainManager_Proxy_Impl (void)
@@ -391,16 +395,16 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Impl::_TAO_DomainManager_Remote_Proxy_Imp
     CORBA::SystemException
   ))
 {
-
+  
   CORBA::Policy_var _tao_retval (CORBA::Policy::_nil ());
 
 
-
+  
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "get_domain_policy",
@@ -408,22 +412,22 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Impl::_TAO_DomainManager_Remote_Proxy_Imp
       1,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy _tao_ri (
         &_tao_call,
@@ -433,13 +437,13 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Impl::_TAO_DomainManager_Remote_Proxy_Imp
             ACE_CHECK_RETURN (_tao_retval._retn ());
 
 #endif /* TAO_HAS_INTERCEPTORS */
-
-
+      
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -447,15 +451,15 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Impl::_TAO_DomainManager_Remote_Proxy_Imp
             ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-
+          
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-
+          
 #endif /* TAO_HAS_INTERCEPTORS */
-
+          
           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
                     TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
@@ -473,7 +477,7 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Impl::_TAO_DomainManager_Remote_Proxy_Imp
               CORBA::MARSHAL (),
               0
             );
-
+            
           _invoke_status =
             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
                     TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
@@ -484,7 +488,7 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Impl::_TAO_DomainManager_Remote_Proxy_Imp
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-
+              
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
@@ -496,10 +500,10 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Impl::_TAO_DomainManager_Remote_Proxy_Imp
                 );
                 ACE_TRY_CHECK;
               )
-
+              
               continue;
             }
-
+          
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_retval.inout ())
@@ -509,21 +513,21 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Impl::_TAO_DomainManager_Remote_Proxy_Imp
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-
+              
             }
-
+          
 #if TAO_HAS_INTERCEPTORS == 1
           ::CORBA::Policy_ptr _tao_retval_info = _tao_retval._retn ();
           _tao_ri.result (_tao_retval_info);
           _tao_retval = _tao_retval_info;
-
+          
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &_tao_ri
             ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-
+        
       }
     ACE_CATCHANY
       {
@@ -533,11 +537,11 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Impl::_TAO_DomainManager_Remote_Proxy_Imp
           ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
-
+        
         PortableInterceptor::ReplyStatus _tao_status =
           _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
@@ -552,9 +556,9 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Impl::_TAO_DomainManager_Remote_Proxy_Imp
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-
+    
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+    
     break;
   }
 return _tao_retval._retn ();
@@ -562,7 +566,7 @@ return _tao_retval._retn ();
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation.
+//            End  Base & Remote  Proxy Implemeentation. 
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -613,8 +617,8 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// be/be_visitor_interface/interface_cs.cpp:198
 
 CORBA::DomainManager::DomainManager (int collocated)
 {
@@ -658,7 +662,7 @@ CORBA::DomainManager_ptr CORBA::DomainManager::_narrow (
   return DomainManager::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::DomainManager_ptr
+CORBA::DomainManager_ptr 
 CORBA::DomainManager::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -690,7 +694,7 @@ CORBA::DomainManager::_unchecked_narrow (
               DomainManager::_nil ()
             );
         }
-
+      
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -703,10 +707,10 @@ CORBA::DomainManager::_unchecked_narrow (
               DomainManager::_nil ()
             );
         }
-
+      
       return default_proxy;
     }
-  else
+  else 
     return
       ACE_reinterpret_cast
         (
@@ -750,7 +754,7 @@ void *CORBA::DomainManager::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -769,10 +773,10 @@ const char* CORBA::DomainManager::_interface_repository_id (void) const
     CORBA::SystemException
   ))
 {
-  _TAO_DomainManager_Proxy_Impl &proxy =
+  _TAO_DomainManager_Proxy_Impl &proxy = 
     this->the_TAO_DomainManager_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return proxy.get_domain_policy (
       this,
       policy_type ACE_ENV_ARG_PARAMETER
@@ -783,19 +787,19 @@ static const CORBA::Long _oc_CORBA_DomainManager[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   36,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f446f),
-  ACE_NTOHL (0x6d61696e),
-  ACE_NTOHL (0x4d616e61),
-  ACE_NTOHL (0x6765723a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f446f), 
+  ACE_NTOHL (0x6d61696e), 
+  ACE_NTOHL (0x4d616e61), 
+  ACE_NTOHL (0x6765723a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/DomainManager:1.0
   14,
-  ACE_NTOHL (0x446f6d61),
-  ACE_NTOHL (0x696e4d61),
-  ACE_NTOHL (0x6e616765),
+  ACE_NTOHL (0x446f6d61), 
+  ACE_NTOHL (0x696e4d61), 
+  ACE_NTOHL (0x6e616765), 
   ACE_NTOHL (0x72000000),  // name = DomainManager
 };
 
@@ -816,6 +820,10 @@ TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (CORBA)
 TAO_NAMESPACE_DEFINE (const CORBA::ULong, SecConstruction, 11U)
 TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from 
+// be/be_visitor_interface/interface_cs.cpp:67
+
 int CORBA::ConstructionPolicy::_tao_class_id = 0;
 
 CORBA::ConstructionPolicy_ptr
@@ -911,7 +919,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_;
 }
@@ -1061,10 +1069,10 @@ public:
 
   virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -1074,14 +1082,14 @@ private:
 
   CORBA::InterfaceDef_ptr object_type_;
   const CORBA::Boolean & constr_policy_;
-
+  
 };
 
 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,
-    const CORBA::Boolean & constr_policy ACE_ENV_ARG_DECL_NOT_USED
+    const CORBA::Boolean & constr_policy ACE_ENV_ARG_DECL_NOT_USED    
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     object_type_ (object_type),
@@ -1096,12 +1104,12 @@ TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (A
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   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 ()
@@ -1116,7 +1124,7 @@ TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (A
     (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->constr_policy_);
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -1128,11 +1136,11 @@ TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1141,14 +1149,14 @@ TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::result (ACE_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation.
+//                Base & Remote Proxy  Implementation. 
 //
 
 CORBA::_TAO_ConstructionPolicy_Proxy_Impl::_TAO_ConstructionPolicy_Proxy_Impl (void)
@@ -1169,15 +1177,15 @@ void CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
     CORBA::SystemException
   ))
 {
-
-
-
-
+  
+  
+  
+  
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "make_domain_manager",
@@ -1185,18 +1193,18 @@ void CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
       2,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   TAO_IFR_Client_Adapter *adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
@@ -1205,7 +1213,7 @@ void CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager _tao_ri (
         &_tao_call,
@@ -1216,13 +1224,13 @@ void CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
             ACE_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
-
-
+      
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -1230,15 +1238,15 @@ void CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
             ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-
+          
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-
+          
 #endif /* TAO_HAS_INTERCEPTORS */
-
+          
           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
                     TAO_INTERCEPTOR_CHECK;
 
@@ -1256,7 +1264,7 @@ void CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-
+            
           _invoke_status =
             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
                     TAO_INTERCEPTOR_CHECK;
@@ -1266,7 +1274,7 @@ void CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
               TAO_INTERCEPTOR_THROW (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-
+              
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
@@ -1278,20 +1286,20 @@ void CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
                 );
                 ACE_TRY_CHECK;
               )
-
+              
               continue;
             }
-
-
+          
+          
 #if TAO_HAS_INTERCEPTORS == 1
-
+          
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &_tao_ri
             ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-
+        
       }
     ACE_CATCHANY
       {
@@ -1301,11 +1309,11 @@ void CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
           ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
-
+        
         PortableInterceptor::ReplyStatus _tao_status =
           _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
@@ -1320,9 +1328,9 @@ void CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-
+    
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+    
     break;
   }
 
@@ -1330,7 +1338,7 @@ void CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation.
+//            End  Base & Remote  Proxy Implemeentation. 
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -1381,8 +1389,8 @@ CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// be/be_visitor_interface/interface_cs.cpp:198
 
 CORBA::ConstructionPolicy::ConstructionPolicy (int collocated)
 {
@@ -1401,7 +1409,7 @@ CORBA::ConstructionPolicy::CORBA_ConstructionPolicy_setup_collocation (int collo
   else
     this->the_TAO_ConstructionPolicy_Proxy_Broker_ =
       ::CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Broker::the_TAO_ConstructionPolicy_Remote_Proxy_Broker ();
-
+  
   this->CORBA_Policy_setup_collocation (collocated);
 }
 
@@ -1428,7 +1436,7 @@ CORBA::ConstructionPolicy_ptr CORBA::ConstructionPolicy::_narrow (
   return ConstructionPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ConstructionPolicy_ptr
+CORBA::ConstructionPolicy_ptr 
 CORBA::ConstructionPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -1460,7 +1468,7 @@ CORBA::ConstructionPolicy::_unchecked_narrow (
               ConstructionPolicy::_nil ()
             );
         }
-
+      
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -1473,10 +1481,10 @@ CORBA::ConstructionPolicy::_unchecked_narrow (
               ConstructionPolicy::_nil ()
             );
         }
-
+      
       return default_proxy;
     }
-  else
+  else 
     return
       ACE_reinterpret_cast
         (
@@ -1533,7 +1541,7 @@ void *CORBA::ConstructionPolicy::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -1553,10 +1561,10 @@ void CORBA::ConstructionPolicy::make_domain_manager (
     CORBA::SystemException
   ))
 {
-  _TAO_ConstructionPolicy_Proxy_Impl &proxy =
+  _TAO_ConstructionPolicy_Proxy_Impl &proxy = 
     this->the_TAO_ConstructionPolicy_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   proxy.make_domain_manager (
       this,
       object_type,
@@ -1568,22 +1576,22 @@ static const CORBA::Long _oc_CORBA_ConstructionPolicy[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   41,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6e737472),
-  ACE_NTOHL (0x75637469),
-  ACE_NTOHL (0x6f6e506f),
-  ACE_NTOHL (0x6c696379),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6e737472), 
+  ACE_NTOHL (0x75637469), 
+  ACE_NTOHL (0x6f6e506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x3a312e30), 
   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 (0x436f6e73), 
+  ACE_NTOHL (0x74727563), 
+  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x506f6c69), 
   ACE_NTOHL (0x63790000),  // name = ConstructionPolicy
 };
 
@@ -1612,7 +1620,7 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_allocate_buffer
 {
   CORBA::DomainManager **tmp = 0;
   tmp = _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (length);
-
+  
   if (this->buffer_ != 0)
   {
     CORBA::DomainManager **old = ACE_reinterpret_cast (CORBA::DomainManager**, this->buffer_);
@@ -1627,7 +1635,7 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_allocate_buffer
             tmp[i] = old[i];
           }
       }
-
+    
     if (this->release_)
       {
         delete[] old;
@@ -1642,13 +1650,13 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_deallocate_buffe
   if (this->buffer_ == 0 || this->release_ == 0)
     return;
   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 ();
     }
-
+  
   _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::freebuf (tmp);
   this->buffer_ = 0;
 }
@@ -1662,7 +1670,7 @@ void
 CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
 {
   CORBA::DomainManager **tmp = ACE_reinterpret_cast (CORBA::DomainManager**, this->buffer_);
-
+  
   for (CORBA::ULong i = nl; i < ol; ++i)
     {
       CORBA::release (tmp[i]);
@@ -1670,7 +1678,7 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_shrink_buffer (C
     }
 }
 
-void
+void 
 CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_downcast (
     void* target,
     CORBA_Object *src
@@ -1692,7 +1700,7 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_upcast (void *sr
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_CORBA_DOMAINMANAGERLIST_CS_)
 #define _CORBA_DOMAINMANAGERLIST_CS_
@@ -1704,30 +1712,30 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_upcast (void *sr
 CORBA::DomainManagerList::DomainManagerList (void)
 {}
 CORBA::DomainManagerList::DomainManagerList (CORBA::ULong max) // uses max size
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<CORBA::DomainManager,CORBA::DomainManager_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 CORBA::DomainManagerList::DomainManagerList (CORBA::ULong max, CORBA::ULong length, CORBA::DomainManager_ptr *buffer, CORBA::Boolean release)
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<CORBA::DomainManager,CORBA::DomainManager_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 CORBA::DomainManagerList::DomainManagerList (const DomainManagerList &seq) // copy ctor
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<CORBA::DomainManager,CORBA::DomainManager_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 CORBA::DomainManagerList::~DomainManagerList (void) // dtor
@@ -1745,21 +1753,21 @@ static const CORBA::Long _oc_CORBA_DomainManagerList[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f446f),
-  ACE_NTOHL (0x6d61696e),
-  ACE_NTOHL (0x4d616e61),
-  ACE_NTOHL (0x6765724c),
-  ACE_NTOHL (0x6973743a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f446f), 
+  ACE_NTOHL (0x6d61696e), 
+  ACE_NTOHL (0x4d616e61), 
+  ACE_NTOHL (0x6765724c), 
+  ACE_NTOHL (0x6973743a), 
   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 (0x446f6d61), 
+  ACE_NTOHL (0x696e4d61), 
+  ACE_NTOHL (0x6e616765), 
+  ACE_NTOHL (0x724c6973), 
   ACE_NTOHL (0x74000000),  // name = DomainManagerList
   CORBA::tk_sequence, // typecode kind
   80, // encapsulation length
@@ -1768,19 +1776,19 @@ static const CORBA::Long _oc_CORBA_DomainManagerList[] =
     64, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       36,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f446f),
-      ACE_NTOHL (0x6d61696e),
-      ACE_NTOHL (0x4d616e61),
-      ACE_NTOHL (0x6765723a),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f446f), 
+      ACE_NTOHL (0x6d61696e), 
+      ACE_NTOHL (0x4d616e61), 
+      ACE_NTOHL (0x6765723a), 
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/DomainManager:1.0
       14,
-      ACE_NTOHL (0x446f6d61),
-      ACE_NTOHL (0x696e4d61),
-      ACE_NTOHL (0x6e616765),
+      ACE_NTOHL (0x446f6d61), 
+      ACE_NTOHL (0x696e4d61), 
+      ACE_NTOHL (0x6e616765), 
       ACE_NTOHL (0x72000000),  // name = DomainManager
 
     0U,
@@ -1800,159 +1808,252 @@ TAO_NAMESPACE_BEGIN (CORBA)
 TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_DomainManagerList, &_tc_TAO_tc_CORBA_DomainManagerList)
 TAO_NAMESPACE_END
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::DomainManager_ptr _tao_elem)
+
+// TAO_IDL - Generated from 
+// be/be_visitor_interface/any_op_cs.cpp:60
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::DomainManager_ptr _tao_elem
+  )
 {
   TAO_OutputCDR stream;
+  
   if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        CORBA::_tc_DomainManager,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin (),
-        1,
-        CORBA::DomainManager::_duplicate (_tao_elem),
-        CORBA::DomainManager::_tao_any_destructor
-      );
-  }
+    {
+      _tao_any._tao_replace (
+          CORBA::_tc_DomainManager, 
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          CORBA::DomainManager::_duplicate (_tao_elem),
+          CORBA::DomainManager::_tao_any_destructor
+        );
+    }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::DomainManager_ptr &_tao_elem)
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::DomainManager_ptr *_tao_elem
+  )
+{
+  TAO_OutputCDR stream;
+  
+  if (stream << *_tao_elem)
+    {
+      _tao_any._tao_replace (
+          CORBA::_tc_DomainManager, 
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          *_tao_elem,
+          CORBA::DomainManager::_tao_any_destructor
+        );
+    }
+}
+
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::DomainManager_ptr &_tao_elem
+  )
 {
   ACE_TRY_NEW_ENV
   {
     _tao_elem = CORBA::DomainManager::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_DomainManager ACE_ENV_ARG_PARAMETER);
+    
+    CORBA::Boolean result =
+      type->equivalent (
+          CORBA::_tc_DomainManager
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
-
+    
     if (!result)
-      return 0; // not equivalent
-
+      {
+        return 0; // not equivalent
+      }
+    
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
       );
+    
     if (stream >> _tao_elem)
-    {
-      ((CORBA::Any *)&_tao_any)->_tao_replace (
-          CORBA::_tc_DomainManager,
-          1,
-          _tao_elem,
-          CORBA::DomainManager::_tao_any_destructor
-        );
-      return 1;
-    }
+      {
+        ((CORBA::Any *)&_tao_any)->_tao_replace (
+            CORBA::_tc_DomainManager,
+            1,
+            _tao_elem,
+            CORBA::DomainManager::_tao_any_destructor
+          );
+        
+        return 1;
+      }
   }
   ACE_CATCHANY
   {
-    _tao_elem = CORBA::DomainManager::_nil ();
-    return 0;
   }
   ACE_ENDTRY;
+  
   _tao_elem = CORBA::DomainManager::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::DomainManager,CORBA::DomainManager_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::DomainManager,CORBA::DomainManager_var>
+  template class TAO_Object_Manager<CORBA::DomainManager,CORBA::DomainManager_var>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#  pragma instantiate TAO_Object_Manager<CORBA::DomainManager,CORBA::DomainManager_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::ConstructionPolicy_ptr _tao_elem)
+
+// TAO_IDL - Generated from 
+// be/be_visitor_interface/any_op_cs.cpp:60
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ConstructionPolicy_ptr _tao_elem
+  )
 {
   TAO_OutputCDR stream;
+  
   if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        CORBA::_tc_ConstructionPolicy,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin (),
-        1,
-        CORBA::ConstructionPolicy::_duplicate (_tao_elem),
-        CORBA::ConstructionPolicy::_tao_any_destructor
-      );
-  }
+    {
+      _tao_any._tao_replace (
+          CORBA::_tc_ConstructionPolicy, 
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          CORBA::ConstructionPolicy::_duplicate (_tao_elem),
+          CORBA::ConstructionPolicy::_tao_any_destructor
+        );
+    }
+}
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ConstructionPolicy_ptr *_tao_elem
+  )
+{
+  TAO_OutputCDR stream;
+  
+  if (stream << *_tao_elem)
+    {
+      _tao_any._tao_replace (
+          CORBA::_tc_ConstructionPolicy, 
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          *_tao_elem,
+          CORBA::ConstructionPolicy::_tao_any_destructor
+        );
+    }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ConstructionPolicy_ptr &_tao_elem)
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ConstructionPolicy_ptr &_tao_elem
+  )
 {
   ACE_TRY_NEW_ENV
   {
     _tao_elem = CORBA::ConstructionPolicy::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ConstructionPolicy ACE_ENV_ARG_PARAMETER);
+    
+    CORBA::Boolean result =
+      type->equivalent (
+          CORBA::_tc_ConstructionPolicy
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
-
+    
     if (!result)
-      return 0; // not equivalent
-
+      {
+        return 0; // not equivalent
+      }
+    
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
       );
+    
     if (stream >> _tao_elem)
-    {
-      ((CORBA::Any *)&_tao_any)->_tao_replace (
-          CORBA::_tc_ConstructionPolicy,
-          1,
-          _tao_elem,
-          CORBA::ConstructionPolicy::_tao_any_destructor
-        );
-      return 1;
-    }
+      {
+        ((CORBA::Any *)&_tao_any)->_tao_replace (
+            CORBA::_tc_ConstructionPolicy,
+            1,
+            _tao_elem,
+            CORBA::ConstructionPolicy::_tao_any_destructor
+          );
+        
+        return 1;
+      }
   }
   ACE_CATCHANY
   {
-    _tao_elem = CORBA::ConstructionPolicy::_nil ();
-    return 0;
   }
   ACE_ENDTRY;
+  
   _tao_elem = CORBA::ConstructionPolicy::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::ConstructionPolicy,CORBA::ConstructionPolicy_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::ConstructionPolicy,CORBA::ConstructionPolicy_var>
+  template class TAO_Object_Manager<CORBA::ConstructionPolicy,CORBA::ConstructionPolicy_var>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#  pragma instantiate TAO_Object_Manager<CORBA::ConstructionPolicy,CORBA::ConstructionPolicy_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+
+// TAO_IDL - Generated from 
+// be/be_visitor_sequence/any_op_cs.cpp:61
+
+// Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
     const CORBA::DomainManagerList &_tao_elem
-  ) // copying
+  )
 {
   TAO_OutputCDR stream;
+  
   if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        CORBA::_tc_DomainManagerList,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
+    {
+      _tao_any._tao_replace (
+          CORBA::_tc_DomainManagerList,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin ()
+        );
+    }
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::DomainManagerList *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::DomainManagerList *_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      CORBA::_tc_DomainManagerList,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      CORBA::DomainManagerList::_tao_any_destructor
-    );
+  
+  if (stream << *_tao_elem)
+    {
+      _tao_any._tao_replace (
+          CORBA::_tc_DomainManagerList,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          _tao_elem,
+          CORBA::DomainManagerList::_tao_any_destructor
+        );
+    }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::DomainManagerList *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::DomainManagerList *&_tao_elem
+  )
 {
   return _tao_any >>= ACE_const_cast(
       const CORBA::DomainManagerList*&,
@@ -1960,56 +2061,76 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::DomainManagerList
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::DomainManagerList *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::DomainManagerList *&_tao_elem
+  )
 {
   _tao_elem = 0;
+  
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_DomainManagerList ACE_ENV_ARG_PARAMETER);
+    
+    CORBA::Boolean result =
+      type->equivalent (
+          CORBA::_tc_DomainManagerList
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
-
+    
     if (!result)
-      return 0; // not equivalent
-
+      {
+        return 0; // not equivalent
+      }
+    
     if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const CORBA::DomainManagerList*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      CORBA::DomainManagerList *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::DomainManagerList, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
       {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_DomainManagerList,
-            1,
-            ACE_static_cast (void *, tmp),
-            CORBA::DomainManagerList::_tao_any_destructor
+        _tao_elem = ACE_static_cast(
+            const CORBA::DomainManagerList*,
+            _tao_any.value ()
           );
-        _tao_elem = tmp;
+        
         return 1;
       }
-      else
+    else
       {
-        delete tmp;
+        CORBA::DomainManagerList *tmp = 0;
+        ACE_NEW_RETURN (
+            tmp,
+            CORBA::DomainManagerList,
+            0
+          );
+        
+        TAO_InputCDR stream (
+            _tao_any._tao_get_cdr (),
+            _tao_any._tao_byte_order ()
+          );
+        
+        if (stream >> *tmp)
+          {
+            ((CORBA::Any *)&_tao_any)->_tao_replace (
+                CORBA::_tc_DomainManagerList,
+                1,
+                ACE_static_cast (void *, tmp),
+                CORBA::DomainManagerList::_tao_any_destructor
+              );
+            
+            _tao_elem = tmp;
+            return 1;
+          }
+        else
+          {
+            delete tmp;
+          }
       }
-    }
   }
   ACE_CATCHANY
   {
   }
   ACE_ENDTRY;
+  
   return 0;
 }
 
@@ -2111,16 +2232,16 @@ CORBA::Boolean operator>> (
   CORBA::ULong _tao_seq_len;
   if (strm >> _tao_seq_len)
   {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // 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.)
+    // of the stream. (See bug 1159.)
     if (_tao_seq_len > strm.length())
       return 0;
+    // set the length of the sequence
+    _tao_sequence.length (_tao_seq_len);
+    // If length is 0 we return true.
+    if (0 >= _tao_seq_len) 
+      return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
@@ -2131,3 +2252,4 @@ CORBA::Boolean operator>> (
   }
   return 0; // error
 }
+
diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h
index 4a5a7904a2b..4050cb9241b 100644
--- a/TAO/tao/DomainC.h
+++ b/TAO/tao/DomainC.h
@@ -19,8 +19,8 @@
 // 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_DOMAINC_H_
+#define _TAO_IDL_DOMAINC_H_
 
 #include "ace/pre.h"
 #include "tao/corba.h"
@@ -29,7 +29,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "TAO_Export.h"
+#include "tao/corbafwd.h"
 #include "PolicyC.h"
 #include "Sequence.h"
 
@@ -137,6 +137,12 @@ TAO_NAMESPACE  CORBA
   
 #endif /* end #if !defined */
   
+  // *************************************************************
+  // CORBA::DomainManager
+  // TAO_IDL - Generated from
+  // be/be_visitor_interface/interface_ch.cpp:106
+  // *************************************************************
+  
   
 #if !defined (_CORBA_DOMAINMANAGER_CH_)
 #define _CORBA_DOMAINMANAGER_CH_
@@ -429,6 +435,12 @@ TAO_NAMESPACE  CORBA
   
 #endif /* end #if !defined */
   
+  // *************************************************************
+  // CORBA::ConstructionPolicy
+  // TAO_IDL - Generated from
+  // be/be_visitor_interface/interface_ch.cpp:106
+  // *************************************************************
+  
   
 #if !defined (_CORBA_CONSTRUCTIONPOLICY_CH_)
 #define _CORBA_CONSTRUCTIONPOLICY_CH_
@@ -829,11 +841,13 @@ CORBA::_TAO_ConstructionPolicy_Proxy_Broker *
   );
 
 // Any operators for interface CORBA::DomainManager
-TAO_Export void operator<<= (CORBA::Any &, CORBA::DomainManager_ptr);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::DomainManager *&);
+TAO_Export void operator<<= (CORBA::Any &, CORBA::DomainManager_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, CORBA::DomainManager_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::DomainManager_ptr &);
 // Any operators for interface CORBA::ConstructionPolicy
-TAO_Export void operator<<= (CORBA::Any &, CORBA::ConstructionPolicy_ptr);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ConstructionPolicy *&);
+TAO_Export void operator<<= (CORBA::Any &, CORBA::ConstructionPolicy_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, CORBA::ConstructionPolicy_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ConstructionPolicy_ptr &);
 TAO_Export void operator<<= (CORBA::Any &, const CORBA::DomainManagerList &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, CORBA::DomainManagerList*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::DomainManagerList *&); // deprecated
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.cpp b/TAO/tao/DynamicAny/DynamicAnyC.cpp
index 515f68e5535..5d771f6daf7 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.cpp
+++ b/TAO/tao/DynamicAny/DynamicAnyC.cpp
@@ -4083,16 +4083,16 @@ CORBA::Boolean operator>> (
   CORBA::ULong _tao_seq_len;
   if (strm >> _tao_seq_len)
   {
+    // Add a check to the length of the sequence
+    // to make sure it does not exceed the length
+    // of the stream. (See bug 1159.)
+    if (_tao_seq_len > strm.length())
+      return 0;
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // 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++)
@@ -4130,16 +4130,16 @@ CORBA::Boolean operator>> (
   CORBA::ULong _tao_seq_len;
   if (strm >> _tao_seq_len)
   {
+    // Add a check to the length of the sequence
+    // to make sure it does not exceed the length
+    // of the stream. (See bug 1159.)
+    if (_tao_seq_len > strm.length())
+      return 0;
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // 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/DynamicC.cpp b/TAO/tao/DynamicC.cpp
index 81ff11e648d..a39c3630b11 100644
--- a/TAO/tao/DynamicC.cpp
+++ b/TAO/tao/DynamicC.cpp
@@ -2,7 +2,6 @@
 //
 // $Id$
 
-
 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
 // TAO and the TAO IDL Compiler have been developed by:
 //       Center for Distributed Object Computing
@@ -22,10 +21,19 @@
 
 #include "DynamicC.h"
 
+#include "tao/Stub.h"
+#include "tao/Invocation.h"
+#include "tao/PortableInterceptor.h"
 #include "tao/StringSeqC.h"
 
+#if TAO_HAS_INTERCEPTORS == 1
+#include "tao/RequestInfo_Util.h"
+#include "tao/ClientRequestInfo_i.h"
+#include "tao/ClientInterceptorAdapter.h"
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+
 #if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
@@ -36,57 +44,57 @@ 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 (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 (0x50617261), 
+  ACE_NTOHL (0x6d657465), 
   ACE_NTOHL (0x72000000),  // name = Parameter
   2, // member count
   9,
-  ACE_NTOHL (0x61726775),
-  ACE_NTOHL (0x6d656e74),
+  ACE_NTOHL (0x61726775), 
+  ACE_NTOHL (0x6d656e74), 
   ACE_NTOHL (0x0),  // name = argument
   CORBA::tk_any,
 
   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
 
 };
@@ -101,12 +109,12 @@ static CORBA::TypeCode _tc_TAO_tc_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_DEFINE (::CORBA::TypeCode_ptr, _tc_Parameter, &_tc_TAO_tc_Dynamic_Parameter)
 TAO_NAMESPACE_END
 
-void Dynamic::Parameter::_tao_any_destructor (void *x)
+void Dynamic::Parameter::_tao_any_destructor (void *_tao_void_pointer)
 {
-  Parameter *tmp = ACE_static_cast (Parameter*,x);
+  Parameter *tmp = ACE_static_cast (Parameter*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -116,48 +124,48 @@ void Dynamic::Parameter::_tao_any_destructor (void *x)
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMIC_PARAMETERLIST_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_DYNAMIC_PARAMETERLIST_CS_
 
-  void
-  Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::_allocate_buffer (CORBA::ULong length)
-  {
-    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)
+void
+Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::_allocate_buffer (CORBA::ULong length)
+{
+  Dynamic::Parameter* tmp = 0;
+  tmp = _TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (length);
+  
+  if (this->buffer_ != 0)
   {
-    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::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;
+}
 
-  Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::~_TAO_Unbounded_Sequence_Dynamic_ParameterList (void) // Dtor.
-  {
-    this->_deallocate_buffer ();
-  }
+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_
@@ -169,37 +177,37 @@ 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
+_TAO_Unbounded_Sequence_Dynamic_ParameterList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<Dynamic::Parameter>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<Dynamic::Parameter>
+#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
+_TAO_Unbounded_Sequence_Dynamic_ParameterList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<Dynamic::Parameter>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<Dynamic::Parameter>
+#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
+_TAO_Unbounded_Sequence_Dynamic_ParameterList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<Dynamic::Parameter>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<Dynamic::Parameter>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 Dynamic::ParameterList::~ParameterList (void) // dtor
 {}
-void Dynamic::ParameterList::_tao_any_destructor (void *x)
+void Dynamic::ParameterList::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ParameterList *tmp = ACE_static_cast (ParameterList*,x);
+  ParameterList *tmp = ACE_static_cast (ParameterList*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -210,18 +218,18 @@ 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 (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 (0x50617261), 
+  ACE_NTOHL (0x6d657465), 
+  ACE_NTOHL (0x724c6973), 
   ACE_NTOHL (0x74000000),  // name = ParameterList
   CORBA::tk_sequence, // typecode kind
   228, // encapsulation length
@@ -230,57 +238,57 @@ static const CORBA::Long _oc_Dynamic_ParameterList[] =
     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 (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 (0x50617261), 
+      ACE_NTOHL (0x6d657465), 
       ACE_NTOHL (0x72000000),  // name = Parameter
       2, // member count
       9,
-      ACE_NTOHL (0x61726775),
-      ACE_NTOHL (0x6d656e74),
+      ACE_NTOHL (0x61726775), 
+      ACE_NTOHL (0x6d656e74), 
       ACE_NTOHL (0x0),  // name = argument
       CORBA::tk_any,
 
       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
 
 
@@ -298,44 +306,44 @@ static CORBA::TypeCode _tc_TAO_tc_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_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 (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 (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 (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 (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,
 
@@ -352,23 +360,23 @@ static CORBA::TypeCode _tc_TAO_tc_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_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 (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 (0x54797065), 
+  ACE_NTOHL (0x436f6465), 
   ACE_NTOHL (0x0),  // name = TypeCode
   CORBA::tk_TypeCode,
 
@@ -384,7 +392,7 @@ static CORBA::TypeCode _tc_TAO_tc_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_DEFINE (::CORBA::TypeCode_ptr, _tc_TypeCode, &_tc_TAO_tc_Dynamic_TypeCode)
 TAO_NAMESPACE_END
 
 
@@ -393,75 +401,75 @@ TAO_NAMESPACE_END
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMIC_EXCEPTIONLIST_CS_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMIC_EXCEPTIONLIST_CS_
 
-  // The Base_Sequence functions, please see tao/Sequence.h
-  void
-  Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_allocate_buffer (CORBA::ULong length)
-  {
-    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_)
-        {
-          delete[] old;
-        }
-    }
-    this->buffer_ = tmp;
-  }
-
-  void
-  Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_deallocate_buffer (void)
+// The Base_Sequence functions, please see tao/Sequence.h
+void
+Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_allocate_buffer (CORBA::ULong length)
+{
+  CORBA::TypeCode **tmp = 0;
+  tmp = _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (length);
+  
+  if (this->buffer_ != 0)
   {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    CORBA::TypeCode **tmp = ACE_reinterpret_cast (CORBA::TypeCode**, this->buffer_);
-
+    CORBA::TypeCode **old = 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 ();
+        if (!this->release_)
+          {
+            tmp[i] = CORBA::TypeCode::_duplicate (old[i]);
+          }
+        else
+          {
+            tmp[i] = old[i];
+          }
+      }
+    
+    if (this->release_)
+      {
+        delete[] old;
       }
-
-    _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::freebuf (tmp);
-    this->buffer_ = 0;
   }
+  this->buffer_ = tmp;
+}
 
-  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::_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 ();
+    }
+  
+  _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::freebuf (tmp);
+  this->buffer_ = 0;
+}
 
-  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_);
+Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::~_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (void)
+{
+  this->_deallocate_buffer ();
+}
 
-    for (CORBA::ULong i = nl; i < ol; ++i)
-      {
-        CORBA::release (tmp[i]);
-        tmp[i] = CORBA::TypeCode::_nil ();
-      }
-  }
+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 ();
+    }
+}
 
 
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_DYNAMIC_EXCEPTIONLIST_CS_)
 #define _DYNAMIC_EXCEPTIONLIST_CS_
@@ -473,37 +481,37 @@ 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
+_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 */
+TAO_Unbounded_Pseudo_Sequence<CORBA::TypeCode,CORBA::TypeCode_var>
+#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
+_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 */
+TAO_Unbounded_Pseudo_Sequence<CORBA::TypeCode,CORBA::TypeCode_var>
+#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
+_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 */
+TAO_Unbounded_Pseudo_Sequence<CORBA::TypeCode,CORBA::TypeCode_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 Dynamic::ExceptionList::~ExceptionList (void) // dtor
 {}
-void Dynamic::ExceptionList::_tao_any_destructor (void *x)
+void Dynamic::ExceptionList::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ExceptionList *tmp = ACE_static_cast (ExceptionList*,x);
+  ExceptionList *tmp = ACE_static_cast (ExceptionList*, _tao_void_pointer);
   delete tmp;
 }
 
@@ -514,18 +522,18 @@ 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 (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 (0x45786365), 
+  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6e4c6973), 
   ACE_NTOHL (0x74000000),  // name = ExceptionList
   CORBA::tk_sequence, // typecode kind
   72, // encapsulation length
@@ -534,16 +542,16 @@ static const CORBA::Long _oc_Dynamic_ExceptionList[] =
     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 (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 (0x54797065), 
+      ACE_NTOHL (0x436f6465), 
       ACE_NTOHL (0x0),  // name = TypeCode
       CORBA::tk_TypeCode,
 
@@ -562,46 +570,46 @@ static CORBA::TypeCode _tc_TAO_tc_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_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 (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 (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 (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 (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,
 
@@ -618,123 +626,185 @@ static CORBA::TypeCode _tc_TAO_tc_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_DEFINE (::CORBA::TypeCode_ptr, _tc_RequestContext, &_tc_TAO_tc_Dynamic_RequestContext)
 TAO_NAMESPACE_END
 
-void operator<<= (CORBA::Any &_tao_any, const Dynamic::Parameter &_tao_elem) // copying
+
+// TAO_IDL - Generated from 
+// be/be_visitor_structure/any_op_cs.cpp:58
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const Dynamic::Parameter &_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
-      Dynamic::_tc_Parameter,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
-    );
+  
+  if (stream << _tao_elem)
+    {
+      _tao_any._tao_replace (
+          Dynamic::_tc_Parameter,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin ()
+        );
+    }
 }
 
-void operator<<= (CORBA::Any &_tao_any, Dynamic::Parameter *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    Dynamic::Parameter *_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      Dynamic::_tc_Parameter,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      Dynamic::Parameter::_tao_any_destructor
-    );
+  
+  if (stream << *_tao_elem)
+    {
+      _tao_any._tao_replace (
+          Dynamic::_tc_Parameter,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          _tao_elem,
+          Dynamic::Parameter::_tao_any_destructor
+        );
+    }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Dynamic::Parameter *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    Dynamic::Parameter *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(const Dynamic::Parameter*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast (
+      const Dynamic::Parameter *&,
+      _tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Dynamic::Parameter *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const Dynamic::Parameter *&_tao_elem
+  )
 {
   _tao_elem = 0;
+  
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (Dynamic::_tc_Parameter ACE_ENV_ARG_PARAMETER);
+    
+    CORBA::Boolean result =
+      type->equivalent (
+          Dynamic::_tc_Parameter
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
-
-    if (!result)
-      return 0; // not equivalent
-
+    
+    if (result == 0)
+      {
+        return 0; // not equivalent
+      }
+    
     if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const Dynamic::Parameter*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      Dynamic::Parameter *tmp;
-      ACE_NEW_RETURN (tmp, Dynamic::Parameter, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
       {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            Dynamic::_tc_Parameter,
-            1,
-            ACE_static_cast (void *, tmp),
-            Dynamic::Parameter::_tao_any_destructor
+        _tao_elem = ACE_static_cast (
+            const Dynamic::Parameter*,
+            _tao_any.value ()
           );
-        _tao_elem = tmp;
+        
         return 1;
       }
-      else
+    else
       {
-        delete tmp;
+        Dynamic::Parameter *tmp;
+        ACE_NEW_RETURN (
+            tmp,
+            Dynamic::Parameter,
+            0
+          );
+        
+        TAO_InputCDR stream (
+            _tao_any._tao_get_cdr (),
+            _tao_any._tao_byte_order ()
+          );
+        
+        if (stream >> *tmp)
+          {
+            ((CORBA::Any *)&_tao_any)->_tao_replace (
+                Dynamic::_tc_Parameter,
+                1,
+                ACE_static_cast (void *, tmp),
+                Dynamic::Parameter::_tao_any_destructor
+              );
+            
+            _tao_elem = tmp;
+            return 1;
+          }
+        else
+          {
+            delete tmp;
+          }
       }
-    }
   }
   ACE_CATCHANY
   {
   }
   ACE_ENDTRY;
+  
   return 0;
 }
 
+
+// TAO_IDL - Generated from 
+// be/be_visitor_sequence/any_op_cs.cpp:61
+
+// Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
     const Dynamic::ParameterList &_tao_elem
-  ) // copying
+  )
 {
   TAO_OutputCDR stream;
+  
   if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        Dynamic::_tc_ParameterList,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
+    {
+      _tao_any._tao_replace (
+          Dynamic::_tc_ParameterList,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin ()
+        );
+    }
 }
 
-void operator<<= (CORBA::Any &_tao_any, Dynamic::ParameterList *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    Dynamic::ParameterList *_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      Dynamic::_tc_ParameterList,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      Dynamic::ParameterList::_tao_any_destructor
-    );
+  
+  if (stream << *_tao_elem)
+    {
+      _tao_any._tao_replace (
+          Dynamic::_tc_ParameterList,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          _tao_elem,
+          Dynamic::ParameterList::_tao_any_destructor
+        );
+    }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Dynamic::ParameterList *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    Dynamic::ParameterList *&_tao_elem
+  )
 {
   return _tao_any >>= ACE_const_cast(
       const Dynamic::ParameterList*&,
@@ -742,90 +812,127 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Dynamic::ParameterList *
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Dynamic::ParameterList *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const Dynamic::ParameterList *&_tao_elem
+  )
 {
   _tao_elem = 0;
+  
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (Dynamic::_tc_ParameterList ACE_ENV_ARG_PARAMETER);
+    
+    CORBA::Boolean result =
+      type->equivalent (
+          Dynamic::_tc_ParameterList
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
-
+    
     if (!result)
-      return 0; // not equivalent
-
+      {
+        return 0; // not equivalent
+      }
+    
     if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const Dynamic::ParameterList*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      Dynamic::ParameterList *tmp;
-      ACE_NEW_RETURN (tmp, Dynamic::ParameterList, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
       {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            Dynamic::_tc_ParameterList,
-            1,
-            ACE_static_cast (void *, tmp),
-            Dynamic::ParameterList::_tao_any_destructor
+        _tao_elem = ACE_static_cast(
+            const Dynamic::ParameterList*,
+            _tao_any.value ()
           );
-        _tao_elem = tmp;
+        
         return 1;
       }
-      else
+    else
       {
-        delete tmp;
+        Dynamic::ParameterList *tmp = 0;
+        ACE_NEW_RETURN (
+            tmp,
+            Dynamic::ParameterList,
+            0
+          );
+        
+        TAO_InputCDR stream (
+            _tao_any._tao_get_cdr (),
+            _tao_any._tao_byte_order ()
+          );
+        
+        if (stream >> *tmp)
+          {
+            ((CORBA::Any *)&_tao_any)->_tao_replace (
+                Dynamic::_tc_ParameterList,
+                1,
+                ACE_static_cast (void *, tmp),
+                Dynamic::ParameterList::_tao_any_destructor
+              );
+            
+            _tao_elem = tmp;
+            return 1;
+          }
+        else
+          {
+            delete tmp;
+          }
       }
-    }
   }
   ACE_CATCHANY
   {
   }
   ACE_ENDTRY;
+  
   return 0;
 }
 
+
+// TAO_IDL - Generated from 
+// be/be_visitor_sequence/any_op_cs.cpp:61
+
+// Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
     const Dynamic::ExceptionList &_tao_elem
-  ) // copying
+  )
 {
   TAO_OutputCDR stream;
+  
   if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        Dynamic::_tc_ExceptionList,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
+    {
+      _tao_any._tao_replace (
+          Dynamic::_tc_ExceptionList,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin ()
+        );
+    }
 }
 
-void operator<<= (CORBA::Any &_tao_any, Dynamic::ExceptionList *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    Dynamic::ExceptionList *_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      Dynamic::_tc_ExceptionList,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      Dynamic::ExceptionList::_tao_any_destructor
-    );
+  
+  if (stream << *_tao_elem)
+    {
+      _tao_any._tao_replace (
+          Dynamic::_tc_ExceptionList,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          _tao_elem,
+          Dynamic::ExceptionList::_tao_any_destructor
+        );
+    }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Dynamic::ExceptionList *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    Dynamic::ExceptionList *&_tao_elem
+  )
 {
   return _tao_any >>= ACE_const_cast(
       const Dynamic::ExceptionList*&,
@@ -833,56 +940,76 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Dynamic::ExceptionList *
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Dynamic::ExceptionList *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const Dynamic::ExceptionList *&_tao_elem
+  )
 {
   _tao_elem = 0;
+  
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (Dynamic::_tc_ExceptionList ACE_ENV_ARG_PARAMETER);
+    
+    CORBA::Boolean result =
+      type->equivalent (
+          Dynamic::_tc_ExceptionList
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
-
+    
     if (!result)
-      return 0; // not equivalent
-
+      {
+        return 0; // not equivalent
+      }
+    
     if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const Dynamic::ExceptionList*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      Dynamic::ExceptionList *tmp;
-      ACE_NEW_RETURN (tmp, Dynamic::ExceptionList, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
       {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            Dynamic::_tc_ExceptionList,
-            1,
-            ACE_static_cast (void *, tmp),
-            Dynamic::ExceptionList::_tao_any_destructor
+        _tao_elem = ACE_static_cast(
+            const Dynamic::ExceptionList*,
+            _tao_any.value ()
           );
-        _tao_elem = tmp;
+        
         return 1;
       }
-      else
+    else
       {
-        delete tmp;
+        Dynamic::ExceptionList *tmp = 0;
+        ACE_NEW_RETURN (
+            tmp,
+            Dynamic::ExceptionList,
+            0
+          );
+        
+        TAO_InputCDR stream (
+            _tao_any._tao_get_cdr (),
+            _tao_any._tao_byte_order ()
+          );
+        
+        if (stream >> *tmp)
+          {
+            ((CORBA::Any *)&_tao_any)->_tao_replace (
+                Dynamic::_tc_ExceptionList,
+                1,
+                ACE_static_cast (void *, tmp),
+                Dynamic::ExceptionList::_tao_any_destructor
+              );
+            
+            _tao_elem = tmp;
+            return 1;
+          }
+        else
+          {
+            delete tmp;
+          }
       }
-    }
   }
   ACE_CATCHANY
   {
   }
   ACE_ENDTRY;
+  
   return 0;
 }
 
@@ -912,16 +1039,16 @@ CORBA::Boolean operator>> (
   CORBA::ULong _tao_seq_len;
   if (strm >> _tao_seq_len)
   {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // 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.)
+    // of the stream. (See bug 1159.)
     if (_tao_seq_len > strm.length())
       return 0;
+    // set the length of the sequence
+    _tao_sequence.length (_tao_seq_len);
+    // If length is 0 we return true.
+    if (0 >= _tao_seq_len) 
+      return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
@@ -959,16 +1086,16 @@ CORBA::Boolean operator>> (
   CORBA::ULong _tao_seq_len;
   if (strm >> _tao_seq_len)
   {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // 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.)
+    // of the stream. (See bug 1159.)
     if (_tao_seq_len > strm.length())
       return 0;
+    // set the length of the sequence
+    _tao_sequence.length (_tao_seq_len);
+    // If length is 0 we return true.
+    if (0 >= _tao_seq_len) 
+      return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
@@ -979,3 +1106,4 @@ CORBA::Boolean operator>> (
   }
   return 0; // error
 }
+
diff --git a/TAO/tao/DynamicC.h b/TAO/tao/DynamicC.h
index 42dc58147ed..3eb653d8af6 100644
--- a/TAO/tao/DynamicC.h
+++ b/TAO/tao/DynamicC.h
@@ -23,13 +23,13 @@
 #define _TAO_IDL_DYNAMICC_H_
 
 #include "ace/pre.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/Any.h"
 #include "tao/Sequence.h"
 
@@ -60,49 +60,51 @@ TAO_NAMESPACE  Dynamic
 {
   struct Parameter;
   class Parameter_var;
-
+  
   struct TAO_Export Parameter
   {
-
+    
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef Parameter_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     static void _tao_any_destructor (void*);
-
+    
     CORBA::Any argument;
     CORBA::ParameterMode mode;
+    
   };
-
+  
   class TAO_Export Parameter_var
   {
   public:
-    Parameter_var (void); // default constructor
+    Parameter_var (void);
     Parameter_var (Parameter *);
-    Parameter_var (const Parameter_var &); // copy constructor
-    ~Parameter_var (void); // destructor
-
+    Parameter_var (const Parameter_var &);
+    ~Parameter_var (void);
+    
     Parameter_var &operator= (Parameter *);
     Parameter_var &operator= (const Parameter_var &);
     Parameter *operator-> (void);
     const Parameter *operator-> (void) const;
-
+    
     operator const Parameter &() const;
     operator Parameter &();
     operator Parameter &() const;
-    operator Parameter *&(); // variable-size types only
-
-    // in, inout, out, _retn
+    // Variable-size types only.
+    operator Parameter *&();
+    
+    // in, inout, out, _retn 
     const Parameter &in (void) const;
     Parameter &inout (void);
     Parameter *&out (void);
     Parameter *_retn (void);
     Parameter *ptr (void) const;
-
+  
   private:
     Parameter *ptr_;
   };
-
+  
   class TAO_Export Parameter_out
   {
   public:
@@ -114,143 +116,154 @@ TAO_NAMESPACE  Dynamic
     operator Parameter *&();
     Parameter *&ptr (void);
     Parameter *operator-> (void);
-
+    
   private:
     Parameter *&ptr_;
-    // assignment from T_var not allowed
+    // Assignment from T_var not allowed.
     void operator= (const Parameter_var &);
   };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Parameter;
-
-
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Parameter;
+  
+  
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+  
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMIC_PARAMETERLIST_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_DYNAMIC_PARAMETERLIST_CH_
-
-    class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_Dynamic_ParameterList : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-
-      _TAO_Unbounded_Sequence_Dynamic_ParameterList (void); // Default constructor.
-      _TAO_Unbounded_Sequence_Dynamic_ParameterList (CORBA::ULong maximum);
-      _TAO_Unbounded_Sequence_Dynamic_ParameterList (CORBA::ULong maximum,
+  
+  class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_Dynamic_ParameterList
+    : public TAO_Unbounded_Base_Sequence
+  {
+  public:
+    // = Initialization and termination methods.
+    _TAO_Unbounded_Sequence_Dynamic_ParameterList (void);
+    _TAO_Unbounded_Sequence_Dynamic_ParameterList (CORBA::ULong maximum); 
+    _TAO_Unbounded_Sequence_Dynamic_ParameterList (
+        CORBA::ULong maximum,
         CORBA::ULong length,
         Parameter *data,
-        CORBA::Boolean release = 0);
-      _TAO_Unbounded_Sequence_Dynamic_ParameterList (const _TAO_Unbounded_Sequence_Dynamic_ParameterList &rhs);
-      _TAO_Unbounded_Sequence_Dynamic_ParameterList &operator= (const _TAO_Unbounded_Sequence_Dynamic_ParameterList &rhs);
-      virtual ~_TAO_Unbounded_Sequence_Dynamic_ParameterList (void); // Dtor.
-      // = Accessors.
-      Parameter &operator[] (CORBA::ULong i);
-      const Parameter &operator[] (CORBA::ULong i) const;
-      // = Static operations.
-      static Parameter *allocbuf (CORBA::ULong size);
-      static void freebuf (Parameter *buffer);
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      // Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-      Parameter *get_buffer (CORBA::Boolean orphan = 0);
-      const Parameter *get_buffer (void) const;
-      void replace (CORBA::ULong max,
+        CORBA::Boolean release = 0
+      );
+    _TAO_Unbounded_Sequence_Dynamic_ParameterList (
+        const _TAO_Unbounded_Sequence_Dynamic_ParameterList &rhs
+      );
+    _TAO_Unbounded_Sequence_Dynamic_ParameterList &operator= (
+        const _TAO_Unbounded_Sequence_Dynamic_ParameterList &rhs
+      );
+    virtual ~_TAO_Unbounded_Sequence_Dynamic_ParameterList (void);
+    
+    // = Accessors.
+    Parameter &operator[] (CORBA::ULong i);
+    const Parameter &operator[] (CORBA::ULong i) const;
+    
+    // = Static operations.
+    static Parameter *allocbuf (CORBA::ULong size);
+    static void freebuf (Parameter *buffer);
+    
+    // Implement the TAO_Base_Sequence methods (see Sequence.h)
+    virtual void _allocate_buffer (CORBA::ULong length);
+    virtual void _deallocate_buffer (void);
+    Parameter *get_buffer (CORBA::Boolean orphan = 0);
+    const Parameter *get_buffer (void) const;
+    void replace (
+        CORBA::ULong max,
         CORBA::ULong length,
         Parameter *data,
-        CORBA::Boolean release);
-    };
-
+        CORBA::Boolean release
+      );
+  };
+  
 #endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+  
+  
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  
 #if !defined (_DYNAMIC_PARAMETERLIST_CH_)
 #define _DYNAMIC_PARAMETERLIST_CH_
-
+  
   class ParameterList;
   class ParameterList_var;
-
+  
   // *************************************************************
   // ParameterList
   // *************************************************************
-
-  class TAO_Export ParameterList : public
+  
+  class TAO_Export ParameterList : public 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Sequence_Dynamic_ParameterList
+  _TAO_Unbounded_Sequence_Dynamic_ParameterList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Sequence<Parameter>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Sequence<Parameter>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     ParameterList (void); // default ctor
     ParameterList (CORBA::ULong max); // uses max size
     ParameterList (
-      CORBA::ULong max,
-      CORBA::ULong length,
-      Parameter *buffer,
-      CORBA::Boolean release = 0
-    );
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        Parameter *buffer, 
+        CORBA::Boolean release = 0
+      );
     ParameterList (const ParameterList &); // copy ctor
     ~ParameterList (void);
     static void _tao_any_destructor (void*);
-
+    
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ParameterList_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-
+    
+    
   };
-
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_DYNAMIC_PARAMETERLIST___VAR_CH_)
 #define _DYNAMIC_PARAMETERLIST___VAR_CH_
-
+  
   // *************************************************************
   // class Dynamic::ParameterList_var
   // *************************************************************
-
+  
   class TAO_Export ParameterList_var
   {
   public:
-    ParameterList_var (void); // default constructor
+    ParameterList_var (void);
     ParameterList_var (ParameterList *);
-    ParameterList_var (const ParameterList_var &); // copy constructor
-    ~ParameterList_var (void); // destructor
-
+    ParameterList_var (const ParameterList_var &);
+    ~ParameterList_var (void);
+    
     ParameterList_var &operator= (ParameterList *);
     ParameterList_var &operator= (const ParameterList_var &);
     ParameterList *operator-> (void);
     const ParameterList *operator-> (void) const;
-
+    
     operator const ParameterList &() const;
     operator ParameterList &();
     operator ParameterList &() const;
     operator ParameterList *&(); // variable-size base types only
-
+    
     Parameter & operator[] (CORBA::ULong index);
     const Parameter & operator[] (CORBA::ULong index) const;
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const ParameterList &in (void) const;
     ParameterList &inout (void);
     ParameterList *&out (void);
     ParameterList *_retn (void);
     ParameterList *ptr (void) const;
-
+  
   private:
     ParameterList *ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_DYNAMIC_PARAMETERLIST___OUT_CH_)
 #define _DYNAMIC_PARAMETERLIST___OUT_CH_
-
+  
   class TAO_Export ParameterList_out
   {
   public:
@@ -263,150 +276,166 @@ TAO_NAMESPACE  Dynamic
     ParameterList *&ptr (void);
     ParameterList *operator-> (void);
     Parameter & operator[] (CORBA::ULong index);
-
+  
   private:
     ParameterList *&ptr_;
-    // assignment from T_var not allowed
+    // Assignment from T_var not allowed.
     void operator= (const ParameterList_var &);
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ParameterList;
-
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ParameterList;
+  
   typedef CORBA::StringSeq ContextList;
   typedef CORBA::StringSeq_var ContextList_var;
   typedef CORBA::StringSeq_out ContextList_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ContextList;
-
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ContextList;
+  
   typedef CORBA::TypeCode TypeCode;
   typedef CORBA::TypeCode_ptr TypeCode_ptr;
   typedef CORBA::TypeCode_var TypeCode_var;
   typedef CORBA::TypeCode_out TypeCode_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TypeCode;
-
-
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TypeCode;
+  
+  
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+  
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMIC_EXCEPTIONLIST_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMIC_EXCEPTIONLIST_CH_
-
-    class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-
-      _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (void);
-      _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (CORBA::ULong maximum);
-      _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (CORBA::ULong maximum,
+  
+  class TAO_EXPORT_MACRO _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList
+    : public TAO_Unbounded_Base_Sequence
+  {
+  public:
+    // = Initialization and termination methods.
+    _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (void);
+    _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (CORBA::ULong maximum);
+    _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (
+        CORBA::ULong maximum,
         CORBA::ULong length,
         CORBA::TypeCode* *value,
-        CORBA::Boolean release = 0);
-      _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList(const _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList &rhs);
-      virtual ~_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (void);
-      _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList &operator= (const _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList &rhs);
-      TAO_Pseudo_Object_Manager<Dynamic::TypeCode,Dynamic::TypeCode_var> operator[] (CORBA::ULong index) const;
-      static CORBA::TypeCode **allocbuf (CORBA::ULong nelems);
-      static void freebuf (CORBA::TypeCode **buffer);
-      // The Base_Sequence functions, please see tao/Sequence.h
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      CORBA::TypeCode* *get_buffer (CORBA::Boolean orphan = 0);
-      const CORBA::TypeCode* *get_buffer (void) const;
-      virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-
-    };
-
+        CORBA::Boolean release = 0
+      );
+    _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (
+        const _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList &rhs
+      );
+    _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList &operator= (
+        const _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList &rhs
+      );
+    virtual ~_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (void);
+    
+    // = Accessors.
+    TAO_Pseudo_Object_Manager<Dynamic::TypeCode,Dynamic::TypeCode_var> operator[] (CORBA::ULong index) const;
+    
+    // = Static operations.
+    static CORBA::TypeCode **allocbuf (CORBA::ULong nelems);
+    static void freebuf (CORBA::TypeCode **buffer);
+    
+    // Implement the TAO_Base_Sequence methods (see Sequence.h)
+    virtual void _allocate_buffer (CORBA::ULong length);
+    virtual void _deallocate_buffer (void);
+    CORBA::TypeCode* *get_buffer (CORBA::Boolean orphan = 0);
+    const CORBA::TypeCode* *get_buffer (void) const;
+    virtual void _shrink_buffer (
+        CORBA::ULong nl,
+        CORBA::ULong ol
+      );
+    
+    
+  };
+  
 #endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+  
+  
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  
 #if !defined (_DYNAMIC_EXCEPTIONLIST_CH_)
 #define _DYNAMIC_EXCEPTIONLIST_CH_
-
+  
   class ExceptionList;
   class ExceptionList_var;
-
+  
   // *************************************************************
   // ExceptionList
   // *************************************************************
-
-  class TAO_Export ExceptionList : public
+  
+  class TAO_Export ExceptionList : public 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList
+  _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 */
+  TAO_Unbounded_Pseudo_Sequence<CORBA::TypeCode,CORBA::TypeCode_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     ExceptionList (void); // default ctor
     ExceptionList (CORBA::ULong max); // uses max size
     ExceptionList (
-      CORBA::ULong max,
-      CORBA::ULong length,
-      CORBA::TypeCode_ptr *buffer,
-      CORBA::Boolean release = 0
-    );
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        CORBA::TypeCode_ptr *buffer, 
+        CORBA::Boolean release = 0
+      );
     ExceptionList (const ExceptionList &); // copy ctor
     ~ExceptionList (void);
     static void _tao_any_destructor (void*);
-
+    
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ExceptionList_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-
+    
+    
   };
-
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_DYNAMIC_EXCEPTIONLIST___VAR_CH_)
 #define _DYNAMIC_EXCEPTIONLIST___VAR_CH_
-
+  
   // *************************************************************
   // class Dynamic::ExceptionList_var
   // *************************************************************
-
+  
   class TAO_Export ExceptionList_var
   {
   public:
-    ExceptionList_var (void); // default constructor
+    ExceptionList_var (void);
     ExceptionList_var (ExceptionList *);
-    ExceptionList_var (const ExceptionList_var &); // copy constructor
-    ~ExceptionList_var (void); // destructor
-
+    ExceptionList_var (const ExceptionList_var &);
+    ~ExceptionList_var (void);
+    
     ExceptionList_var &operator= (ExceptionList *);
     ExceptionList_var &operator= (const ExceptionList_var &);
     ExceptionList *operator-> (void);
     const ExceptionList *operator-> (void) const;
-
+    
     operator const ExceptionList &() const;
     operator ExceptionList &();
     operator ExceptionList &() const;
     operator ExceptionList *&(); // variable-size base types only
-
+    
     TAO_Pseudo_Object_Manager<TypeCode,TypeCode_var> operator[] (CORBA::ULong index);
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const ExceptionList &in (void) const;
     ExceptionList &inout (void);
     ExceptionList *&out (void);
     ExceptionList *_retn (void);
     ExceptionList *ptr (void) const;
-
+  
   private:
     ExceptionList *ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_DYNAMIC_EXCEPTIONLIST___OUT_CH_)
 #define _DYNAMIC_EXCEPTIONLIST___OUT_CH_
-
+  
   class TAO_Export ExceptionList_out
   {
   public:
@@ -419,24 +448,24 @@ TAO_NAMESPACE  Dynamic
     ExceptionList *&ptr (void);
     ExceptionList *operator-> (void);
     TAO_Pseudo_Object_Manager<TypeCode,TypeCode_var> operator[] (CORBA::ULong index);
-
+  
   private:
     ExceptionList *&ptr_;
-    // assignment from T_var not allowed
+    // Assignment from T_var not allowed.
     void operator= (const ExceptionList_var &);
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ExceptionList;
-
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExceptionList;
+  
   typedef CORBA::StringSeq RequestContext;
   typedef CORBA::StringSeq_var RequestContext_var;
   typedef CORBA::StringSeq_out RequestContext_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RequestContext;
-
-
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestContext;
+  
+  
 }
 TAO_NAMESPACE_CLOSE // module Dynamic
 
diff --git a/TAO/tao/DynamicC.i b/TAO/tao/DynamicC.i
index b45699ab5bb..97f72630d14 100644
--- a/TAO/tao/DynamicC.i
+++ b/TAO/tao/DynamicC.i
@@ -70,7 +70,7 @@ Dynamic::Parameter_var::operator= (const ::Dynamic::Parameter_var &p)
         {
           Parameter *deep_copy =
             new Parameter (*p.ptr_);
-
+          
           if (deep_copy != 0)
             {
               Parameter *tmp = deep_copy;
@@ -80,7 +80,7 @@ Dynamic::Parameter_var::operator= (const ::Dynamic::Parameter_var &p)
             }
         }
     }
-
+  
   return *this;
 }
 
@@ -103,20 +103,20 @@ Dynamic::Parameter_var::operator const ::Dynamic::Parameter &() const // cast
 }
 
 ACE_INLINE
-Dynamic::Parameter_var::operator ::Dynamic::Parameter &() // cast
+Dynamic::Parameter_var::operator ::Dynamic::Parameter &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-Dynamic::Parameter_var::operator ::Dynamic::Parameter &() const // cast
+Dynamic::Parameter_var::operator ::Dynamic::Parameter &() const // cast 
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-Dynamic::Parameter_var::operator ::Dynamic::Parameter *&() // cast
+Dynamic::Parameter_var::operator ::Dynamic::Parameter *&() // cast 
 {
   return this->ptr_;
 }
@@ -133,7 +133,7 @@ Dynamic::Parameter_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size
+// mapping for variable size 
 ACE_INLINE ::Dynamic::Parameter *&
 Dynamic::Parameter_var::out (void)
 {
@@ -194,7 +194,7 @@ Dynamic::Parameter_out::operator= (Parameter *p)
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 Dynamic::Parameter_out::operator ::Dynamic::Parameter *&() // cast
 {
   return this->ptr_;
@@ -218,176 +218,176 @@ Dynamic::Parameter_out::operator-> (void)
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMIC_PARAMETERLIST_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_DYNAMIC_PARAMETERLIST_CI_
 
-  // = Static operations.
-  ACE_INLINE Dynamic::Parameter *
-  Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (CORBA::ULong size)
-  // Allocate storage for the sequence.
-  {
-    Dynamic::Parameter *retval = 0;
-    ACE_NEW_RETURN (retval, Dynamic::Parameter[size], 0);
-    return retval;
-  }
-
-  ACE_INLINE void Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::freebuf (Dynamic::Parameter *buffer)
-  // Free the sequence.
-  {
-    delete [] buffer;
-  }
-
-  ACE_INLINE
-  Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::_TAO_Unbounded_Sequence_Dynamic_ParameterList (void) // Default constructor.
-  {
-  }
-
-  ACE_INLINE
-  Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::_TAO_Unbounded_Sequence_Dynamic_ParameterList (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (maximum))
-  {
-  }
+// = Static operations.
+ACE_INLINE Dynamic::Parameter *
+Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (CORBA::ULong size)
+// Allocate storage for the sequence.
+{
+  Dynamic::Parameter *retval = 0;
+  ACE_NEW_RETURN (retval, Dynamic::Parameter[size], 0);
+  return retval;
+}
 
-  ACE_INLINE
-  Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::_TAO_Unbounded_Sequence_Dynamic_ParameterList (CORBA::ULong maximum,
-    CORBA::ULong length,
-    Dynamic::Parameter *data,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-  {
-  }
+ACE_INLINE void Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::freebuf (Dynamic::Parameter *buffer)
+// Free the sequence.
+{
+  delete [] buffer;
+}
 
-  ACE_INLINE
-  Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::_TAO_Unbounded_Sequence_Dynamic_ParameterList (const _TAO_Unbounded_Sequence_Dynamic_ParameterList &rhs)
-  // Copy constructor.
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    if (rhs.buffer_ != 0)
-    {
-      Dynamic::Parameter *tmp1 = _TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (this->maximum_);
-      Dynamic::Parameter * const tmp2 = ACE_reinterpret_cast (Dynamic::Parameter * ACE_CAST_CONST, rhs.buffer_);
+ACE_INLINE
+Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::_TAO_Unbounded_Sequence_Dynamic_ParameterList (void) // Default constructor.
+{
+}
 
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp1[i] = tmp2[i];
+ACE_INLINE
+Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::_TAO_Unbounded_Sequence_Dynamic_ParameterList (CORBA::ULong maximum) // Constructor using a maximum length value.
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (maximum))
+{
+}
 
-      this->buffer_ = tmp1;
-    }
-    else
-    {
-      this->buffer_ = 0;
-    }
-  }
+ACE_INLINE
+Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::_TAO_Unbounded_Sequence_Dynamic_ParameterList (CORBA::ULong maximum,
+  CORBA::ULong length,
+  Dynamic::Parameter *data,
+  CORBA::Boolean release)
+: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+{
+}
 
-  ACE_INLINE Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList &
-  Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::operator= (const _TAO_Unbounded_Sequence_Dynamic_ParameterList &rhs)
-  // Assignment operator.
+ACE_INLINE
+Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::_TAO_Unbounded_Sequence_Dynamic_ParameterList (const _TAO_Unbounded_Sequence_Dynamic_ParameterList &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
-        Dynamic::Parameter *tmp = ACE_reinterpret_cast (Dynamic::Parameter *, this->buffer_);
-        _TAO_Unbounded_Sequence_Dynamic_ParameterList::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = _TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (rhs.maximum_);
-
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-
-    Dynamic::Parameter *tmp1 = ACE_reinterpret_cast (Dynamic::Parameter *, this->buffer_);
+    Dynamic::Parameter *tmp1 = _TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (this->maximum_);
     Dynamic::Parameter * const tmp2 = ACE_reinterpret_cast (Dynamic::Parameter * 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 Dynamic::Parameter &
-  Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::operator[] (CORBA::ULong i)
-  // operator []
+  else
   {
-    ACE_ASSERT (i < this->maximum_);
-    Dynamic::Parameter* tmp = ACE_reinterpret_cast(Dynamic::Parameter*,this->buffer_);
-    return tmp[i];
+    this->buffer_ = 0;
   }
+}
 
-  ACE_INLINE const Dynamic::Parameter &
-  Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::operator[] (CORBA::ULong i) const
-  // operator []
+ACE_INLINE Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList &
+Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::operator= (const _TAO_Unbounded_Sequence_Dynamic_ParameterList &rhs)
+// Assignment operator.
+{
+  if (this == &rhs)
+    return *this;
+  
+  if (this->release_)
   {
-    ACE_ASSERT (i < this->maximum_);
-    Dynamic::Parameter * const tmp = ACE_reinterpret_cast (Dynamic::Parameter* ACE_CAST_CONST, this->buffer_);
-    return tmp[i];
+    if (this->maximum_ < rhs.maximum_)
+    {
+      // free the old buffer
+      Dynamic::Parameter *tmp = ACE_reinterpret_cast (Dynamic::Parameter *, this->buffer_);
+      _TAO_Unbounded_Sequence_Dynamic_ParameterList::freebuf (tmp);
+      this->buffer_ = _TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (rhs.maximum_);
+    }
   }
+  else
+    this->buffer_ = _TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (rhs.maximum_);
+  
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  Dynamic::Parameter *tmp1 = ACE_reinterpret_cast (Dynamic::Parameter *, this->buffer_);
+  Dynamic::Parameter * const tmp2 = ACE_reinterpret_cast (Dynamic::Parameter * ACE_CAST_CONST, rhs.buffer_);
+  
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    tmp1[i] = tmp2[i];
+  
+  return *this;
+}
 
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
+// = Accessors.
+ACE_INLINE Dynamic::Parameter &
+Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::operator[] (CORBA::ULong i)
+// operator []
+{
+  ACE_ASSERT (i < this->maximum_);
+  Dynamic::Parameter* tmp = ACE_reinterpret_cast(Dynamic::Parameter*,this->buffer_);
+  return tmp[i];
+}
 
-  ACE_INLINE Dynamic::Parameter *
-  Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::get_buffer (CORBA::Boolean orphan)
+ACE_INLINE const Dynamic::Parameter &
+Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::operator[] (CORBA::ULong i) const
+// operator []
+{
+  ACE_ASSERT (i < this->maximum_);
+  Dynamic::Parameter * const tmp = ACE_reinterpret_cast (Dynamic::Parameter* ACE_CAST_CONST, this->buffer_);
+  return tmp[i];
+}
+
+// Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+ACE_INLINE Dynamic::Parameter *
+Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::get_buffer (CORBA::Boolean orphan)
+{
+  Dynamic::Parameter *result = 0;
+  if (orphan == 0)
   {
-    Dynamic::Parameter *result = 0;
-    if (orphan == 0)
+    // We retain ownership.
+    if (this->buffer_ == 0)
     {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (this->length_);
-        this->buffer_ = result;
-        this->release_ = 1;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (Dynamic::Parameter*, this->buffer_);
-      }
+      result = _TAO_Unbounded_Sequence_Dynamic_ParameterList::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(Dynamic::Parameter*,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
+      result = ACE_reinterpret_cast (Dynamic::Parameter*, this->buffer_);
     }
-    return result;
   }
-
-  ACE_INLINE const Dynamic::Parameter *
-  Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::get_buffer (void) const
+  else // if (orphan == 1)
   {
-    return ACE_reinterpret_cast(const Dynamic::Parameter * ACE_CAST_CONST, this->buffer_);
+    if (this->release_ != 0)
+    {
+      // We set the state back to default and relinquish
+      // ownership.
+      result = ACE_reinterpret_cast(Dynamic::Parameter*,this->buffer_);
+      this->maximum_ = 0;
+      this->length_ = 0;
+      this->buffer_ = 0;
+      this->release_ = 0;
+    }
   }
+  return result;
+}
 
-  ACE_INLINE void
-  Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::replace (CORBA::ULong max,
-  CORBA::ULong length,
-  Dynamic::Parameter *data,
-  CORBA::Boolean release)
+ACE_INLINE const Dynamic::Parameter *
+Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::get_buffer (void) const
+{
+  return ACE_reinterpret_cast(const Dynamic::Parameter * ACE_CAST_CONST, this->buffer_);
+}
+
+ACE_INLINE void
+Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::replace (CORBA::ULong max,
+CORBA::ULong length,
+Dynamic::Parameter *data,
+CORBA::Boolean release)
+{
+  this->maximum_ = max;
+  this->length_ = length;
+  if (this->buffer_ && this->release_ == 1)
   {
-    this->maximum_ = max;
-    this->length_ = length;
-    if (this->buffer_ && this->release_ == 1)
-    {
-      Dynamic::Parameter *tmp = ACE_reinterpret_cast(Dynamic::Parameter*,this->buffer_);
-      _TAO_Unbounded_Sequence_Dynamic_ParameterList::freebuf (tmp);
-    }
-    this->buffer_ = data;
-    this->release_ = release;
+    Dynamic::Parameter *tmp = ACE_reinterpret_cast(Dynamic::Parameter*,this->buffer_);
+    _TAO_Unbounded_Sequence_Dynamic_ParameterList::freebuf (tmp);
   }
+  this->buffer_ = data;
+  this->release_ = release;
+}
 
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_DYNAMIC_PARAMETERLIST_CI_)
 #define _DYNAMIC_PARAMETERLIST_CI_
@@ -443,7 +443,7 @@ Dynamic::ParameterList_var::operator= (const ::Dynamic::ParameterList_var &p)
         {
           ParameterList *deep_copy =
             new ParameterList (*p.ptr_);
-
+          
           if (deep_copy != 0)
             {
               ParameterList *tmp = deep_copy;
@@ -453,7 +453,7 @@ Dynamic::ParameterList_var::operator= (const ::Dynamic::ParameterList_var &p)
             }
         }
     }
-
+  
   return *this;
 }
 
@@ -469,27 +469,27 @@ Dynamic::ParameterList_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE
+ACE_INLINE 
 Dynamic::ParameterList_var::operator const ::Dynamic::ParameterList &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE
-Dynamic::ParameterList_var::operator ::Dynamic::ParameterList &() // cast
+ACE_INLINE 
+Dynamic::ParameterList_var::operator ::Dynamic::ParameterList &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE
-Dynamic::ParameterList_var::operator ::Dynamic::ParameterList &() const // cast
+ACE_INLINE 
+Dynamic::ParameterList_var::operator ::Dynamic::ParameterList &() const // cast 
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-Dynamic::ParameterList_var::operator ::Dynamic::ParameterList *&() // cast
+Dynamic::ParameterList_var::operator ::Dynamic::ParameterList *&() // cast 
 {
   return this->ptr_;
 }
@@ -518,7 +518,7 @@ Dynamic::ParameterList_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size
+// mapping for variable size 
 ACE_INLINE ::Dynamic::ParameterList *&
 Dynamic::ParameterList_var::out (void)
 {
@@ -579,7 +579,7 @@ Dynamic::ParameterList_out::operator= (ParameterList *p)
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 Dynamic::ParameterList_out::operator ::Dynamic::ParameterList *&() // cast
 {
   return this->ptr_;
@@ -612,162 +612,162 @@ Dynamic::ParameterList_out::operator[] (CORBA::ULong index)
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMIC_EXCEPTIONLIST_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMIC_EXCEPTIONLIST_CI_
 
-  ACE_INLINE CORBA::TypeCode **
-  Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (CORBA::ULong nelems)
-  {
-    CORBA::TypeCode **buf = 0;
-
-    ACE_NEW_RETURN (buf, CORBA::TypeCode*[nelems], 0);
+ACE_INLINE CORBA::TypeCode **
+Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (CORBA::ULong nelems)
+{
+  CORBA::TypeCode **buf = 0;
+  
+  ACE_NEW_RETURN (buf, CORBA::TypeCode*[nelems], 0);
+  
+  for (CORBA::ULong i = 0; i < nelems; i++)
+    {
+      buf[i] = CORBA::TypeCode::_nil ();
+    }
+  
+  return buf;
+}
 
-    for (CORBA::ULong i = 0; i < nelems; i++)
-      {
-        buf[i] = CORBA::TypeCode::_nil ();
-      }
+ACE_INLINE void 
+Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::freebuf (CORBA::TypeCode **buffer)
+{
+  if (buffer == 0)
+    return;
+  delete[] buffer;
+}
 
-    return buf;
-  }
+ACE_INLINE
+Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (void)
+{
+}
 
-  ACE_INLINE void
-  Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::freebuf (CORBA::TypeCode **buffer)
-  {
-    if (buffer == 0)
-      return;
-    delete[] buffer;
-  }
+ACE_INLINE
+Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (CORBA::ULong maximum)
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (maximum))
+{
+}
 
-  ACE_INLINE
-  Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (void)
-  {
-  }
+ACE_INLINE
+Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (CORBA::ULong maximum,
+  CORBA::ULong length,
+  CORBA::TypeCode* *value,
+  CORBA::Boolean release)
+: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+{
+}
 
-  ACE_INLINE
-  Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (CORBA::ULong maximum)
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (maximum))
+ACE_INLINE
+Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList(const _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList &rhs)
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
   {
+    CORBA::TypeCode **tmp1 = _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (this->maximum_);
+    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]);
+      }
+    
+    this->buffer_ = tmp1;
   }
-
-  ACE_INLINE
-  Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::TypeCode* *value,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+  else
   {
+    this->buffer_ = 0;
   }
+}
 
-  ACE_INLINE
-  Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList(const _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList &rhs)
-    : TAO_Unbounded_Base_Sequence (rhs)
+ACE_INLINE Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList &
+Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::operator= (const _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList &rhs)
+{
+  if (this == &rhs)
+    return *this;
+  
+  if (this->release_)
   {
-    if (rhs.buffer_ != 0)
+    CORBA::TypeCode **tmp = ACE_reinterpret_cast (CORBA::TypeCode **, this->buffer_);
+    
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      CORBA::TypeCode **tmp1 = _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (this->maximum_);
-      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]);
-        }
-
-      this->buffer_ = tmp1;
+      CORBA::release (tmp[i]);
+      tmp[i] = CORBA::TypeCode::_nil ();
     }
-    else
+    if (this->maximum_ < rhs.maximum_)
     {
-      this->buffer_ = 0;
+      _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::freebuf (tmp);
+      this->buffer_ = _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (rhs.maximum_);
     }
   }
-
-  ACE_INLINE Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList &
-  Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::operator= (const _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList &rhs)
-  {
-    if (this == &rhs)
-      return *this;
-
-    if (this->release_)
+  else
+    this->buffer_ = _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (rhs.maximum_);
+  
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  CORBA::TypeCode **tmp1 = ACE_reinterpret_cast (CORBA::TypeCode **, this->buffer_);
+  CORBA::TypeCode ** const tmp2 = ACE_reinterpret_cast (CORBA::TypeCode ** ACE_CAST_CONST, rhs.buffer_);
+  
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
-      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 ();
-      }
-      if (this->maximum_ < rhs.maximum_)
-      {
-        _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (rhs.maximum_);
-      }
+      tmp1[i] = CORBA::TypeCode::_duplicate (tmp2[i]);
     }
-    else
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (rhs.maximum_);
-
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-
-    CORBA::TypeCode **tmp1 = ACE_reinterpret_cast (CORBA::TypeCode **, this->buffer_);
-    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]);
-      }
-
-    return *this;
-  }
+  
+  return *this;
+}
 
-  ACE_INLINE TAO_Pseudo_Object_Manager<Dynamic::TypeCode,Dynamic::TypeCode_var>
-  Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::operator[] (CORBA::ULong index) const
-  // read-write accessor
-  {
-    ACE_ASSERT (index < this->maximum_);
-    CORBA::TypeCode ** const tmp = ACE_reinterpret_cast (CORBA::TypeCode ** ACE_CAST_CONST, this->buffer_);
-    return TAO_Pseudo_Object_Manager<Dynamic::TypeCode,Dynamic::TypeCode_var> (tmp + index, this->release_);
-  }
+ACE_INLINE TAO_Pseudo_Object_Manager<Dynamic::TypeCode,Dynamic::TypeCode_var>
+Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::operator[] (CORBA::ULong index) const
+// read-write accessor
+{
+  ACE_ASSERT (index < this->maximum_);
+  CORBA::TypeCode ** const tmp = ACE_reinterpret_cast (CORBA::TypeCode ** ACE_CAST_CONST, this->buffer_);
+  return TAO_Pseudo_Object_Manager<Dynamic::TypeCode,Dynamic::TypeCode_var> (tmp + index, this->release_);
+}
 
-  ACE_INLINE CORBA::TypeCode* *
-  Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::get_buffer (CORBA::Boolean orphan)
+ACE_INLINE CORBA::TypeCode* *
+Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::get_buffer (CORBA::Boolean orphan)
+{
+  CORBA::TypeCode **result = 0;
+  if (orphan == 0)
   {
-    CORBA::TypeCode **result = 0;
-    if (orphan == 0)
+    // We retain ownership.
+    if (this->buffer_ == 0)
     {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (this->maximum_);
-        this->buffer_ = result;
-        this->release_ = 1;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA::TypeCode**, this->buffer_);
-      }
+      result = _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::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::TypeCode**,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
+      result = ACE_reinterpret_cast (CORBA::TypeCode**, this->buffer_);
     }
-    return result;
   }
-
-  ACE_INLINE const CORBA::TypeCode* *
-  Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::get_buffer (void) const
+  else // if (orphan == 1)
   {
-    return ACE_reinterpret_cast(const CORBA::TypeCode ** ACE_CAST_CONST, this->buffer_);
+    if (this->release_ != 0)
+    {
+      // We set the state back to default and relinquish
+      // ownership.
+      result = ACE_reinterpret_cast(CORBA::TypeCode**,this->buffer_);
+      this->maximum_ = 0;
+      this->length_ = 0;
+      this->buffer_ = 0;
+      this->release_ = 0;
+    }
   }
+  return result;
+}
+
+ACE_INLINE const CORBA::TypeCode* *
+Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::get_buffer (void) const
+{
+  return ACE_reinterpret_cast(const CORBA::TypeCode ** ACE_CAST_CONST, this->buffer_);
+}
 
 
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_DYNAMIC_EXCEPTIONLIST_CI_)
 #define _DYNAMIC_EXCEPTIONLIST_CI_
@@ -823,7 +823,7 @@ Dynamic::ExceptionList_var::operator= (const ::Dynamic::ExceptionList_var &p)
         {
           ExceptionList *deep_copy =
             new ExceptionList (*p.ptr_);
-
+          
           if (deep_copy != 0)
             {
               ExceptionList *tmp = deep_copy;
@@ -833,7 +833,7 @@ Dynamic::ExceptionList_var::operator= (const ::Dynamic::ExceptionList_var &p)
             }
         }
     }
-
+  
   return *this;
 }
 
@@ -849,27 +849,27 @@ Dynamic::ExceptionList_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE
+ACE_INLINE 
 Dynamic::ExceptionList_var::operator const ::Dynamic::ExceptionList &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE
-Dynamic::ExceptionList_var::operator ::Dynamic::ExceptionList &() // cast
+ACE_INLINE 
+Dynamic::ExceptionList_var::operator ::Dynamic::ExceptionList &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE
-Dynamic::ExceptionList_var::operator ::Dynamic::ExceptionList &() const // cast
+ACE_INLINE 
+Dynamic::ExceptionList_var::operator ::Dynamic::ExceptionList &() const // cast 
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-Dynamic::ExceptionList_var::operator ::Dynamic::ExceptionList *&() // cast
+Dynamic::ExceptionList_var::operator ::Dynamic::ExceptionList *&() // cast 
 {
   return this->ptr_;
 }
@@ -892,7 +892,7 @@ Dynamic::ExceptionList_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size
+// mapping for variable size 
 ACE_INLINE ::Dynamic::ExceptionList *&
 Dynamic::ExceptionList_var::out (void)
 {
@@ -953,7 +953,7 @@ Dynamic::ExceptionList_out::operator= (ExceptionList *p)
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 Dynamic::ExceptionList_out::operator ::Dynamic::ExceptionList *&() // cast
 {
   return this->ptr_;
@@ -989,7 +989,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const Dynamic::Parame
     return 1;
   else
     return 0;
-
+  
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Dynamic::Parameter &_tao_aggregate)
@@ -1001,7 +1001,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Dynamic::Parameter &_t
     return 1;
   else
     return 0;
-
+  
 }
 
 
@@ -1033,3 +1033,4 @@ CORBA::Boolean TAO_Export operator>> (
   );
 
 #endif /* _TAO_CDR_OP_Dynamic_ExceptionList_I_ */
+
diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp
index 4036420763e..3a8d2632cd8 100644
--- a/TAO/tao/IOPC.cpp
+++ b/TAO/tao/IOPC.cpp
@@ -1586,6 +1586,10 @@ TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
 TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_GROUP_IIOP, 1413566212U)
 TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from 
+// be/be_visitor_interface/interface_cs.cpp:67
+
 int IOP::Codec::_tao_class_id = 0;
 
 IOP::Codec_ptr
@@ -1819,7 +1823,7 @@ IOP::Codec_out::operator-> (void)
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:209
+// be/be_visitor_interface/interface_cs.cpp:198
 
 IOP::Codec::Codec (void)
 {}
@@ -1827,6 +1831,12 @@ IOP::Codec::Codec (void)
 IOP::Codec::~Codec (void)
 {}
 
+void IOP::Codec::_tao_any_destructor (void *_tao_void_pointer)
+{
+  Codec *tmp = ACE_static_cast (Codec*, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
 IOP::Codec_ptr IOP::Codec::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
@@ -1912,6 +1922,12 @@ IOP::Codec::InvalidTypeForEncoding::operator= (const ::IOP::Codec::InvalidTypeFo
   return *this;
 }
 
+void IOP::Codec::InvalidTypeForEncoding::_tao_any_destructor (void *_tao_void_pointer)
+{
+  InvalidTypeForEncoding *tmp = ACE_static_cast (InvalidTypeForEncoding*, _tao_void_pointer);
+  delete tmp;
+}
+
 IOP::Codec::InvalidTypeForEncoding *
 IOP::Codec::InvalidTypeForEncoding::_downcast (CORBA::Exception *exc)
 {
@@ -1938,7 +1954,7 @@ IOP::Codec::InvalidTypeForEncoding::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      IOP::Codec::InvalidTypeForEncoding (*this),
+      ::IOP::Codec::InvalidTypeForEncoding (*this),
       0
     );
   return result;
@@ -1965,6 +1981,51 @@ void IOP::Codec::InvalidTypeForEncoding::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+static const CORBA::Long _oc_IOP_Codec_InvalidTypeForEncoding[] =
+{
+  TAO_ENCAP_BYTE_ORDER, // byte order
+  49,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x632f496e), 
+  ACE_NTOHL (0x76616c69), 
+  ACE_NTOHL (0x64547970), 
+  ACE_NTOHL (0x65466f72), 
+  ACE_NTOHL (0x456e636f), 
+  ACE_NTOHL (0x64696e67), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0
+  23,
+  ACE_NTOHL (0x496e7661), 
+  ACE_NTOHL (0x6c696454), 
+  ACE_NTOHL (0x79706546), 
+  ACE_NTOHL (0x6f72456e), 
+  ACE_NTOHL (0x636f6469), 
+  ACE_NTOHL (0x6e670000),  // name = InvalidTypeForEncoding
+  0, // member count
+};
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_InvalidTypeForEncoding (
+    CORBA::tk_except,
+    sizeof (_oc_IOP_Codec_InvalidTypeForEncoding),
+    (char *) &_oc_IOP_Codec_InvalidTypeForEncoding,
+    0,
+    sizeof (IOP::Codec::InvalidTypeForEncoding)
+  );
+
+::CORBA::TypeCode_ptr IOP::Codec::_tc_InvalidTypeForEncoding =
+  &_tc_TAO_tc_IOP_Codec_InvalidTypeForEncoding;
+
+
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr IOP::Codec::InvalidTypeForEncoding::_type (void) const
+{
+  return ::IOP::Codec::_tc_InvalidTypeForEncoding;
+}
+
 // Default constructor.
 IOP::Codec::FormatMismatch::FormatMismatch (void)
   : CORBA_UserException ("IDL:omg.org/IOP/Codec/FormatMismatch:1.0")
@@ -1990,6 +2051,12 @@ IOP::Codec::FormatMismatch::operator= (const ::IOP::Codec::FormatMismatch &_tao_
   return *this;
 }
 
+void IOP::Codec::FormatMismatch::_tao_any_destructor (void *_tao_void_pointer)
+{
+  FormatMismatch *tmp = ACE_static_cast (FormatMismatch*, _tao_void_pointer);
+  delete tmp;
+}
+
 IOP::Codec::FormatMismatch *
 IOP::Codec::FormatMismatch::_downcast (CORBA::Exception *exc)
 {
@@ -2016,7 +2083,7 @@ IOP::Codec::FormatMismatch::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      IOP::Codec::FormatMismatch (*this),
+      ::IOP::Codec::FormatMismatch (*this),
       0
     );
   return result;
@@ -2043,6 +2110,47 @@ void IOP::Codec::FormatMismatch::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+static const CORBA::Long _oc_IOP_Codec_FormatMismatch[] =
+{
+  TAO_ENCAP_BYTE_ORDER, // byte order
+  41,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x632f466f), 
+  ACE_NTOHL (0x726d6174), 
+  ACE_NTOHL (0x4d69736d), 
+  ACE_NTOHL (0x61746368), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/Codec/FormatMismatch:1.0
+  15,
+  ACE_NTOHL (0x466f726d), 
+  ACE_NTOHL (0x61744d69), 
+  ACE_NTOHL (0x736d6174), 
+  ACE_NTOHL (0x63680000),  // name = FormatMismatch
+  0, // member count
+};
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_FormatMismatch (
+    CORBA::tk_except,
+    sizeof (_oc_IOP_Codec_FormatMismatch),
+    (char *) &_oc_IOP_Codec_FormatMismatch,
+    0,
+    sizeof (IOP::Codec::FormatMismatch)
+  );
+
+::CORBA::TypeCode_ptr IOP::Codec::_tc_FormatMismatch =
+  &_tc_TAO_tc_IOP_Codec_FormatMismatch;
+
+
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr IOP::Codec::FormatMismatch::_type (void) const
+{
+  return ::IOP::Codec::_tc_FormatMismatch;
+}
+
 // Default constructor.
 IOP::Codec::TypeMismatch::TypeMismatch (void)
   : CORBA_UserException ("IDL:omg.org/IOP/Codec/TypeMismatch:1.0")
@@ -2068,6 +2176,12 @@ IOP::Codec::TypeMismatch::operator= (const ::IOP::Codec::TypeMismatch &_tao_excp
   return *this;
 }
 
+void IOP::Codec::TypeMismatch::_tao_any_destructor (void *_tao_void_pointer)
+{
+  TypeMismatch *tmp = ACE_static_cast (TypeMismatch*, _tao_void_pointer);
+  delete tmp;
+}
+
 IOP::Codec::TypeMismatch *
 IOP::Codec::TypeMismatch::_downcast (CORBA::Exception *exc)
 {
@@ -2094,7 +2208,7 @@ IOP::Codec::TypeMismatch::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      IOP::Codec::TypeMismatch (*this),
+      ::IOP::Codec::TypeMismatch (*this),
       0
     );
   return result;
@@ -2121,6 +2235,75 @@ void IOP::Codec::TypeMismatch::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+static const CORBA::Long _oc_IOP_Codec_TypeMismatch[] =
+{
+  TAO_ENCAP_BYTE_ORDER, // byte order
+  39,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x632f5479), 
+  ACE_NTOHL (0x70654d69), 
+  ACE_NTOHL (0x736d6174), 
+  ACE_NTOHL (0x63683a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/Codec/TypeMismatch:1.0
+  13,
+  ACE_NTOHL (0x54797065), 
+  ACE_NTOHL (0x4d69736d), 
+  ACE_NTOHL (0x61746368), 
+  ACE_NTOHL (0x0),  // name = TypeMismatch
+  0, // member count
+};
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_TypeMismatch (
+    CORBA::tk_except,
+    sizeof (_oc_IOP_Codec_TypeMismatch),
+    (char *) &_oc_IOP_Codec_TypeMismatch,
+    0,
+    sizeof (IOP::Codec::TypeMismatch)
+  );
+
+::CORBA::TypeCode_ptr IOP::Codec::_tc_TypeMismatch =
+  &_tc_TAO_tc_IOP_Codec_TypeMismatch;
+
+
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr IOP::Codec::TypeMismatch::_type (void) const
+{
+  return ::IOP::Codec::_tc_TypeMismatch;
+}
+
+static const CORBA::Long _oc_IOP_Codec[] =
+{
+  TAO_ENCAP_BYTE_ORDER, // byte order
+  26,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x633a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/Codec:1.0
+  6,
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x63000000),  // name = Codec
+};
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_Codec (
+    CORBA::tk_objref,
+    sizeof (_oc_IOP_Codec),
+    (char *) &_oc_IOP_Codec,
+    0,
+    sizeof (IOP::Codec)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (IOP)
+TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_Codec, &_tc_TAO_tc_IOP_Codec)
+TAO_NAMESPACE_END
+
 static const CORBA::Long _oc_IOP_EncodingFormat[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -2236,6 +2419,10 @@ void IOP::Encoding::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
+
+// TAO_IDL - Generated from 
+// be/be_visitor_interface/interface_cs.cpp:67
+
 int IOP::CodecFactory::_tao_class_id = 0;
 
 IOP::CodecFactory_ptr
@@ -2469,7 +2656,7 @@ IOP::CodecFactory_out::operator-> (void)
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:209
+// be/be_visitor_interface/interface_cs.cpp:198
 
 IOP::CodecFactory::CodecFactory (void)
 {}
@@ -2477,6 +2664,12 @@ IOP::CodecFactory::CodecFactory (void)
 IOP::CodecFactory::~CodecFactory (void)
 {}
 
+void IOP::CodecFactory::_tao_any_destructor (void *_tao_void_pointer)
+{
+  CodecFactory *tmp = ACE_static_cast (CodecFactory*, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
 IOP::CodecFactory_ptr IOP::CodecFactory::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
@@ -2562,6 +2755,12 @@ IOP::CodecFactory::UnknownEncoding::operator= (const ::IOP::CodecFactory::Unknow
   return *this;
 }
 
+void IOP::CodecFactory::UnknownEncoding::_tao_any_destructor (void *_tao_void_pointer)
+{
+  UnknownEncoding *tmp = ACE_static_cast (UnknownEncoding*, _tao_void_pointer);
+  delete tmp;
+}
+
 IOP::CodecFactory::UnknownEncoding *
 IOP::CodecFactory::UnknownEncoding::_downcast (CORBA::Exception *exc)
 {
@@ -2588,7 +2787,7 @@ IOP::CodecFactory::UnknownEncoding::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      IOP::CodecFactory::UnknownEncoding (*this),
+      ::IOP::CodecFactory::UnknownEncoding (*this),
       0
     );
   return result;
@@ -2615,286 +2814,514 @@ void IOP::CodecFactory::UnknownEncoding::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-void operator<<= (CORBA::Any &_tao_any, const IOP::TaggedProfile &_tao_elem) // copying
+static const CORBA::Long _oc_IOP_CodecFactory_UnknownEncoding[] =
+{
+  TAO_ENCAP_BYTE_ORDER, // byte order
+  49,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x63466163), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f556e6b), 
+  ACE_NTOHL (0x6e6f776e), 
+  ACE_NTOHL (0x456e636f), 
+  ACE_NTOHL (0x64696e67), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0
+  16,
+  ACE_NTOHL (0x556e6b6e), 
+  ACE_NTOHL (0x6f776e45), 
+  ACE_NTOHL (0x6e636f64), 
+  ACE_NTOHL (0x696e6700),  // name = UnknownEncoding
+  0, // member count
+};
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_CodecFactory_UnknownEncoding (
+    CORBA::tk_except,
+    sizeof (_oc_IOP_CodecFactory_UnknownEncoding),
+    (char *) &_oc_IOP_CodecFactory_UnknownEncoding,
+    0,
+    sizeof (IOP::CodecFactory::UnknownEncoding)
+  );
+
+::CORBA::TypeCode_ptr IOP::CodecFactory::_tc_UnknownEncoding =
+  &_tc_TAO_tc_IOP_CodecFactory_UnknownEncoding;
+
+
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr IOP::CodecFactory::UnknownEncoding::_type (void) const
+{
+  return ::IOP::CodecFactory::_tc_UnknownEncoding;
+}
+
+static const CORBA::Long _oc_IOP_CodecFactory[] =
+{
+  TAO_ENCAP_BYTE_ORDER, // byte order
+  33,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x63466163), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/CodecFactory:1.0
+  13,
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x63466163), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x0),  // name = CodecFactory
+};
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_CodecFactory (
+    CORBA::tk_objref,
+    sizeof (_oc_IOP_CodecFactory),
+    (char *) &_oc_IOP_CodecFactory,
+    0,
+    sizeof (IOP::CodecFactory)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (IOP)
+TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_CodecFactory, &_tc_TAO_tc_IOP_CodecFactory)
+TAO_NAMESPACE_END
+
+
+// TAO_IDL - Generated from 
+// be/be_visitor_structure/any_op_cs.cpp:58
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const IOP::TaggedProfile &_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
-      IOP::_tc_TaggedProfile,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
-    );
+  
+  if (stream << _tao_elem)
+    {
+      _tao_any._tao_replace (
+          IOP::_tc_TaggedProfile,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin ()
+        );
+    }
 }
 
-void operator<<= (CORBA::Any &_tao_any, IOP::TaggedProfile *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    IOP::TaggedProfile *_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      IOP::_tc_TaggedProfile,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      IOP::TaggedProfile::_tao_any_destructor
-    );
+  
+  if (stream << *_tao_elem)
+    {
+      _tao_any._tao_replace (
+          IOP::_tc_TaggedProfile,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          _tao_elem,
+          IOP::TaggedProfile::_tao_any_destructor
+        );
+    }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::TaggedProfile *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    IOP::TaggedProfile *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(const IOP::TaggedProfile*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast (
+      const IOP::TaggedProfile *&,
+      _tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedProfile *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const IOP::TaggedProfile *&_tao_elem
+  )
 {
   _tao_elem = 0;
+  
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     
-    CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedProfile ACE_ENV_ARG_PARAMETER);
+    CORBA::Boolean result =
+      type->equivalent (
+          IOP::_tc_TaggedProfile
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
     
-    if (!result)
-      return 0; // not equivalent
+    if (result == 0)
+      {
+        return 0; // not equivalent
+      }
     
     if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const IOP::TaggedProfile*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      IOP::TaggedProfile *tmp;
-      ACE_NEW_RETURN (tmp, IOP::TaggedProfile, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
       {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IOP::_tc_TaggedProfile,
-            1,
-            ACE_static_cast (void *, tmp),
-            IOP::TaggedProfile::_tao_any_destructor
+        _tao_elem = ACE_static_cast (
+            const IOP::TaggedProfile*,
+            _tao_any.value ()
           );
-        _tao_elem = tmp;
+        
         return 1;
       }
-      else
+    else
       {
-        delete tmp;
+        IOP::TaggedProfile *tmp;
+        ACE_NEW_RETURN (
+            tmp,
+            IOP::TaggedProfile,
+            0
+          );
+        
+        TAO_InputCDR stream (
+            _tao_any._tao_get_cdr (),
+            _tao_any._tao_byte_order ()
+          );
+        
+        if (stream >> *tmp)
+          {
+            ((CORBA::Any *)&_tao_any)->_tao_replace (
+                IOP::_tc_TaggedProfile,
+                1,
+                ACE_static_cast (void *, tmp),
+                IOP::TaggedProfile::_tao_any_destructor
+              );
+            
+            _tao_elem = tmp;
+            return 1;
+          }
+        else
+          {
+            delete tmp;
+          }
       }
-    }
   }
   ACE_CATCHANY
   {
   }
   ACE_ENDTRY;
+  
   return 0;
 }
 
-void operator<<= (CORBA::Any &_tao_any, const IOP::IOR &_tao_elem) // copying
+
+// TAO_IDL - Generated from 
+// be/be_visitor_structure/any_op_cs.cpp:58
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const IOP::IOR &_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
-      IOP::_tc_IOR,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
-    );
+  
+  if (stream << _tao_elem)
+    {
+      _tao_any._tao_replace (
+          IOP::_tc_IOR,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin ()
+        );
+    }
 }
 
-void operator<<= (CORBA::Any &_tao_any, IOP::IOR *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    IOP::IOR *_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      IOP::_tc_IOR,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      IOP::IOR::_tao_any_destructor
-    );
+  
+  if (stream << *_tao_elem)
+    {
+      _tao_any._tao_replace (
+          IOP::_tc_IOR,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          _tao_elem,
+          IOP::IOR::_tao_any_destructor
+        );
+    }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::IOR *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    IOP::IOR *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(const IOP::IOR*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast (
+      const IOP::IOR *&,
+      _tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::IOR *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const IOP::IOR *&_tao_elem
+  )
 {
   _tao_elem = 0;
+  
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     
-    CORBA::Boolean result = type->equivalent (IOP::_tc_IOR ACE_ENV_ARG_PARAMETER);
+    CORBA::Boolean result =
+      type->equivalent (
+          IOP::_tc_IOR
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
     
-    if (!result)
-      return 0; // not equivalent
+    if (result == 0)
+      {
+        return 0; // not equivalent
+      }
     
     if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const IOP::IOR*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      IOP::IOR *tmp;
-      ACE_NEW_RETURN (tmp, IOP::IOR, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
       {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IOP::_tc_IOR,
-            1,
-            ACE_static_cast (void *, tmp),
-            IOP::IOR::_tao_any_destructor
+        _tao_elem = ACE_static_cast (
+            const IOP::IOR*,
+            _tao_any.value ()
           );
-        _tao_elem = tmp;
+        
         return 1;
       }
-      else
+    else
       {
-        delete tmp;
+        IOP::IOR *tmp;
+        ACE_NEW_RETURN (
+            tmp,
+            IOP::IOR,
+            0
+          );
+        
+        TAO_InputCDR stream (
+            _tao_any._tao_get_cdr (),
+            _tao_any._tao_byte_order ()
+          );
+        
+        if (stream >> *tmp)
+          {
+            ((CORBA::Any *)&_tao_any)->_tao_replace (
+                IOP::_tc_IOR,
+                1,
+                ACE_static_cast (void *, tmp),
+                IOP::IOR::_tao_any_destructor
+              );
+            
+            _tao_elem = tmp;
+            return 1;
+          }
+        else
+          {
+            delete tmp;
+          }
       }
-    }
   }
   ACE_CATCHANY
   {
   }
   ACE_ENDTRY;
+  
   return 0;
 }
 
-void operator<<= (CORBA::Any &_tao_any, const IOP::TaggedComponent &_tao_elem) // copying
+
+// TAO_IDL - Generated from 
+// be/be_visitor_structure/any_op_cs.cpp:58
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const IOP::TaggedComponent &_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
-      IOP::_tc_TaggedComponent,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
-    );
+  
+  if (stream << _tao_elem)
+    {
+      _tao_any._tao_replace (
+          IOP::_tc_TaggedComponent,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin ()
+        );
+    }
 }
 
-void operator<<= (CORBA::Any &_tao_any, IOP::TaggedComponent *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    IOP::TaggedComponent *_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      IOP::_tc_TaggedComponent,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      IOP::TaggedComponent::_tao_any_destructor
-    );
+  
+  if (stream << *_tao_elem)
+    {
+      _tao_any._tao_replace (
+          IOP::_tc_TaggedComponent,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          _tao_elem,
+          IOP::TaggedComponent::_tao_any_destructor
+        );
+    }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::TaggedComponent *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    IOP::TaggedComponent *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(const IOP::TaggedComponent*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast (
+      const IOP::TaggedComponent *&,
+      _tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedComponent *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const IOP::TaggedComponent *&_tao_elem
+  )
 {
   _tao_elem = 0;
+  
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     
-    CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponent ACE_ENV_ARG_PARAMETER);
+    CORBA::Boolean result =
+      type->equivalent (
+          IOP::_tc_TaggedComponent
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
     
-    if (!result)
-      return 0; // not equivalent
+    if (result == 0)
+      {
+        return 0; // not equivalent
+      }
     
     if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const IOP::TaggedComponent*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      IOP::TaggedComponent *tmp;
-      ACE_NEW_RETURN (tmp, IOP::TaggedComponent, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
       {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IOP::_tc_TaggedComponent,
-            1,
-            ACE_static_cast (void *, tmp),
-            IOP::TaggedComponent::_tao_any_destructor
+        _tao_elem = ACE_static_cast (
+            const IOP::TaggedComponent*,
+            _tao_any.value ()
           );
-        _tao_elem = tmp;
+        
         return 1;
       }
-      else
+    else
       {
-        delete tmp;
+        IOP::TaggedComponent *tmp;
+        ACE_NEW_RETURN (
+            tmp,
+            IOP::TaggedComponent,
+            0
+          );
+        
+        TAO_InputCDR stream (
+            _tao_any._tao_get_cdr (),
+            _tao_any._tao_byte_order ()
+          );
+        
+        if (stream >> *tmp)
+          {
+            ((CORBA::Any *)&_tao_any)->_tao_replace (
+                IOP::_tc_TaggedComponent,
+                1,
+                ACE_static_cast (void *, tmp),
+                IOP::TaggedComponent::_tao_any_destructor
+              );
+            
+            _tao_elem = tmp;
+            return 1;
+          }
+        else
+          {
+            delete tmp;
+          }
       }
-    }
   }
   ACE_CATCHANY
   {
   }
   ACE_ENDTRY;
+  
   return 0;
 }
 
+
+// TAO_IDL - Generated from 
+// be/be_visitor_sequence/any_op_cs.cpp:61
+
+// Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
     const IOP::MultipleComponentProfile &_tao_elem
-  ) // copying
+  )
 {
   TAO_OutputCDR stream;
+  
   if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        IOP::_tc_MultipleComponentProfile,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
+    {
+      _tao_any._tao_replace (
+          IOP::_tc_MultipleComponentProfile,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin ()
+        );
+    }
 }
 
-void operator<<= (CORBA::Any &_tao_any, IOP::MultipleComponentProfile *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    IOP::MultipleComponentProfile *_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      IOP::_tc_MultipleComponentProfile,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      IOP::MultipleComponentProfile::_tao_any_destructor
-    );
+  
+  if (stream << *_tao_elem)
+    {
+      _tao_any._tao_replace (
+          IOP::_tc_MultipleComponentProfile,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          _tao_elem,
+          IOP::MultipleComponentProfile::_tao_any_destructor
+        );
+    }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::MultipleComponentProfile *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    IOP::MultipleComponentProfile *&_tao_elem
+  )
 {
   return _tao_any >>= ACE_const_cast(
       const IOP::MultipleComponentProfile*&,
@@ -2902,90 +3329,127 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::MultipleComponentPr
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::MultipleComponentProfile *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const IOP::MultipleComponentProfile *&_tao_elem
+  )
 {
   _tao_elem = 0;
+  
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     
-    CORBA::Boolean result = type->equivalent (IOP::_tc_MultipleComponentProfile ACE_ENV_ARG_PARAMETER);
+    CORBA::Boolean result =
+      type->equivalent (
+          IOP::_tc_MultipleComponentProfile
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
     
     if (!result)
-      return 0; // not equivalent
+      {
+        return 0; // not equivalent
+      }
     
     if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const IOP::MultipleComponentProfile*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      IOP::MultipleComponentProfile *tmp;
-      ACE_NEW_RETURN (tmp, IOP::MultipleComponentProfile, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
       {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IOP::_tc_MultipleComponentProfile,
-            1,
-            ACE_static_cast (void *, tmp),
-            IOP::MultipleComponentProfile::_tao_any_destructor
+        _tao_elem = ACE_static_cast(
+            const IOP::MultipleComponentProfile*,
+            _tao_any.value ()
           );
-        _tao_elem = tmp;
+        
         return 1;
       }
-      else
+    else
       {
-        delete tmp;
+        IOP::MultipleComponentProfile *tmp = 0;
+        ACE_NEW_RETURN (
+            tmp,
+            IOP::MultipleComponentProfile,
+            0
+          );
+        
+        TAO_InputCDR stream (
+            _tao_any._tao_get_cdr (),
+            _tao_any._tao_byte_order ()
+          );
+        
+        if (stream >> *tmp)
+          {
+            ((CORBA::Any *)&_tao_any)->_tao_replace (
+                IOP::_tc_MultipleComponentProfile,
+                1,
+                ACE_static_cast (void *, tmp),
+                IOP::MultipleComponentProfile::_tao_any_destructor
+              );
+            
+            _tao_elem = tmp;
+            return 1;
+          }
+        else
+          {
+            delete tmp;
+          }
       }
-    }
   }
   ACE_CATCHANY
   {
   }
   ACE_ENDTRY;
+  
   return 0;
 }
 
+
+// TAO_IDL - Generated from 
+// be/be_visitor_sequence/any_op_cs.cpp:61
+
+// Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
     const IOP::TaggedComponentList &_tao_elem
-  ) // copying
+  )
 {
   TAO_OutputCDR stream;
+  
   if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        IOP::_tc_TaggedComponentList,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
+    {
+      _tao_any._tao_replace (
+          IOP::_tc_TaggedComponentList,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin ()
+        );
+    }
 }
 
-void operator<<= (CORBA::Any &_tao_any, IOP::TaggedComponentList *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    IOP::TaggedComponentList *_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      IOP::_tc_TaggedComponentList,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      IOP::TaggedComponentList::_tao_any_destructor
-    );
+  
+  if (stream << *_tao_elem)
+    {
+      _tao_any._tao_replace (
+          IOP::_tc_TaggedComponentList,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          _tao_elem,
+          IOP::TaggedComponentList::_tao_any_destructor
+        );
+    }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::TaggedComponentList *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    IOP::TaggedComponentList *&_tao_elem
+  )
 {
   return _tao_any >>= ACE_const_cast(
       const IOP::TaggedComponentList*&,
@@ -2993,90 +3457,127 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::TaggedComponentList
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedComponentList *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const IOP::TaggedComponentList *&_tao_elem
+  )
 {
   _tao_elem = 0;
+  
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     
-    CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponentList ACE_ENV_ARG_PARAMETER);
+    CORBA::Boolean result =
+      type->equivalent (
+          IOP::_tc_TaggedComponentList
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
     
     if (!result)
-      return 0; // not equivalent
+      {
+        return 0; // not equivalent
+      }
     
     if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const IOP::TaggedComponentList*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      IOP::TaggedComponentList *tmp;
-      ACE_NEW_RETURN (tmp, IOP::TaggedComponentList, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
       {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IOP::_tc_TaggedComponentList,
-            1,
-            ACE_static_cast (void *, tmp),
-            IOP::TaggedComponentList::_tao_any_destructor
+        _tao_elem = ACE_static_cast(
+            const IOP::TaggedComponentList*,
+            _tao_any.value ()
           );
-        _tao_elem = tmp;
+        
         return 1;
       }
-      else
+    else
       {
-        delete tmp;
+        IOP::TaggedComponentList *tmp = 0;
+        ACE_NEW_RETURN (
+            tmp,
+            IOP::TaggedComponentList,
+            0
+          );
+        
+        TAO_InputCDR stream (
+            _tao_any._tao_get_cdr (),
+            _tao_any._tao_byte_order ()
+          );
+        
+        if (stream >> *tmp)
+          {
+            ((CORBA::Any *)&_tao_any)->_tao_replace (
+                IOP::_tc_TaggedComponentList,
+                1,
+                ACE_static_cast (void *, tmp),
+                IOP::TaggedComponentList::_tao_any_destructor
+              );
+            
+            _tao_elem = tmp;
+            return 1;
+          }
+        else
+          {
+            delete tmp;
+          }
       }
-    }
   }
   ACE_CATCHANY
   {
   }
   ACE_ENDTRY;
+  
   return 0;
 }
 
+
+// TAO_IDL - Generated from 
+// be/be_visitor_sequence/any_op_cs.cpp:61
+
+// Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
     const IOP::TaggedComponentSeq &_tao_elem
-  ) // copying
+  )
 {
   TAO_OutputCDR stream;
+  
   if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        IOP::_tc_TaggedComponentSeq,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
+    {
+      _tao_any._tao_replace (
+          IOP::_tc_TaggedComponentSeq,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin ()
+        );
+    }
 }
 
-void operator<<= (CORBA::Any &_tao_any, IOP::TaggedComponentSeq *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    IOP::TaggedComponentSeq *_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      IOP::_tc_TaggedComponentSeq,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      IOP::TaggedComponentSeq::_tao_any_destructor
-    );
+  
+  if (stream << *_tao_elem)
+    {
+      _tao_any._tao_replace (
+          IOP::_tc_TaggedComponentSeq,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          _tao_elem,
+          IOP::TaggedComponentSeq::_tao_any_destructor
+        );
+    }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::TaggedComponentSeq *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    IOP::TaggedComponentSeq *&_tao_elem
+  )
 {
   return _tao_any >>= ACE_const_cast(
       const IOP::TaggedComponentSeq*&,
@@ -3084,173 +3585,255 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::TaggedComponentSeq
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedComponentSeq *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const IOP::TaggedComponentSeq *&_tao_elem
+  )
 {
   _tao_elem = 0;
+  
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     
-    CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponentSeq ACE_ENV_ARG_PARAMETER);
+    CORBA::Boolean result =
+      type->equivalent (
+          IOP::_tc_TaggedComponentSeq
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
     
     if (!result)
-      return 0; // not equivalent
+      {
+        return 0; // not equivalent
+      }
     
     if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const IOP::TaggedComponentSeq*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      IOP::TaggedComponentSeq *tmp;
-      ACE_NEW_RETURN (tmp, IOP::TaggedComponentSeq, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
       {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IOP::_tc_TaggedComponentSeq,
-            1,
-            ACE_static_cast (void *, tmp),
-            IOP::TaggedComponentSeq::_tao_any_destructor
+        _tao_elem = ACE_static_cast(
+            const IOP::TaggedComponentSeq*,
+            _tao_any.value ()
           );
-        _tao_elem = tmp;
+        
         return 1;
       }
-      else
+    else
       {
-        delete tmp;
+        IOP::TaggedComponentSeq *tmp = 0;
+        ACE_NEW_RETURN (
+            tmp,
+            IOP::TaggedComponentSeq,
+            0
+          );
+        
+        TAO_InputCDR stream (
+            _tao_any._tao_get_cdr (),
+            _tao_any._tao_byte_order ()
+          );
+        
+        if (stream >> *tmp)
+          {
+            ((CORBA::Any *)&_tao_any)->_tao_replace (
+                IOP::_tc_TaggedComponentSeq,
+                1,
+                ACE_static_cast (void *, tmp),
+                IOP::TaggedComponentSeq::_tao_any_destructor
+              );
+            
+            _tao_elem = tmp;
+            return 1;
+          }
+        else
+          {
+            delete tmp;
+          }
       }
-    }
   }
   ACE_CATCHANY
   {
   }
   ACE_ENDTRY;
+  
   return 0;
 }
 
-void operator<<= (CORBA::Any &_tao_any, const IOP::ServiceContext &_tao_elem) // copying
+
+// TAO_IDL - Generated from 
+// be/be_visitor_structure/any_op_cs.cpp:58
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const IOP::ServiceContext &_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
-      IOP::_tc_ServiceContext,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
-    );
+  
+  if (stream << _tao_elem)
+    {
+      _tao_any._tao_replace (
+          IOP::_tc_ServiceContext,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin ()
+        );
+    }
 }
 
-void operator<<= (CORBA::Any &_tao_any, IOP::ServiceContext *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    IOP::ServiceContext *_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      IOP::_tc_ServiceContext,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      IOP::ServiceContext::_tao_any_destructor
-    );
+  
+  if (stream << *_tao_elem)
+    {
+      _tao_any._tao_replace (
+          IOP::_tc_ServiceContext,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          _tao_elem,
+          IOP::ServiceContext::_tao_any_destructor
+        );
+    }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::ServiceContext *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    IOP::ServiceContext *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(const IOP::ServiceContext*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast (
+      const IOP::ServiceContext *&,
+      _tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::ServiceContext *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const IOP::ServiceContext *&_tao_elem
+  )
 {
   _tao_elem = 0;
+  
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     
-    CORBA::Boolean result = type->equivalent (IOP::_tc_ServiceContext ACE_ENV_ARG_PARAMETER);
+    CORBA::Boolean result =
+      type->equivalent (
+          IOP::_tc_ServiceContext
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
     
-    if (!result)
-      return 0; // not equivalent
+    if (result == 0)
+      {
+        return 0; // not equivalent
+      }
     
     if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const IOP::ServiceContext*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      IOP::ServiceContext *tmp;
-      ACE_NEW_RETURN (tmp, IOP::ServiceContext, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
       {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IOP::_tc_ServiceContext,
-            1,
-            ACE_static_cast (void *, tmp),
-            IOP::ServiceContext::_tao_any_destructor
+        _tao_elem = ACE_static_cast (
+            const IOP::ServiceContext*,
+            _tao_any.value ()
           );
-        _tao_elem = tmp;
+        
         return 1;
       }
-      else
+    else
       {
-        delete tmp;
+        IOP::ServiceContext *tmp;
+        ACE_NEW_RETURN (
+            tmp,
+            IOP::ServiceContext,
+            0
+          );
+        
+        TAO_InputCDR stream (
+            _tao_any._tao_get_cdr (),
+            _tao_any._tao_byte_order ()
+          );
+        
+        if (stream >> *tmp)
+          {
+            ((CORBA::Any *)&_tao_any)->_tao_replace (
+                IOP::_tc_ServiceContext,
+                1,
+                ACE_static_cast (void *, tmp),
+                IOP::ServiceContext::_tao_any_destructor
+              );
+            
+            _tao_elem = tmp;
+            return 1;
+          }
+        else
+          {
+            delete tmp;
+          }
       }
-    }
   }
   ACE_CATCHANY
   {
   }
   ACE_ENDTRY;
+  
   return 0;
 }
 
+
+// TAO_IDL - Generated from 
+// be/be_visitor_sequence/any_op_cs.cpp:61
+
+// Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
     const IOP::ServiceContextList &_tao_elem
-  ) // copying
+  )
 {
   TAO_OutputCDR stream;
+  
   if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        IOP::_tc_ServiceContextList,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
+    {
+      _tao_any._tao_replace (
+          IOP::_tc_ServiceContextList,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin ()
+        );
+    }
 }
 
-void operator<<= (CORBA::Any &_tao_any, IOP::ServiceContextList *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    IOP::ServiceContextList *_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      IOP::_tc_ServiceContextList,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      IOP::ServiceContextList::_tao_any_destructor
-    );
+  
+  if (stream << *_tao_elem)
+    {
+      _tao_any._tao_replace (
+          IOP::_tc_ServiceContextList,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          _tao_elem,
+          IOP::ServiceContextList::_tao_any_destructor
+        );
+    }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::ServiceContextList *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    IOP::ServiceContextList *&_tao_elem
+  )
 {
   return _tao_any >>= ACE_const_cast(
       const IOP::ServiceContextList*&,
@@ -3258,157 +3841,716 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::ServiceContextList
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::ServiceContextList *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const IOP::ServiceContextList *&_tao_elem
+  )
 {
   _tao_elem = 0;
+  
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     
-    CORBA::Boolean result = type->equivalent (IOP::_tc_ServiceContextList ACE_ENV_ARG_PARAMETER);
+    CORBA::Boolean result =
+      type->equivalent (
+          IOP::_tc_ServiceContextList
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
     
     if (!result)
-      return 0; // not equivalent
+      {
+        return 0; // not equivalent
+      }
     
     if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const IOP::ServiceContextList*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      IOP::ServiceContextList *tmp;
-      ACE_NEW_RETURN (tmp, IOP::ServiceContextList, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
       {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IOP::_tc_ServiceContextList,
-            1,
-            ACE_static_cast (void *, tmp),
-            IOP::ServiceContextList::_tao_any_destructor
+        _tao_elem = ACE_static_cast(
+            const IOP::ServiceContextList*,
+            _tao_any.value ()
           );
-        _tao_elem = tmp;
+        
         return 1;
       }
-      else
+    else
       {
-        delete tmp;
+        IOP::ServiceContextList *tmp = 0;
+        ACE_NEW_RETURN (
+            tmp,
+            IOP::ServiceContextList,
+            0
+          );
+        
+        TAO_InputCDR stream (
+            _tao_any._tao_get_cdr (),
+            _tao_any._tao_byte_order ()
+          );
+        
+        if (stream >> *tmp)
+          {
+            ((CORBA::Any *)&_tao_any)->_tao_replace (
+                IOP::_tc_ServiceContextList,
+                1,
+                ACE_static_cast (void *, tmp),
+                IOP::ServiceContextList::_tao_any_destructor
+              );
+            
+            _tao_elem = tmp;
+            return 1;
+          }
+        else
+          {
+            delete tmp;
+          }
       }
-    }
   }
   ACE_CATCHANY
   {
   }
   ACE_ENDTRY;
+  
+  return 0;
+}
+
+
+// TAO_IDL - Generated from 
+// be/be_visitor_interface/any_op_cs.cpp:60
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    IOP::Codec_ptr _tao_elem
+  )
+{
+  _tao_any._tao_replace (
+      IOP::_tc_Codec, 
+      1,
+      IOP::Codec::_duplicate (_tao_elem),
+      IOP::Codec::_tao_any_destructor
+    );
+  
+  _tao_any.contains_local (1);
+}
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    IOP::Codec_ptr *_tao_elem
+  )
+{
+  _tao_any._tao_replace (
+      IOP::_tc_Codec, 
+      1,
+      *_tao_elem,
+      IOP::Codec::_tao_any_destructor
+    );
+  
+  _tao_any.contains_local (1);
+}
+
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    IOP::Codec_ptr &_tao_elem
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    _tao_elem = IOP::Codec::_nil ();
+    CORBA::TypeCode_var type = _tao_any.type ();
+    
+    CORBA::Boolean result =
+      type->equivalent (
+          IOP::_tc_Codec
+          ACE_ENV_ARG_PARAMETER
+        );
+    ACE_TRY_CHECK;
+    
+    if (!result)
+      {
+        return 0; // not equivalent
+      }
+    
+    _tao_elem =
+      ACE_reinterpret_cast (
+          IOP::Codec_ptr,
+          ACE_const_cast (void *, _tao_any.value ())
+        );
+    
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+  }
+  ACE_ENDTRY;
+  
+  _tao_elem = IOP::Codec::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<IOP::Codec,IOP::Codec_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<IOP::Codec,IOP::Codec_var>
+  template class TAO_Object_Manager<IOP::Codec,IOP::Codec_var>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#  pragma instantiate TAO_Object_Manager<IOP::Codec,IOP::Codec_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, const IOP::Encoding &_tao_elem) // copying
+
+// TAO_IDL - Generated from 
+// be/be_visitor_exception/any_op_cs.cpp:60
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const IOP::Codec::InvalidTypeForEncoding &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
+  IOP::Codec::InvalidTypeForEncoding *_tao_elem_copy = 0;
+  ACE_NEW (
+      _tao_elem_copy,
+      IOP::Codec::InvalidTypeForEncoding (_tao_elem)
+    );
+  
   _tao_any._tao_replace (
-      IOP::_tc_Encoding,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      IOP::Codec::_tc_InvalidTypeForEncoding,
+      1,
+      _tao_elem_copy,
+      IOP::Codec::InvalidTypeForEncoding::_tao_any_destructor
     );
+  
+  _tao_any.contains_local (1);
 }
 
-void operator<<= (CORBA::Any &_tao_any, IOP::Encoding *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    IOP::Codec::InvalidTypeForEncoding *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
   _tao_any._tao_replace (
-      IOP::_tc_Encoding,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
+      IOP::Codec::_tc_InvalidTypeForEncoding,
       1,
       _tao_elem,
-      IOP::Encoding::_tao_any_destructor
+      IOP::Codec::InvalidTypeForEncoding::_tao_any_destructor
     );
+  
+  _tao_any.contains_local (1);
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::Encoding *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,IOP::Codec::InvalidTypeForEncoding *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(const IOP::Encoding*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast(
+      const IOP::Codec::InvalidTypeForEncoding*&,
+      _tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::Encoding *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const IOP::Codec::InvalidTypeForEncoding *&_tao_elem
+  )
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     
-    CORBA::Boolean result = type->equivalent (IOP::_tc_Encoding ACE_ENV_ARG_PARAMETER);
+    CORBA::Boolean result =
+      type->equivalent (
+          IOP::Codec::_tc_InvalidTypeForEncoding
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
     
-    if (!result)
-      return 0; // not equivalent
+    if (result == 0)
+      {
+        return 0; // not equivalent
+      }
     
-    if (_tao_any.any_owns_data ())
+    _tao_elem = (IOP::Codec::InvalidTypeForEncoding *)_tao_any.value ();
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+  }
+  ACE_ENDTRY;
+  
+  return 0;
+}
+
+
+// TAO_IDL - Generated from 
+// be/be_visitor_exception/any_op_cs.cpp:60
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const IOP::Codec::FormatMismatch &_tao_elem
+  )
+{
+  IOP::Codec::FormatMismatch *_tao_elem_copy = 0;
+  ACE_NEW (
+      _tao_elem_copy,
+      IOP::Codec::FormatMismatch (_tao_elem)
+    );
+  
+  _tao_any._tao_replace (
+      IOP::Codec::_tc_FormatMismatch,
+      1,
+      _tao_elem_copy,
+      IOP::Codec::FormatMismatch::_tao_any_destructor
+    );
+  
+  _tao_any.contains_local (1);
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    IOP::Codec::FormatMismatch *_tao_elem
+  )
+{
+  _tao_any._tao_replace (
+      IOP::Codec::_tc_FormatMismatch,
+      1,
+      _tao_elem,
+      IOP::Codec::FormatMismatch::_tao_any_destructor
+    );
+  
+  _tao_any.contains_local (1);
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,IOP::Codec::FormatMismatch *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast(
+      const IOP::Codec::FormatMismatch*&,
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const IOP::Codec::FormatMismatch *&_tao_elem
+  )
+{
+  _tao_elem = 0;
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::TypeCode_var type = _tao_any.type ();
+    
+    CORBA::Boolean result =
+      type->equivalent (
+          IOP::Codec::_tc_FormatMismatch
+          ACE_ENV_ARG_PARAMETER
+        );
+    ACE_TRY_CHECK;
+    
+    if (result == 0)
+      {
+        return 0; // not equivalent
+      }
+    
+    _tao_elem = (IOP::Codec::FormatMismatch *)_tao_any.value ();
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+  }
+  ACE_ENDTRY;
+  
+  return 0;
+}
+
+
+// TAO_IDL - Generated from 
+// be/be_visitor_exception/any_op_cs.cpp:60
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const IOP::Codec::TypeMismatch &_tao_elem
+  )
+{
+  IOP::Codec::TypeMismatch *_tao_elem_copy = 0;
+  ACE_NEW (
+      _tao_elem_copy,
+      IOP::Codec::TypeMismatch (_tao_elem)
+    );
+  
+  _tao_any._tao_replace (
+      IOP::Codec::_tc_TypeMismatch,
+      1,
+      _tao_elem_copy,
+      IOP::Codec::TypeMismatch::_tao_any_destructor
+    );
+  
+  _tao_any.contains_local (1);
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    IOP::Codec::TypeMismatch *_tao_elem
+  )
+{
+  _tao_any._tao_replace (
+      IOP::Codec::_tc_TypeMismatch,
+      1,
+      _tao_elem,
+      IOP::Codec::TypeMismatch::_tao_any_destructor
+    );
+  
+  _tao_any.contains_local (1);
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,IOP::Codec::TypeMismatch *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast(
+      const IOP::Codec::TypeMismatch*&,
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const IOP::Codec::TypeMismatch *&_tao_elem
+  )
+{
+  _tao_elem = 0;
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::TypeCode_var type = _tao_any.type ();
+    
+    CORBA::Boolean result =
+      type->equivalent (
+          IOP::Codec::_tc_TypeMismatch
+          ACE_ENV_ARG_PARAMETER
+        );
+    ACE_TRY_CHECK;
+    
+    if (result == 0)
+      {
+        return 0; // not equivalent
+      }
+    
+    _tao_elem = (IOP::Codec::TypeMismatch *)_tao_any.value ();
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+  }
+  ACE_ENDTRY;
+  
+  return 0;
+}
+
+
+// TAO_IDL - Generated from 
+// be/be_visitor_structure/any_op_cs.cpp:58
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const IOP::Encoding &_tao_elem
+  )
+{
+  TAO_OutputCDR stream;
+  
+  if (stream << _tao_elem)
     {
-      _tao_elem = ACE_static_cast(
-          const IOP::Encoding*,
-          _tao_any.value ()
+      _tao_any._tao_replace (
+          IOP::_tc_Encoding,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin ()
         );
-      return 1;
     }
-    else
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    IOP::Encoding *_tao_elem
+  )
+{
+  TAO_OutputCDR stream;
+  
+  if (stream << *_tao_elem)
     {
-      IOP::Encoding *tmp;
-      ACE_NEW_RETURN (tmp, IOP::Encoding, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
+      _tao_any._tao_replace (
+          IOP::_tc_Encoding,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          _tao_elem,
+          IOP::Encoding::_tao_any_destructor
+        );
+    }
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    IOP::Encoding *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast (
+      const IOP::Encoding *&,
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const IOP::Encoding *&_tao_elem
+  )
+{
+  _tao_elem = 0;
+  
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::TypeCode_var type = _tao_any.type ();
+    
+    CORBA::Boolean result =
+      type->equivalent (
+          IOP::_tc_Encoding
+          ACE_ENV_ARG_PARAMETER
         );
-      if (stream >> *tmp)
+    ACE_TRY_CHECK;
+    
+    if (result == 0)
+      {
+        return 0; // not equivalent
+      }
+    
+    if (_tao_any.any_owns_data ())
       {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IOP::_tc_Encoding,
-            1,
-            ACE_static_cast (void *, tmp),
-            IOP::Encoding::_tao_any_destructor
+        _tao_elem = ACE_static_cast (
+            const IOP::Encoding*,
+            _tao_any.value ()
           );
-        _tao_elem = tmp;
+        
         return 1;
       }
-      else
+    else
       {
-        delete tmp;
+        IOP::Encoding *tmp;
+        ACE_NEW_RETURN (
+            tmp,
+            IOP::Encoding,
+            0
+          );
+        
+        TAO_InputCDR stream (
+            _tao_any._tao_get_cdr (),
+            _tao_any._tao_byte_order ()
+          );
+        
+        if (stream >> *tmp)
+          {
+            ((CORBA::Any *)&_tao_any)->_tao_replace (
+                IOP::_tc_Encoding,
+                1,
+                ACE_static_cast (void *, tmp),
+                IOP::Encoding::_tao_any_destructor
+              );
+            
+            _tao_elem = tmp;
+            return 1;
+          }
+        else
+          {
+            delete tmp;
+          }
       }
-    }
   }
   ACE_CATCHANY
   {
   }
   ACE_ENDTRY;
+  
+  return 0;
+}
+
+
+// TAO_IDL - Generated from 
+// be/be_visitor_interface/any_op_cs.cpp:60
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    IOP::CodecFactory_ptr _tao_elem
+  )
+{
+  _tao_any._tao_replace (
+      IOP::_tc_CodecFactory, 
+      1,
+      IOP::CodecFactory::_duplicate (_tao_elem),
+      IOP::CodecFactory::_tao_any_destructor
+    );
+  
+  _tao_any.contains_local (1);
+}
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    IOP::CodecFactory_ptr *_tao_elem
+  )
+{
+  _tao_any._tao_replace (
+      IOP::_tc_CodecFactory, 
+      1,
+      *_tao_elem,
+      IOP::CodecFactory::_tao_any_destructor
+    );
+  
+  _tao_any.contains_local (1);
+}
+
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    IOP::CodecFactory_ptr &_tao_elem
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    _tao_elem = IOP::CodecFactory::_nil ();
+    CORBA::TypeCode_var type = _tao_any.type ();
+    
+    CORBA::Boolean result =
+      type->equivalent (
+          IOP::_tc_CodecFactory
+          ACE_ENV_ARG_PARAMETER
+        );
+    ACE_TRY_CHECK;
+    
+    if (!result)
+      {
+        return 0; // not equivalent
+      }
+    
+    _tao_elem =
+      ACE_reinterpret_cast (
+          IOP::CodecFactory_ptr,
+          ACE_const_cast (void *, _tao_any.value ())
+        );
+    
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+  }
+  ACE_ENDTRY;
+  
+  _tao_elem = IOP::CodecFactory::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<IOP::CodecFactory,IOP::CodecFactory_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<IOP::CodecFactory,IOP::CodecFactory_var>
+  template class TAO_Object_Manager<IOP::CodecFactory,IOP::CodecFactory_var>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#  pragma instantiate TAO_Object_Manager<IOP::CodecFactory,IOP::CodecFactory_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 
+// TAO_IDL - Generated from 
+// be/be_visitor_exception/any_op_cs.cpp:60
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const IOP::CodecFactory::UnknownEncoding &_tao_elem
+  )
+{
+  IOP::CodecFactory::UnknownEncoding *_tao_elem_copy = 0;
+  ACE_NEW (
+      _tao_elem_copy,
+      IOP::CodecFactory::UnknownEncoding (_tao_elem)
+    );
+  
+  _tao_any._tao_replace (
+      IOP::CodecFactory::_tc_UnknownEncoding,
+      1,
+      _tao_elem_copy,
+      IOP::CodecFactory::UnknownEncoding::_tao_any_destructor
+    );
+  
+  _tao_any.contains_local (1);
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    IOP::CodecFactory::UnknownEncoding *_tao_elem
+  )
+{
+  _tao_any._tao_replace (
+      IOP::CodecFactory::_tc_UnknownEncoding,
+      1,
+      _tao_elem,
+      IOP::CodecFactory::UnknownEncoding::_tao_any_destructor
+    );
+  
+  _tao_any.contains_local (1);
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,IOP::CodecFactory::UnknownEncoding *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast(
+      const IOP::CodecFactory::UnknownEncoding*&,
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const IOP::CodecFactory::UnknownEncoding *&_tao_elem
+  )
+{
+  _tao_elem = 0;
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::TypeCode_var type = _tao_any.type ();
+    
+    CORBA::Boolean result =
+      type->equivalent (
+          IOP::CodecFactory::_tc_UnknownEncoding
+          ACE_ENV_ARG_PARAMETER
+        );
+    ACE_TRY_CHECK;
+    
+    if (result == 0)
+      {
+        return 0; // not equivalent
+      }
+    
+    _tao_elem = (IOP::CodecFactory::UnknownEncoding *)_tao_any.value ();
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+  }
+  ACE_ENDTRY;
+  
+  return 0;
+}
+
+
 #if !defined _TAO_CDR_OP_IOP_TaggedProfile__tao_seq_Octet_CPP_
 #define _TAO_CDR_OP_IOP_TaggedProfile__tao_seq_Octet_CPP_
 
@@ -3447,16 +4589,16 @@ CORBA::Boolean operator>> (
   CORBA::ULong _tao_seq_len;
   if (strm >> _tao_seq_len)
   {
+    // Add a check to the length of the sequence
+    // to make sure it does not exceed the length
+    // of the stream. (See bug 1159.)
+    if (_tao_seq_len > strm.length())
+      return 0;
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // 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
     
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
@@ -3517,16 +4659,16 @@ CORBA::Boolean operator>> (
   CORBA::ULong _tao_seq_len;
   if (strm >> _tao_seq_len)
   {
+    // Add a check to the length of the sequence
+    // to make sure it does not exceed the length
+    // of the stream. (See bug 1159.)
+    if (_tao_seq_len > strm.length())
+      return 0;
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // 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++)
@@ -3579,16 +4721,16 @@ CORBA::Boolean operator>> (
   CORBA::ULong _tao_seq_len;
   if (strm >> _tao_seq_len)
   {
+    // Add a check to the length of the sequence
+    // to make sure it does not exceed the length
+    // of the stream. (See bug 1159.)
+    if (_tao_seq_len > strm.length())
+      return 0;
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // 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
     
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
@@ -3645,16 +4787,16 @@ CORBA::Boolean operator>> (
   CORBA::ULong _tao_seq_len;
   if (strm >> _tao_seq_len)
   {
+    // Add a check to the length of the sequence
+    // to make sure it does not exceed the length
+    // of the stream. (See bug 1159.)
+    if (_tao_seq_len > strm.length())
+      return 0;
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // 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++)
@@ -3692,16 +4834,16 @@ CORBA::Boolean operator>> (
   CORBA::ULong _tao_seq_len;
   if (strm >> _tao_seq_len)
   {
+    // Add a check to the length of the sequence
+    // to make sure it does not exceed the length
+    // of the stream. (See bug 1159.)
+    if (_tao_seq_len > strm.length())
+      return 0;
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // 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++)
@@ -3739,16 +4881,16 @@ CORBA::Boolean operator>> (
   CORBA::ULong _tao_seq_len;
   if (strm >> _tao_seq_len)
   {
+    // Add a check to the length of the sequence
+    // to make sure it does not exceed the length
+    // of the stream. (See bug 1159.)
+    if (_tao_seq_len > strm.length())
+      return 0;
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // 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++)
@@ -3799,16 +4941,16 @@ CORBA::Boolean operator>> (
   CORBA::ULong _tao_seq_len;
   if (strm >> _tao_seq_len)
   {
+    // Add a check to the length of the sequence
+    // to make sure it does not exceed the length
+    // of the stream. (See bug 1159.)
+    if (_tao_seq_len > strm.length())
+      return 0;
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // 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
     
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
@@ -3865,16 +5007,16 @@ CORBA::Boolean operator>> (
   CORBA::ULong _tao_seq_len;
   if (strm >> _tao_seq_len)
   {
+    // Add a check to the length of the sequence
+    // to make sure it does not exceed the length
+    // of the stream. (See bug 1159.)
+    if (_tao_seq_len > strm.length())
+      return 0;
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // 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/IOPC.h b/TAO/tao/IOPC.h
index 7b646d00f2a..ea882509ce4 100644
--- a/TAO/tao/IOPC.h
+++ b/TAO/tao/IOPC.h
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_ORIG_IOPC_H_
-#define _TAO_IDL_ORIG_IOPC_H_
+#ifndef _TAO_IDL_IOPC_H_
+#define _TAO_IDL_IOPC_H_
 
 #include "ace/pre.h"
 #include "tao/corbafwd.h"
@@ -29,7 +29,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "TAO_Export.h"
+#include "tao/TAO_Export.h"
 #include "Exception.h"
 #include "Object.h"
 #include "Any.h"
@@ -62,54 +62,54 @@ TAO_NAMESPACE  IOP
   typedef CORBA::ULong ProfileId;
   typedef CORBA::ULong_out ProfileId_out;
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ProfileId;
-
+  
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_INTERNET_IOP;
-
+  
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_MULTIPLE_COMPONENTS;
-
+  
   struct TaggedProfile;
   class TaggedProfile_var;
-
+  
   struct TAO_Export TaggedProfile
   {
-
+    
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef TaggedProfile_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     static void _tao_any_destructor (void*);
-
+    
     ACE_NESTED_CLASS (IOP, ProfileId) tag;
-
+    
 #if !defined (_IOP_TAGGEDPROFILE__TAO_SEQ_OCTET_CH_)
 #define _IOP_TAGGEDPROFILE__TAO_SEQ_OCTET_CH_
-
+    
     class _tao_seq_Octet;
-
+    
     // *************************************************************
     // _tao_seq_Octet
     // *************************************************************
-
-    class TAO_Export _tao_seq_Octet : public
+    
+    class TAO_Export _tao_seq_Octet : public 
 #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 */ 
     {
     public:
       _tao_seq_Octet (void); // default ctor
       _tao_seq_Octet (CORBA::ULong max); // uses max size
       _tao_seq_Octet (
-          CORBA::ULong max,
-          CORBA::ULong length,
-          CORBA::Octet *buffer,
+          CORBA::ULong max, 
+          CORBA::ULong length, 
+          CORBA::Octet *buffer, 
           CORBA::Boolean release = 0
         );
       _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor
       ~_tao_seq_Octet (void);
       static void _tao_any_destructor (void*);
-
+      
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
       _tao_seq_Octet (
           CORBA::ULong length,
@@ -117,20 +117,20 @@ TAO_NAMESPACE  IOP
         )
         : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
 #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
-
+      
     };
-
+    
 #endif /* end #if !defined */
-
-
+    
+    
 #if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef _tao_seq_Octet _profile_data_seq;
 #endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */
 
     _tao_seq_Octet profile_data;
-
+    
   };
-
+  
   class TAO_Export TaggedProfile_var
   {
   public:
@@ -138,29 +138,29 @@ TAO_NAMESPACE  IOP
     TaggedProfile_var (TaggedProfile *);
     TaggedProfile_var (const TaggedProfile_var &);
     ~TaggedProfile_var (void);
-
+    
     TaggedProfile_var &operator= (TaggedProfile *);
     TaggedProfile_var &operator= (const TaggedProfile_var &);
     TaggedProfile *operator-> (void);
     const TaggedProfile *operator-> (void) const;
-
+    
     operator const TaggedProfile &() const;
     operator TaggedProfile &();
     operator TaggedProfile &() const;
     // Variable-size types only.
     operator TaggedProfile *&();
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const TaggedProfile &in (void) const;
     TaggedProfile &inout (void);
     TaggedProfile *&out (void);
     TaggedProfile *_retn (void);
     TaggedProfile *ptr (void) const;
-
+  
   private:
     TaggedProfile *ptr_;
   };
-
+  
   class TAO_Export TaggedProfile_out
   {
   public:
@@ -172,41 +172,41 @@ TAO_NAMESPACE  IOP
     operator TaggedProfile *&();
     TaggedProfile *&ptr (void);
     TaggedProfile *operator-> (void);
-
+    
   private:
     TaggedProfile *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const TaggedProfile_var &);
   };
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedProfile;
-
+  
   struct IOR;
   class IOR_var;
-
+  
   struct TAO_Export IOR
   {
-
+    
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef IOR_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     static void _tao_any_destructor (void*);
-
+    
     TAO_String_Manager type_id;
-
+    
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+    
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CH_
-
+    
     class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile
       : public TAO_Unbounded_Base_Sequence
     {
     public:
       // = Initialization and termination methods.
       _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (void);
-      _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (CORBA::ULong maximum);
+      _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (CORBA::ULong maximum); 
       _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (
           CORBA::ULong maximum,
           CORBA::ULong length,
@@ -220,15 +220,15 @@ TAO_NAMESPACE  IOP
           const _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile &rhs
         );
       virtual ~_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (void);
-
+      
       // = Accessors.
       ACE_NESTED_CLASS (IOP, TaggedProfile) &operator[] (CORBA::ULong i);
       const ACE_NESTED_CLASS (IOP, TaggedProfile) &operator[] (CORBA::ULong i) const;
-
+      
       // = Static operations.
       static ACE_NESTED_CLASS (IOP, TaggedProfile) *allocbuf (CORBA::ULong size);
       static void freebuf (ACE_NESTED_CLASS (IOP, TaggedProfile) *buffer);
-
+      
       // Implement the TAO_Base_Sequence methods (see Sequence.h)
       virtual void _allocate_buffer (CORBA::ULong length);
       virtual void _deallocate_buffer (void);
@@ -241,54 +241,54 @@ TAO_NAMESPACE  IOP
           CORBA::Boolean release
         );
     };
-
+    
 #endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+    
+    
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+    
 #if !defined (_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CH_)
 #define _IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CH_
-
+    
     class _tao_seq_TaggedProfile;
-
+    
     // *************************************************************
     // _tao_seq_TaggedProfile
     // *************************************************************
-
-    class TAO_Export _tao_seq_TaggedProfile : public
+    
+    class TAO_Export _tao_seq_TaggedProfile : public 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
     _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
     TAO_Unbounded_Sequence<ACE_NESTED_CLASS (IOP, TaggedProfile)>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
     {
     public:
       _tao_seq_TaggedProfile (void); // default ctor
       _tao_seq_TaggedProfile (CORBA::ULong max); // uses max size
       _tao_seq_TaggedProfile (
-          CORBA::ULong max,
-          CORBA::ULong length,
-          ACE_NESTED_CLASS (IOP, TaggedProfile) *buffer,
+          CORBA::ULong max, 
+          CORBA::ULong length, 
+          ACE_NESTED_CLASS (IOP, TaggedProfile) *buffer, 
           CORBA::Boolean release = 0
         );
       _tao_seq_TaggedProfile (const _tao_seq_TaggedProfile &); // copy ctor
       ~_tao_seq_TaggedProfile (void);
       static void _tao_any_destructor (void*);
-
+      
     };
-
+    
 #endif /* end #if !defined */
-
-
+    
+    
 #if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef _tao_seq_TaggedProfile _profiles_seq;
 #endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */
 
     _tao_seq_TaggedProfile profiles;
-
+    
   };
-
+  
   class TAO_Export IOR_var
   {
   public:
@@ -296,29 +296,29 @@ TAO_NAMESPACE  IOP
     IOR_var (IOR *);
     IOR_var (const IOR_var &);
     ~IOR_var (void);
-
+    
     IOR_var &operator= (IOR *);
     IOR_var &operator= (const IOR_var &);
     IOR *operator-> (void);
     const IOR *operator-> (void) const;
-
+    
     operator const IOR &() const;
     operator IOR &();
     operator IOR &() const;
     // Variable-size types only.
     operator IOR *&();
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const IOR &in (void) const;
     IOR &inout (void);
     IOR *&out (void);
     IOR *_retn (void);
     IOR *ptr (void) const;
-
+  
   private:
     IOR *ptr_;
   };
-
+  
   class TAO_Export IOR_out
   {
   public:
@@ -330,62 +330,62 @@ TAO_NAMESPACE  IOP
     operator IOR *&();
     IOR *&ptr (void);
     IOR *operator-> (void);
-
+    
   private:
     IOR *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const IOR_var &);
   };
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IOR;
-
+  
   typedef CORBA::ULong ComponentId;
   typedef CORBA::ULong_out ComponentId_out;
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ComponentId;
-
+  
   struct TaggedComponent;
   class TaggedComponent_var;
-
+  
   struct TAO_Export TaggedComponent
   {
-
+    
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef TaggedComponent_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     static void _tao_any_destructor (void*);
-
+    
     ACE_NESTED_CLASS (IOP, ComponentId) tag;
-
+    
 #if !defined (_IOP_TAGGEDCOMPONENT__TAO_SEQ_OCTET_CH_)
 #define _IOP_TAGGEDCOMPONENT__TAO_SEQ_OCTET_CH_
-
+    
     class _tao_seq_Octet;
-
+    
     // *************************************************************
     // _tao_seq_Octet
     // *************************************************************
-
-    class TAO_Export _tao_seq_Octet : public
+    
+    class TAO_Export _tao_seq_Octet : public 
 #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 */ 
     {
     public:
       _tao_seq_Octet (void); // default ctor
       _tao_seq_Octet (CORBA::ULong max); // uses max size
       _tao_seq_Octet (
-          CORBA::ULong max,
-          CORBA::ULong length,
-          CORBA::Octet *buffer,
+          CORBA::ULong max, 
+          CORBA::ULong length, 
+          CORBA::Octet *buffer, 
           CORBA::Boolean release = 0
         );
       _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor
       ~_tao_seq_Octet (void);
       static void _tao_any_destructor (void*);
-
+      
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
       _tao_seq_Octet (
           CORBA::ULong length,
@@ -393,20 +393,20 @@ TAO_NAMESPACE  IOP
         )
         : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
 #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
-
+      
     };
-
+    
 #endif /* end #if !defined */
-
-
+    
+    
 #if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef _tao_seq_Octet _component_data_seq;
 #endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */
 
     _tao_seq_Octet component_data;
-
+    
   };
-
+  
   class TAO_Export TaggedComponent_var
   {
   public:
@@ -414,29 +414,29 @@ TAO_NAMESPACE  IOP
     TaggedComponent_var (TaggedComponent *);
     TaggedComponent_var (const TaggedComponent_var &);
     ~TaggedComponent_var (void);
-
+    
     TaggedComponent_var &operator= (TaggedComponent *);
     TaggedComponent_var &operator= (const TaggedComponent_var &);
     TaggedComponent *operator-> (void);
     const TaggedComponent *operator-> (void) const;
-
+    
     operator const TaggedComponent &() const;
     operator TaggedComponent &();
     operator TaggedComponent &() const;
     // Variable-size types only.
     operator TaggedComponent *&();
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const TaggedComponent &in (void) const;
     TaggedComponent &inout (void);
     TaggedComponent *&out (void);
     TaggedComponent *_retn (void);
     TaggedComponent *ptr (void) const;
-
+  
   private:
     TaggedComponent *ptr_;
   };
-
+  
   class TAO_Export TaggedComponent_out
   {
   public:
@@ -448,28 +448,28 @@ TAO_NAMESPACE  IOP
     operator TaggedComponent *&();
     TaggedComponent *&ptr (void);
     TaggedComponent *operator-> (void);
-
+    
   private:
     TaggedComponent *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const TaggedComponent_var &);
   };
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedComponent;
-
-
+  
+  
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+  
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_MULTIPLECOMPONENTPROFILE_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_IOP_MULTIPLECOMPONENTPROFILE_CH_
-
+  
   class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile
     : public TAO_Unbounded_Base_Sequence
   {
   public:
     // = Initialization and termination methods.
     _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (void);
-    _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (CORBA::ULong maximum);
+    _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (
         CORBA::ULong maximum,
         CORBA::ULong length,
@@ -483,15 +483,15 @@ TAO_NAMESPACE  IOP
         const _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile &rhs
       );
     virtual ~_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (void);
-
+    
     // = Accessors.
     TaggedComponent &operator[] (CORBA::ULong i);
     const TaggedComponent &operator[] (CORBA::ULong i) const;
-
+    
     // = Static operations.
     static TaggedComponent *allocbuf (CORBA::ULong size);
     static void freebuf (TaggedComponent *buffer);
-
+    
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -504,59 +504,59 @@ TAO_NAMESPACE  IOP
         CORBA::Boolean release
       );
   };
-
+  
 #endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+  
+  
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  
 #if !defined (_IOP_MULTIPLECOMPONENTPROFILE_CH_)
 #define _IOP_MULTIPLECOMPONENTPROFILE_CH_
-
+  
   class MultipleComponentProfile;
   class MultipleComponentProfile_var;
-
+  
   // *************************************************************
   // MultipleComponentProfile
   // *************************************************************
-
-  class TAO_Export MultipleComponentProfile : public
+  
+  class TAO_Export MultipleComponentProfile : public 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     MultipleComponentProfile (void); // default ctor
     MultipleComponentProfile (CORBA::ULong max); // uses max size
     MultipleComponentProfile (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        TaggedComponent *buffer,
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        TaggedComponent *buffer, 
         CORBA::Boolean release = 0
       );
     MultipleComponentProfile (const MultipleComponentProfile &); // copy ctor
     ~MultipleComponentProfile (void);
     static void _tao_any_destructor (void*);
-
+    
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef MultipleComponentProfile_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-
-
+    
+    
   };
-
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IOP_MULTIPLECOMPONENTPROFILE___VAR_CH_)
 #define _IOP_MULTIPLECOMPONENTPROFILE___VAR_CH_
-
+  
   // *************************************************************
   // class IOP::MultipleComponentProfile_var
   // *************************************************************
-
+  
   class TAO_Export MultipleComponentProfile_var
   {
   public:
@@ -564,38 +564,38 @@ TAO_NAMESPACE  IOP
     MultipleComponentProfile_var (MultipleComponentProfile *);
     MultipleComponentProfile_var (const MultipleComponentProfile_var &);
     ~MultipleComponentProfile_var (void);
-
+    
     MultipleComponentProfile_var &operator= (MultipleComponentProfile *);
     MultipleComponentProfile_var &operator= (const MultipleComponentProfile_var &);
     MultipleComponentProfile *operator-> (void);
     const MultipleComponentProfile *operator-> (void) const;
-
+    
     operator const MultipleComponentProfile &() const;
     operator MultipleComponentProfile &();
     operator MultipleComponentProfile &() const;
     operator MultipleComponentProfile *&(); // variable-size base types only
-
+    
     TaggedComponent & operator[] (CORBA::ULong index);
     const TaggedComponent & operator[] (CORBA::ULong index) const;
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const MultipleComponentProfile &in (void) const;
     MultipleComponentProfile &inout (void);
     MultipleComponentProfile *&out (void);
     MultipleComponentProfile *_retn (void);
     MultipleComponentProfile *ptr (void) const;
-
+  
   private:
     MultipleComponentProfile *ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IOP_MULTIPLECOMPONENTPROFILE___OUT_CH_)
 #define _IOP_MULTIPLECOMPONENTPROFILE___OUT_CH_
-
+  
   class TAO_Export MultipleComponentProfile_out
   {
   public:
@@ -608,31 +608,31 @@ TAO_NAMESPACE  IOP
     MultipleComponentProfile *&ptr (void);
     MultipleComponentProfile *operator-> (void);
     TaggedComponent & operator[] (CORBA::ULong index);
-
+  
   private:
     MultipleComponentProfile *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const MultipleComponentProfile_var &);
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultipleComponentProfile;
-
-
+  
+  
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+  
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTLIST_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTLIST_CH_
-
+  
   class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_IOP_TaggedComponentList
     : public TAO_Unbounded_Base_Sequence
   {
   public:
     // = Initialization and termination methods.
     _TAO_Unbounded_Sequence_IOP_TaggedComponentList (void);
-    _TAO_Unbounded_Sequence_IOP_TaggedComponentList (CORBA::ULong maximum);
+    _TAO_Unbounded_Sequence_IOP_TaggedComponentList (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_IOP_TaggedComponentList (
         CORBA::ULong maximum,
         CORBA::ULong length,
@@ -646,15 +646,15 @@ TAO_NAMESPACE  IOP
         const _TAO_Unbounded_Sequence_IOP_TaggedComponentList &rhs
       );
     virtual ~_TAO_Unbounded_Sequence_IOP_TaggedComponentList (void);
-
+    
     // = Accessors.
     TaggedComponent &operator[] (CORBA::ULong i);
     const TaggedComponent &operator[] (CORBA::ULong i) const;
-
+    
     // = Static operations.
     static TaggedComponent *allocbuf (CORBA::ULong size);
     static void freebuf (TaggedComponent *buffer);
-
+    
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -667,59 +667,59 @@ TAO_NAMESPACE  IOP
         CORBA::Boolean release
       );
   };
-
+  
 #endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+  
+  
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  
 #if !defined (_IOP_TAGGEDCOMPONENTLIST_CH_)
 #define _IOP_TAGGEDCOMPONENTLIST_CH_
-
+  
   class TaggedComponentList;
   class TaggedComponentList_var;
-
+  
   // *************************************************************
   // TaggedComponentList
   // *************************************************************
-
-  class TAO_Export TaggedComponentList : public
+  
+  class TAO_Export TaggedComponentList : public 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IOP_TaggedComponentList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     TaggedComponentList (void); // default ctor
     TaggedComponentList (CORBA::ULong max); // uses max size
     TaggedComponentList (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        TaggedComponent *buffer,
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        TaggedComponent *buffer, 
         CORBA::Boolean release = 0
       );
     TaggedComponentList (const TaggedComponentList &); // copy ctor
     ~TaggedComponentList (void);
     static void _tao_any_destructor (void*);
-
+    
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef TaggedComponentList_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-
-
+    
+    
   };
-
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IOP_TAGGEDCOMPONENTLIST___VAR_CH_)
 #define _IOP_TAGGEDCOMPONENTLIST___VAR_CH_
-
+  
   // *************************************************************
   // class IOP::TaggedComponentList_var
   // *************************************************************
-
+  
   class TAO_Export TaggedComponentList_var
   {
   public:
@@ -727,38 +727,38 @@ TAO_NAMESPACE  IOP
     TaggedComponentList_var (TaggedComponentList *);
     TaggedComponentList_var (const TaggedComponentList_var &);
     ~TaggedComponentList_var (void);
-
+    
     TaggedComponentList_var &operator= (TaggedComponentList *);
     TaggedComponentList_var &operator= (const TaggedComponentList_var &);
     TaggedComponentList *operator-> (void);
     const TaggedComponentList *operator-> (void) const;
-
+    
     operator const TaggedComponentList &() const;
     operator TaggedComponentList &();
     operator TaggedComponentList &() const;
     operator TaggedComponentList *&(); // variable-size base types only
-
+    
     TaggedComponent & operator[] (CORBA::ULong index);
     const TaggedComponent & operator[] (CORBA::ULong index) const;
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const TaggedComponentList &in (void) const;
     TaggedComponentList &inout (void);
     TaggedComponentList *&out (void);
     TaggedComponentList *_retn (void);
     TaggedComponentList *ptr (void) const;
-
+  
   private:
     TaggedComponentList *ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IOP_TAGGEDCOMPONENTLIST___OUT_CH_)
 #define _IOP_TAGGEDCOMPONENTLIST___OUT_CH_
-
+  
   class TAO_Export TaggedComponentList_out
   {
   public:
@@ -771,31 +771,31 @@ TAO_NAMESPACE  IOP
     TaggedComponentList *&ptr (void);
     TaggedComponentList *operator-> (void);
     TaggedComponent & operator[] (CORBA::ULong index);
-
+  
   private:
     TaggedComponentList *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const TaggedComponentList_var &);
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedComponentList;
-
-
+  
+  
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+  
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTSEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTSEQ_CH_
-
+  
   class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq
     : public TAO_Unbounded_Base_Sequence
   {
   public:
     // = Initialization and termination methods.
     _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (void);
-    _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (CORBA::ULong maximum);
+    _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (
         CORBA::ULong maximum,
         CORBA::ULong length,
@@ -809,15 +809,15 @@ TAO_NAMESPACE  IOP
         const _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq &rhs
       );
     virtual ~_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (void);
-
+    
     // = Accessors.
     TaggedComponent &operator[] (CORBA::ULong i);
     const TaggedComponent &operator[] (CORBA::ULong i) const;
-
+    
     // = Static operations.
     static TaggedComponent *allocbuf (CORBA::ULong size);
     static void freebuf (TaggedComponent *buffer);
-
+    
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -830,59 +830,59 @@ TAO_NAMESPACE  IOP
         CORBA::Boolean release
       );
   };
-
+  
 #endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+  
+  
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  
 #if !defined (_IOP_TAGGEDCOMPONENTSEQ_CH_)
 #define _IOP_TAGGEDCOMPONENTSEQ_CH_
-
+  
   class TaggedComponentSeq;
   class TaggedComponentSeq_var;
-
+  
   // *************************************************************
   // TaggedComponentSeq
   // *************************************************************
-
-  class TAO_Export TaggedComponentSeq : public
+  
+  class TAO_Export TaggedComponentSeq : public 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     TaggedComponentSeq (void); // default ctor
     TaggedComponentSeq (CORBA::ULong max); // uses max size
     TaggedComponentSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        TaggedComponent *buffer,
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        TaggedComponent *buffer, 
         CORBA::Boolean release = 0
       );
     TaggedComponentSeq (const TaggedComponentSeq &); // copy ctor
     ~TaggedComponentSeq (void);
     static void _tao_any_destructor (void*);
-
+    
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef TaggedComponentSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-
-
+    
+    
   };
-
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IOP_TAGGEDCOMPONENTSEQ___VAR_CH_)
 #define _IOP_TAGGEDCOMPONENTSEQ___VAR_CH_
-
+  
   // *************************************************************
   // class IOP::TaggedComponentSeq_var
   // *************************************************************
-
+  
   class TAO_Export TaggedComponentSeq_var
   {
   public:
@@ -890,38 +890,38 @@ TAO_NAMESPACE  IOP
     TaggedComponentSeq_var (TaggedComponentSeq *);
     TaggedComponentSeq_var (const TaggedComponentSeq_var &);
     ~TaggedComponentSeq_var (void);
-
+    
     TaggedComponentSeq_var &operator= (TaggedComponentSeq *);
     TaggedComponentSeq_var &operator= (const TaggedComponentSeq_var &);
     TaggedComponentSeq *operator-> (void);
     const TaggedComponentSeq *operator-> (void) const;
-
+    
     operator const TaggedComponentSeq &() const;
     operator TaggedComponentSeq &();
     operator TaggedComponentSeq &() const;
     operator TaggedComponentSeq *&(); // variable-size base types only
-
+    
     TaggedComponent & operator[] (CORBA::ULong index);
     const TaggedComponent & operator[] (CORBA::ULong index) const;
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const TaggedComponentSeq &in (void) const;
     TaggedComponentSeq &inout (void);
     TaggedComponentSeq *&out (void);
     TaggedComponentSeq *_retn (void);
     TaggedComponentSeq *ptr (void) const;
-
+  
   private:
     TaggedComponentSeq *ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IOP_TAGGEDCOMPONENTSEQ___OUT_CH_)
 #define _IOP_TAGGEDCOMPONENTSEQ___OUT_CH_
-
+  
   class TAO_Export TaggedComponentSeq_out
   {
   public:
@@ -934,85 +934,85 @@ TAO_NAMESPACE  IOP
     TaggedComponentSeq *&ptr (void);
     TaggedComponentSeq *operator-> (void);
     TaggedComponent & operator[] (CORBA::ULong index);
-
+  
   private:
     TaggedComponentSeq *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const TaggedComponentSeq_var &);
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedComponentSeq;
-
+  
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_ORB_TYPE;
-
+  
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_CODE_SETS;
-
+  
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_POLICIES;
-
+  
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_ALTERNATE_IIOP_ADDRESS;
-
+  
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_COMPLETE_OBJECT_KEY;
-
+  
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_ENDPOINT_ID_POSITION;
-
+  
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_LOCATION_POLICY;
-
+  
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_DCE_STRING_BINDING;
-
+  
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_DCE_BINDING_NAME;
-
+  
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_DCE_NO_PIPES;
-
+  
   typedef CORBA::ULong ServiceId;
   typedef CORBA::ULong_out ServiceId_out;
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceId;
-
+  
   struct ServiceContext;
   class ServiceContext_var;
-
+  
   struct TAO_Export ServiceContext
   {
-
+    
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ServiceContext_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     static void _tao_any_destructor (void*);
-
+    
     ACE_NESTED_CLASS (IOP, ServiceId) context_id;
-
+    
 #if !defined (_IOP_SERVICECONTEXT__TAO_SEQ_OCTET_CH_)
 #define _IOP_SERVICECONTEXT__TAO_SEQ_OCTET_CH_
-
+    
     class _tao_seq_Octet;
-
+    
     // *************************************************************
     // _tao_seq_Octet
     // *************************************************************
-
-    class TAO_Export _tao_seq_Octet : public
+    
+    class TAO_Export _tao_seq_Octet : public 
 #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 */ 
     {
     public:
       _tao_seq_Octet (void); // default ctor
       _tao_seq_Octet (CORBA::ULong max); // uses max size
       _tao_seq_Octet (
-          CORBA::ULong max,
-          CORBA::ULong length,
-          CORBA::Octet *buffer,
+          CORBA::ULong max, 
+          CORBA::ULong length, 
+          CORBA::Octet *buffer, 
           CORBA::Boolean release = 0
         );
       _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor
       ~_tao_seq_Octet (void);
       static void _tao_any_destructor (void*);
-
+      
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
       _tao_seq_Octet (
           CORBA::ULong length,
@@ -1020,20 +1020,20 @@ TAO_NAMESPACE  IOP
         )
         : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
 #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
-
+      
     };
-
+    
 #endif /* end #if !defined */
-
-
+    
+    
 #if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef _tao_seq_Octet _context_data_seq;
 #endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */
 
     _tao_seq_Octet context_data;
-
+    
   };
-
+  
   class TAO_Export ServiceContext_var
   {
   public:
@@ -1041,29 +1041,29 @@ TAO_NAMESPACE  IOP
     ServiceContext_var (ServiceContext *);
     ServiceContext_var (const ServiceContext_var &);
     ~ServiceContext_var (void);
-
+    
     ServiceContext_var &operator= (ServiceContext *);
     ServiceContext_var &operator= (const ServiceContext_var &);
     ServiceContext *operator-> (void);
     const ServiceContext *operator-> (void) const;
-
+    
     operator const ServiceContext &() const;
     operator ServiceContext &();
     operator ServiceContext &() const;
     // Variable-size types only.
     operator ServiceContext *&();
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const ServiceContext &in (void) const;
     ServiceContext &inout (void);
     ServiceContext *&out (void);
     ServiceContext *_retn (void);
     ServiceContext *ptr (void) const;
-
+  
   private:
     ServiceContext *ptr_;
   };
-
+  
   class TAO_Export ServiceContext_out
   {
   public:
@@ -1075,28 +1075,28 @@ TAO_NAMESPACE  IOP
     operator ServiceContext *&();
     ServiceContext *&ptr (void);
     ServiceContext *operator-> (void);
-
+    
   private:
     ServiceContext *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const ServiceContext_var &);
   };
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceContext;
-
-
+  
+  
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+  
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_SERVICECONTEXTLIST_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_IOP_SERVICECONTEXTLIST_CH_
-
+  
   class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_IOP_ServiceContextList
     : public TAO_Unbounded_Base_Sequence
   {
   public:
     // = Initialization and termination methods.
     _TAO_Unbounded_Sequence_IOP_ServiceContextList (void);
-    _TAO_Unbounded_Sequence_IOP_ServiceContextList (CORBA::ULong maximum);
+    _TAO_Unbounded_Sequence_IOP_ServiceContextList (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_IOP_ServiceContextList (
         CORBA::ULong maximum,
         CORBA::ULong length,
@@ -1110,15 +1110,15 @@ TAO_NAMESPACE  IOP
         const _TAO_Unbounded_Sequence_IOP_ServiceContextList &rhs
       );
     virtual ~_TAO_Unbounded_Sequence_IOP_ServiceContextList (void);
-
+    
     // = Accessors.
     ServiceContext &operator[] (CORBA::ULong i);
     const ServiceContext &operator[] (CORBA::ULong i) const;
-
+    
     // = Static operations.
     static ServiceContext *allocbuf (CORBA::ULong size);
     static void freebuf (ServiceContext *buffer);
-
+    
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -1131,59 +1131,59 @@ TAO_NAMESPACE  IOP
         CORBA::Boolean release
       );
   };
-
+  
 #endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+  
+  
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  
 #if !defined (_IOP_SERVICECONTEXTLIST_CH_)
 #define _IOP_SERVICECONTEXTLIST_CH_
-
+  
   class ServiceContextList;
   class ServiceContextList_var;
-
+  
   // *************************************************************
   // ServiceContextList
   // *************************************************************
-
-  class TAO_Export ServiceContextList : public
+  
+  class TAO_Export ServiceContextList : public 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IOP_ServiceContextList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<ServiceContext>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     ServiceContextList (void); // default ctor
     ServiceContextList (CORBA::ULong max); // uses max size
     ServiceContextList (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ServiceContext *buffer,
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        ServiceContext *buffer, 
         CORBA::Boolean release = 0
       );
     ServiceContextList (const ServiceContextList &); // copy ctor
     ~ServiceContextList (void);
     static void _tao_any_destructor (void*);
-
+    
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ServiceContextList_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-
-
+    
+    
   };
-
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IOP_SERVICECONTEXTLIST___VAR_CH_)
 #define _IOP_SERVICECONTEXTLIST___VAR_CH_
-
+  
   // *************************************************************
   // class IOP::ServiceContextList_var
   // *************************************************************
-
+  
   class TAO_Export ServiceContextList_var
   {
   public:
@@ -1191,38 +1191,38 @@ TAO_NAMESPACE  IOP
     ServiceContextList_var (ServiceContextList *);
     ServiceContextList_var (const ServiceContextList_var &);
     ~ServiceContextList_var (void);
-
+    
     ServiceContextList_var &operator= (ServiceContextList *);
     ServiceContextList_var &operator= (const ServiceContextList_var &);
     ServiceContextList *operator-> (void);
     const ServiceContextList *operator-> (void) const;
-
+    
     operator const ServiceContextList &() const;
     operator ServiceContextList &();
     operator ServiceContextList &() const;
     operator ServiceContextList *&(); // variable-size base types only
-
+    
     ServiceContext & operator[] (CORBA::ULong index);
     const ServiceContext & operator[] (CORBA::ULong index) const;
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const ServiceContextList &in (void) const;
     ServiceContextList &inout (void);
     ServiceContextList *&out (void);
     ServiceContextList *_retn (void);
     ServiceContextList *ptr (void) const;
-
+  
   private:
     ServiceContextList *ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IOP_SERVICECONTEXTLIST___OUT_CH_)
 #define _IOP_SERVICECONTEXTLIST___OUT_CH_
-
+  
   class TAO_Export ServiceContextList_out
   {
   public:
@@ -1235,90 +1235,90 @@ TAO_NAMESPACE  IOP
     ServiceContextList *&ptr (void);
     ServiceContextList *operator-> (void);
     ServiceContext & operator[] (CORBA::ULong index);
-
+  
   private:
     ServiceContextList *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const ServiceContextList_var &);
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceContextList;
-
+  
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TransactionService;
-
+  
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong CodeSets;
-
+  
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong ChainBypassCheck;
-
+  
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong ChainBypassInfo;
-
+  
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong LogicalThreadId;
-
+  
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong BI_DIR_IIOP;
-
+  
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong SendingContextRunTime;
-
+  
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong INVOCATION_POLICIES;
-
+  
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong UnknownExceptionInfo;
-
+  
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong RTCorbaPriority;
-
+  
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong RTCorbaPriorityRange;
-
+  
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_FT_GROUP;
-
+  
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_FT_PRIMARY;
-
+  
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_FT_HEARTBEAT_ENABLED;
-
+  
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong FT_GROUP_VERSION;
-
+  
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong FT_REQUEST;
-
+  
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_UIPMC;
-
+  
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_GROUP;
-
+  
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_GROUP_IIOP;
-
-
+  
+  
 #if !defined (_IOP_CODEC___PTR_CH_)
 #define _IOP_CODEC___PTR_CH_
-
+  
   class Codec;
   typedef Codec *Codec_ptr;
-
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IOP_CODEC___VAR_CH_)
 #define _IOP_CODEC___VAR_CH_
-
+  
   class TAO_Export Codec_var : public TAO_Base_var
   {
   public:
     Codec_var (void); // default constructor
-    Codec_var (Codec_ptr p) : ptr_ (p) {}
+    Codec_var (Codec_ptr p) : ptr_ (p) {} 
     Codec_var (const Codec_var &); // copy constructor
     ~Codec_var (void); // destructor
-
+    
     Codec_var &operator= (Codec_ptr);
     Codec_var &operator= (const Codec_var &);
     Codec_ptr operator-> (void) const;
-
+    
     operator const Codec_ptr &() const;
     operator Codec_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     Codec_ptr in (void) const;
     Codec_ptr &inout (void);
     Codec_ptr &out (void);
     Codec_ptr _retn (void);
     Codec_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static Codec_ptr tao_duplicate (Codec_ptr);
@@ -1329,7 +1329,7 @@ TAO_NAMESPACE  IOP
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     Codec_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1339,11 +1339,11 @@ TAO_NAMESPACE  IOP
 
 
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IOP_CODEC___OUT_CH_)
 #define _IOP_CODEC___OUT_CH_
-
+  
   class TAO_Export Codec_out
   {
   public:
@@ -1356,18 +1356,24 @@ TAO_NAMESPACE  IOP
     operator Codec_ptr &();
     Codec_ptr &ptr (void);
     Codec_ptr operator-> (void);
-
+  
   private:
     Codec_ptr &ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  // *************************************************************
+  // IOP::Codec
+  // TAO_IDL - Generated from
+  // be/be_visitor_interface/interface_ch.cpp:106
+  // *************************************************************
+  
+  
 #if !defined (_IOP_CODEC_CH_)
 #define _IOP_CODEC_CH_
-
+  
   class TAO_Export Codec
     : public virtual CORBA_Object
   {
@@ -1378,39 +1384,43 @@ TAO_NAMESPACE  IOP
   #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     static int _tao_class_id;
-
+    
     // The static operations.
     static Codec_ptr _duplicate (Codec_ptr obj);
-
+    
     static Codec_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Codec_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Codec_ptr _nil (void)
       {
         return (Codec_ptr)0;
       }
-
-
+    
+    static void _tao_any_destructor (void*);
+    
+    
 #if !defined (_IOP_CODEC_INVALIDTYPEFORENCODING_CH_)
 #define _IOP_CODEC_INVALIDTYPEFORENCODING_CH_
-
+    
     class TAO_Export InvalidTypeForEncoding : public CORBA::UserException
     {
     public:
-
+      
       InvalidTypeForEncoding (void);
       InvalidTypeForEncoding (const InvalidTypeForEncoding &);
       ~InvalidTypeForEncoding (void);
 
       InvalidTypeForEncoding &operator= (const InvalidTypeForEncoding &);
 
+      static void _tao_any_destructor (void*);
+
       static InvalidTypeForEncoding *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -1422,32 +1432,37 @@ TAO_NAMESPACE  IOP
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-
-
+      
+      
+      virtual CORBA::TypeCode_ptr _type (void) const;
     };
 
-
+static ::CORBA::TypeCode_ptr _tc_InvalidTypeForEncoding;
+    
+    
 #endif /* end #if !defined */
-
-
+    
+    
 #if !defined (_IOP_CODEC_FORMATMISMATCH_CH_)
 #define _IOP_CODEC_FORMATMISMATCH_CH_
-
+    
     class TAO_Export FormatMismatch : public CORBA::UserException
     {
     public:
-
+      
       FormatMismatch (void);
       FormatMismatch (const FormatMismatch &);
       ~FormatMismatch (void);
 
       FormatMismatch &operator= (const FormatMismatch &);
 
+      static void _tao_any_destructor (void*);
+
       static FormatMismatch *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -1459,32 +1474,37 @@ TAO_NAMESPACE  IOP
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-
-
+      
+      
+      virtual CORBA::TypeCode_ptr _type (void) const;
     };
 
-
+static ::CORBA::TypeCode_ptr _tc_FormatMismatch;
+    
+    
 #endif /* end #if !defined */
-
-
+    
+    
 #if !defined (_IOP_CODEC_TYPEMISMATCH_CH_)
 #define _IOP_CODEC_TYPEMISMATCH_CH_
-
+    
     class TAO_Export TypeMismatch : public CORBA::UserException
     {
     public:
-
+      
       TypeMismatch (void);
       TypeMismatch (const TypeMismatch &);
       ~TypeMismatch (void);
 
       TypeMismatch &operator= (const TypeMismatch &);
 
+      static void _tao_any_destructor (void*);
+
       static TypeMismatch *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -1496,18 +1516,21 @@ TAO_NAMESPACE  IOP
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-
-
+      
+      
+      virtual CORBA::TypeCode_ptr _type (void) const;
     };
 
-
+static ::CORBA::TypeCode_ptr _tc_TypeMismatch;
+    
+    
 #endif /* end #if !defined */
-
+    
     virtual ::CORBA::OctetSeq * encode (
         const CORBA::Any & data
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1516,7 +1539,7 @@ TAO_NAMESPACE  IOP
         CORBA::SystemException
         , IOP::Codec::InvalidTypeForEncoding
       )) = 0;
-
+    
     virtual CORBA::Any * decode (
         const CORBA::OctetSeq & data
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1525,7 +1548,7 @@ TAO_NAMESPACE  IOP
         CORBA::SystemException
         , IOP::Codec::FormatMismatch
       )) = 0;
-
+    
     virtual ::CORBA::OctetSeq * encode_value (
         const CORBA::Any & data
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1534,7 +1557,7 @@ TAO_NAMESPACE  IOP
         CORBA::SystemException
         , IOP::Codec::InvalidTypeForEncoding
       )) = 0;
-
+    
     virtual CORBA::Any * decode_value (
         const CORBA::OctetSeq & data,
         CORBA::TypeCode_ptr tc
@@ -1545,48 +1568,50 @@ TAO_NAMESPACE  IOP
         , IOP::Codec::FormatMismatch
         , IOP::Codec::TypeMismatch
       )) = 0;
-
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     Codec (void);
-
+    
     virtual ~Codec (void);
-
+  
   private:
     Codec (const Codec &);
     void operator= (const Codec &);
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Codec;
+  
   typedef CORBA::Short EncodingFormat;
   typedef CORBA::Short_out EncodingFormat_out;
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EncodingFormat;
-
+  
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short ENCODING_CDR_ENCAPS;
-
+  
   struct Encoding;
   class Encoding_var;
-
+  
   struct TAO_Export Encoding
   {
-
+    
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef Encoding_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     static void _tao_any_destructor (void*);
-
+    
     ACE_NESTED_CLASS (IOP, EncodingFormat) format;
     CORBA::Octet major_version;
     CORBA::Octet minor_version;
-
+    
   };
-
+  
   class TAO_Export Encoding_var
   {
   public:
@@ -1596,67 +1621,67 @@ TAO_NAMESPACE  IOP
     // Fixed-size types only.
     Encoding_var (const Encoding &);
     ~Encoding_var (void);
-
+    
     Encoding_var &operator= (Encoding *);
     Encoding_var &operator= (const Encoding_var &);
     // Fixed-size types only.
     Encoding_var &operator= (const Encoding &);
     Encoding *operator-> (void);
     const Encoding *operator-> (void) const;
-
+    
     operator const Encoding &() const;
     operator Encoding &();
     operator Encoding &() const;
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const Encoding &in (void) const;
     Encoding &inout (void);
     Encoding &out (void);
     Encoding _retn (void);
     Encoding *ptr (void) const;
-
+  
   private:
     Encoding *ptr_;
   };
-
+  
   typedef Encoding &Encoding_out;
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Encoding;
-
-
+  
+  
 #if !defined (_IOP_CODECFACTORY___PTR_CH_)
 #define _IOP_CODECFACTORY___PTR_CH_
-
+  
   class CodecFactory;
   typedef CodecFactory *CodecFactory_ptr;
-
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IOP_CODECFACTORY___VAR_CH_)
 #define _IOP_CODECFACTORY___VAR_CH_
-
+  
   class TAO_Export CodecFactory_var : public TAO_Base_var
   {
   public:
     CodecFactory_var (void); // default constructor
-    CodecFactory_var (CodecFactory_ptr p) : ptr_ (p) {}
+    CodecFactory_var (CodecFactory_ptr p) : ptr_ (p) {} 
     CodecFactory_var (const CodecFactory_var &); // copy constructor
     ~CodecFactory_var (void); // destructor
-
+    
     CodecFactory_var &operator= (CodecFactory_ptr);
     CodecFactory_var &operator= (const CodecFactory_var &);
     CodecFactory_ptr operator-> (void) const;
-
+    
     operator const CodecFactory_ptr &() const;
     operator CodecFactory_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     CodecFactory_ptr in (void) const;
     CodecFactory_ptr &inout (void);
     CodecFactory_ptr &out (void);
     CodecFactory_ptr _retn (void);
     CodecFactory_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static CodecFactory_ptr tao_duplicate (CodecFactory_ptr);
@@ -1667,7 +1692,7 @@ TAO_NAMESPACE  IOP
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     CodecFactory_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1677,11 +1702,11 @@ TAO_NAMESPACE  IOP
 
 
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IOP_CODECFACTORY___OUT_CH_)
 #define _IOP_CODECFACTORY___OUT_CH_
-
+  
   class TAO_Export CodecFactory_out
   {
   public:
@@ -1694,18 +1719,24 @@ TAO_NAMESPACE  IOP
     operator CodecFactory_ptr &();
     CodecFactory_ptr &ptr (void);
     CodecFactory_ptr operator-> (void);
-
+  
   private:
     CodecFactory_ptr &ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  // *************************************************************
+  // IOP::CodecFactory
+  // TAO_IDL - Generated from
+  // be/be_visitor_interface/interface_ch.cpp:106
+  // *************************************************************
+  
+  
 #if !defined (_IOP_CODECFACTORY_CH_)
 #define _IOP_CODECFACTORY_CH_
-
+  
   class TAO_Export CodecFactory
     : public virtual CORBA_Object
   {
@@ -1716,39 +1747,43 @@ TAO_NAMESPACE  IOP
   #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     static int _tao_class_id;
-
+    
     // The static operations.
     static CodecFactory_ptr _duplicate (CodecFactory_ptr obj);
-
+    
     static CodecFactory_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static CodecFactory_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static CodecFactory_ptr _nil (void)
       {
         return (CodecFactory_ptr)0;
       }
-
-
+    
+    static void _tao_any_destructor (void*);
+    
+    
 #if !defined (_IOP_CODECFACTORY_UNKNOWNENCODING_CH_)
 #define _IOP_CODECFACTORY_UNKNOWNENCODING_CH_
-
+    
     class TAO_Export UnknownEncoding : public CORBA::UserException
     {
     public:
-
+      
       UnknownEncoding (void);
       UnknownEncoding (const UnknownEncoding &);
       ~UnknownEncoding (void);
 
       UnknownEncoding &operator= (const UnknownEncoding &);
 
+      static void _tao_any_destructor (void*);
+
       static UnknownEncoding *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -1760,18 +1795,21 @@ TAO_NAMESPACE  IOP
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-
-
+      
+      
+      virtual CORBA::TypeCode_ptr _type (void) const;
     };
 
-
+static ::CORBA::TypeCode_ptr _tc_UnknownEncoding;
+    
+    
 #endif /* end #if !defined */
-
+    
     virtual ::IOP::Codec_ptr create_codec (
         const IOP::Encoding & enc
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1780,25 +1818,27 @@ TAO_NAMESPACE  IOP
         CORBA::SystemException
         , IOP::CodecFactory::UnknownEncoding
       )) = 0;
-
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     CodecFactory (void);
-
+    
     virtual ~CodecFactory (void);
-
+  
   private:
     CodecFactory (const CodecFactory &);
     void operator= (const CodecFactory &);
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodecFactory;
+  
+  
 }
 TAO_NAMESPACE_CLOSE // module IOP
 
@@ -1834,10 +1874,34 @@ TAO_Export void operator<<= (CORBA::Any &, const IOP::ServiceContextList &); //
 TAO_Export void operator<<= (CORBA::Any &, IOP::ServiceContextList*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::ServiceContextList *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::ServiceContextList *&);
+// Any operators for interface IOP::Codec
+TAO_Export void operator<<= (CORBA::Any &, IOP::Codec_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, IOP::Codec_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Codec_ptr &);
+TAO_Export void operator<<= (CORBA::Any &, const IOP::Codec::InvalidTypeForEncoding &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, IOP::Codec::InvalidTypeForEncoding*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Codec::InvalidTypeForEncoding *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::Codec::InvalidTypeForEncoding *&);
+TAO_Export void operator<<= (CORBA::Any &, const IOP::Codec::FormatMismatch &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, IOP::Codec::FormatMismatch*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Codec::FormatMismatch *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::Codec::FormatMismatch *&);
+TAO_Export void operator<<= (CORBA::Any &, const IOP::Codec::TypeMismatch &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, IOP::Codec::TypeMismatch*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Codec::TypeMismatch *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::Codec::TypeMismatch *&);
 TAO_Export void operator<<= (CORBA::Any &, const IOP::Encoding &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, IOP::Encoding*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Encoding *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::Encoding *&);
+// Any operators for interface IOP::CodecFactory
+TAO_Export void operator<<= (CORBA::Any &, IOP::CodecFactory_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, IOP::CodecFactory_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::CodecFactory_ptr &);
+TAO_Export void operator<<= (CORBA::Any &, const IOP::CodecFactory::UnknownEncoding &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, IOP::CodecFactory::UnknownEncoding*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::CodecFactory::UnknownEncoding *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::CodecFactory::UnknownEncoding *&);
 
 #ifndef __ACE_INLINE__
 
diff --git a/TAO/tao/Messaging_PolicyValueC.cpp b/TAO/tao/Messaging_PolicyValueC.cpp
index e5034b81ba9..4c555103fc7 100644
--- a/TAO/tao/Messaging_PolicyValueC.cpp
+++ b/TAO/tao/Messaging_PolicyValueC.cpp
@@ -357,120 +357,182 @@ TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (Messaging)
 TAO_NAMESPACE_DEFINE (const CORBA::ULong, INVOCATION_POLICIES, 2U)
 TAO_NAMESPACE_END
-void operator<<= (CORBA::Any &_tao_any, const Messaging::PolicyValue &_tao_elem) // copying
+
+// TAO_IDL - Generated from 
+// be/be_visitor_structure/any_op_cs.cpp:58
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const Messaging::PolicyValue &_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
-      Messaging::_tc_PolicyValue,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
-    );
+  
+  if (stream << _tao_elem)
+    {
+      _tao_any._tao_replace (
+          Messaging::_tc_PolicyValue,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin ()
+        );
+    }
 }
 
-void operator<<= (CORBA::Any &_tao_any, Messaging::PolicyValue *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    Messaging::PolicyValue *_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      Messaging::_tc_PolicyValue,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      Messaging::PolicyValue::_tao_any_destructor
-    );
+  
+  if (stream << *_tao_elem)
+    {
+      _tao_any._tao_replace (
+          Messaging::_tc_PolicyValue,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          _tao_elem,
+          Messaging::PolicyValue::_tao_any_destructor
+        );
+    }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::PolicyValue *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    Messaging::PolicyValue *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(const Messaging::PolicyValue*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast (
+      const Messaging::PolicyValue *&,
+      _tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::PolicyValue *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const Messaging::PolicyValue *&_tao_elem
+  )
 {
   _tao_elem = 0;
+  
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     
-    CORBA::Boolean result = type->equivalent (Messaging::_tc_PolicyValue ACE_ENV_ARG_PARAMETER);
+    CORBA::Boolean result =
+      type->equivalent (
+          Messaging::_tc_PolicyValue
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
     
-    if (!result)
-      return 0; // not equivalent
+    if (result == 0)
+      {
+        return 0; // not equivalent
+      }
     
     if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const Messaging::PolicyValue*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      Messaging::PolicyValue *tmp;
-      ACE_NEW_RETURN (tmp, Messaging::PolicyValue, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
       {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            Messaging::_tc_PolicyValue,
-            1,
-            ACE_static_cast (void *, tmp),
-            Messaging::PolicyValue::_tao_any_destructor
+        _tao_elem = ACE_static_cast (
+            const Messaging::PolicyValue*,
+            _tao_any.value ()
           );
-        _tao_elem = tmp;
+        
         return 1;
       }
-      else
+    else
       {
-        delete tmp;
+        Messaging::PolicyValue *tmp;
+        ACE_NEW_RETURN (
+            tmp,
+            Messaging::PolicyValue,
+            0
+          );
+        
+        TAO_InputCDR stream (
+            _tao_any._tao_get_cdr (),
+            _tao_any._tao_byte_order ()
+          );
+        
+        if (stream >> *tmp)
+          {
+            ((CORBA::Any *)&_tao_any)->_tao_replace (
+                Messaging::_tc_PolicyValue,
+                1,
+                ACE_static_cast (void *, tmp),
+                Messaging::PolicyValue::_tao_any_destructor
+              );
+            
+            _tao_elem = tmp;
+            return 1;
+          }
+        else
+          {
+            delete tmp;
+          }
       }
-    }
   }
   ACE_CATCHANY
   {
   }
   ACE_ENDTRY;
+  
   return 0;
 }
 
+
+// TAO_IDL - Generated from 
+// be/be_visitor_sequence/any_op_cs.cpp:61
+
+// Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
     const Messaging::PolicyValueSeq &_tao_elem
-  ) // copying
+  )
 {
   TAO_OutputCDR stream;
+  
   if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        Messaging::_tc_PolicyValueSeq,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
+    {
+      _tao_any._tao_replace (
+          Messaging::_tc_PolicyValueSeq,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin ()
+        );
+    }
 }
 
-void operator<<= (CORBA::Any &_tao_any, Messaging::PolicyValueSeq *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    Messaging::PolicyValueSeq *_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      Messaging::_tc_PolicyValueSeq,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      Messaging::PolicyValueSeq::_tao_any_destructor
-    );
+  
+  if (stream << *_tao_elem)
+    {
+      _tao_any._tao_replace (
+          Messaging::_tc_PolicyValueSeq,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          _tao_elem,
+          Messaging::PolicyValueSeq::_tao_any_destructor
+        );
+    }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::PolicyValueSeq *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    Messaging::PolicyValueSeq *&_tao_elem
+  )
 {
   return _tao_any >>= ACE_const_cast(
       const Messaging::PolicyValueSeq*&,
@@ -478,56 +540,76 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::PolicyValueSe
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::PolicyValueSeq *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const Messaging::PolicyValueSeq *&_tao_elem
+  )
 {
   _tao_elem = 0;
+  
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     
-    CORBA::Boolean result = type->equivalent (Messaging::_tc_PolicyValueSeq ACE_ENV_ARG_PARAMETER);
+    CORBA::Boolean result =
+      type->equivalent (
+          Messaging::_tc_PolicyValueSeq
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
     
     if (!result)
-      return 0; // not equivalent
+      {
+        return 0; // not equivalent
+      }
     
     if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const Messaging::PolicyValueSeq*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      Messaging::PolicyValueSeq *tmp;
-      ACE_NEW_RETURN (tmp, Messaging::PolicyValueSeq, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
       {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            Messaging::_tc_PolicyValueSeq,
-            1,
-            ACE_static_cast (void *, tmp),
-            Messaging::PolicyValueSeq::_tao_any_destructor
+        _tao_elem = ACE_static_cast(
+            const Messaging::PolicyValueSeq*,
+            _tao_any.value ()
           );
-        _tao_elem = tmp;
+        
         return 1;
       }
-      else
+    else
       {
-        delete tmp;
+        Messaging::PolicyValueSeq *tmp = 0;
+        ACE_NEW_RETURN (
+            tmp,
+            Messaging::PolicyValueSeq,
+            0
+          );
+        
+        TAO_InputCDR stream (
+            _tao_any._tao_get_cdr (),
+            _tao_any._tao_byte_order ()
+          );
+        
+        if (stream >> *tmp)
+          {
+            ((CORBA::Any *)&_tao_any)->_tao_replace (
+                Messaging::_tc_PolicyValueSeq,
+                1,
+                ACE_static_cast (void *, tmp),
+                Messaging::PolicyValueSeq::_tao_any_destructor
+              );
+            
+            _tao_elem = tmp;
+            return 1;
+          }
+        else
+          {
+            delete tmp;
+          }
       }
-    }
   }
   ACE_CATCHANY
   {
   }
   ACE_ENDTRY;
+  
   return 0;
 }
 
@@ -570,16 +652,16 @@ CORBA::Boolean operator>> (
   CORBA::ULong _tao_seq_len;
   if (strm >> _tao_seq_len)
   {
+    // Add a check to the length of the sequence
+    // to make sure it does not exceed the length
+    // of the stream. (See bug 1159.)
+    if (_tao_seq_len > strm.length())
+      return 0;
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // 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
     
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
@@ -636,16 +718,16 @@ CORBA::Boolean operator>> (
   CORBA::ULong _tao_seq_len;
   if (strm >> _tao_seq_len)
   {
+    // Add a check to the length of the sequence
+    // to make sure it does not exceed the length
+    // of the stream. (See bug 1159.)
+    if (_tao_seq_len > strm.length())
+      return 0;
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // 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/Messaging_PolicyValueC.h b/TAO/tao/Messaging_PolicyValueC.h
index 13c30689a1e..d00e33a7a3b 100644
--- a/TAO/tao/Messaging_PolicyValueC.h
+++ b/TAO/tao/Messaging_PolicyValueC.h
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_ORIG_MESSAGING_POLICYVALUEC_H_
-#define _TAO_IDL_ORIG_MESSAGING_POLICYVALUEC_H_
+#ifndef _TAO_IDL_MESSAGING_POLICYVALUEC_H_
+#define _TAO_IDL_MESSAGING_POLICYVALUEC_H_
 
 #include "ace/pre.h"
 #include "tao/corbafwd.h"
@@ -29,7 +29,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "TAO_Export.h"
+#include "tao/TAO_Export.h"
 #include "IOPC.h"
 #include "Sequence.h"
 
diff --git a/TAO/tao/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjectReferenceTemplateC.cpp
index 01c1006a746..a80aab64ccd 100644
--- a/TAO/tao/ObjectReferenceTemplateC.cpp
+++ b/TAO/tao/ObjectReferenceTemplateC.cpp
@@ -43,22 +43,24 @@
 static const CORBA::Long _oc_PortableInterceptor_ServerId[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65724964),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:PortableInterceptor/ServerId:1.0
+  45,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65724964), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/ServerId:1.0
   9,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65724964),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65724964), 
   ACE_NTOHL (0x0),  // name = ServerId
-  CORBA::tk_string,
+  CORBA::tk_string, 
   0U, // string length
 };
 
@@ -78,20 +80,22 @@ TAO_NAMESPACE_END
 static const CORBA::Long _oc_PortableInterceptor_ORBId[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  34,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x4f524249),
-  ACE_NTOHL (0x643a312e),
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:PortableInterceptor/ORBId:1.0
+  42,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x4f524249), 
+  ACE_NTOHL (0x643a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableInterceptor/ORBId:1.0
   6,
-  ACE_NTOHL (0x4f524249),
+  ACE_NTOHL (0x4f524249), 
   ACE_NTOHL (0x64000000),  // name = ORBId
-  CORBA::tk_string,
+  CORBA::tk_string, 
   0U, // string length
 };
 
@@ -111,41 +115,43 @@ TAO_NAMESPACE_END
 static const CORBA::Long _oc_PortableInterceptor_AdapterName[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x41646170),
-  ACE_NTOHL (0x7465724e),
-  ACE_NTOHL (0x616d653a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:PortableInterceptor/AdapterName:1.0
+  48,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x41646170), 
+  ACE_NTOHL (0x7465724e), 
+  ACE_NTOHL (0x616d653a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/AdapterName:1.0
   12,
-  ACE_NTOHL (0x41646170),
-  ACE_NTOHL (0x7465724e),
+  ACE_NTOHL (0x41646170), 
+  ACE_NTOHL (0x7465724e), 
   ACE_NTOHL (0x616d6500),  // name = AdapterName
   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 (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 (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,
 
@@ -168,36 +174,38 @@ TAO_NAMESPACE_END
 static const CORBA::Long _oc_PortableInterceptor_ObjectId[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63744964),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:PortableInterceptor/ObjectId:1.0
+  45,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63744964), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectId:1.0
   9,
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63744964),
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63744964), 
   ACE_NTOHL (0x0),  // name = ObjectId
   CORBA::tk_alias, // typecode kind for typedefs
   76, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f63),
-    ACE_NTOHL (0x74657453),
-    ACE_NTOHL (0x65713a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4f63), 
+    ACE_NTOHL (0x74657453), 
+    ACE_NTOHL (0x65713a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
     9,
-    ACE_NTOHL (0x4f637465),
-    ACE_NTOHL (0x74536571),
+    ACE_NTOHL (0x4f637465), 
+    ACE_NTOHL (0x74536571), 
     ACE_NTOHL (0x0),  // name = OctetSeq
     CORBA::tk_sequence, // typecode kind
     12, // encapsulation length
@@ -225,26 +233,28 @@ TAO_NAMESPACE_END
 static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceFactory[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  51,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636546),
-  ACE_NTOHL (0x6163746f),
-  ACE_NTOHL (0x72793a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:PortableInterceptor/ObjectReferenceFactory:1.0
+  59,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636546), 
+  ACE_NTOHL (0x6163746f), 
+  ACE_NTOHL (0x72793a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceFactory:1.0
   23,
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636546),
-  ACE_NTOHL (0x6163746f),
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636546), 
+  ACE_NTOHL (0x6163746f), 
   ACE_NTOHL (0x72790000),  // name = ObjectReferenceFactory
   2, // value modifier
   CORBA::tk_null, // no stateful base valuetype
@@ -281,7 +291,7 @@ PortableInterceptor::ObjectReferenceFactory_var::ObjectReferenceFactory_var (con
   : ptr_ (ACE_const_cast(ObjectReferenceFactory*, p))
 {}
 
-PortableInterceptor::ObjectReferenceFactory*
+PortableInterceptor::ObjectReferenceFactory* 
 PortableInterceptor::ObjectReferenceFactory_var::ptr (void) const
 {
   return this->ptr_;
@@ -324,12 +334,12 @@ PortableInterceptor::ObjectReferenceFactory_var::operator const PortableIntercep
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceFactory_var::operator PortableInterceptor::ObjectReferenceFactory* () // cast
+PortableInterceptor::ObjectReferenceFactory_var::operator PortableInterceptor::ObjectReferenceFactory* () // cast 
 {
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceFactory*
+PortableInterceptor::ObjectReferenceFactory* 
 PortableInterceptor::ObjectReferenceFactory_var::operator-> (void) const
 {
   return this->ptr_;
@@ -355,7 +365,7 @@ PortableInterceptor::ObjectReferenceFactory_var::out (void)
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceFactory*
+PortableInterceptor::ObjectReferenceFactory* 
 PortableInterceptor::ObjectReferenceFactory_var::_retn (void)
 {
   // yield ownership of managed obj reference
@@ -419,7 +429,7 @@ PortableInterceptor::ObjectReferenceFactory_out::ptr (void) // ptr
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceFactory*
+PortableInterceptor::ObjectReferenceFactory* 
 PortableInterceptor::ObjectReferenceFactory_out::operator-> (void)
 {
   return this->ptr_;
@@ -444,17 +454,6 @@ void* PortableInterceptor::ObjectReferenceFactory::_tao_obv_narrow (ptr_arith_t
   return rval;
 }
 
-CORBA::Boolean PortableInterceptor::ObjectReferenceFactory::_tao_marshal_v (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-
-CORBA::Boolean PortableInterceptor::ObjectReferenceFactory::_tao_unmarshal_v (TAO_InputCDR &)
-{
-  return 0;
-}
-
 void
 PortableInterceptor::ObjectReferenceFactory::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -492,26 +491,28 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceFactory::_tao_unmarshal (TAO_
 static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplate[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  52,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636554),
-  ACE_NTOHL (0x656d706c),
-  ACE_NTOHL (0x6174653a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:PortableInterceptor/ObjectReferenceTemplate:1.0
+  60,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636554), 
+  ACE_NTOHL (0x656d706c), 
+  ACE_NTOHL (0x6174653a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0
   24,
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636554),
-  ACE_NTOHL (0x656d706c),
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636554), 
+  ACE_NTOHL (0x656d706c), 
   ACE_NTOHL (0x61746500),  // name = ObjectReferenceTemplate
   2, // value modifier
   CORBA::tk_null, // no stateful base valuetype
@@ -548,7 +549,7 @@ PortableInterceptor::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (c
   : ptr_ (ACE_const_cast(ObjectReferenceTemplate*, p))
 {}
 
-PortableInterceptor::ObjectReferenceTemplate*
+PortableInterceptor::ObjectReferenceTemplate* 
 PortableInterceptor::ObjectReferenceTemplate_var::ptr (void) const
 {
   return this->ptr_;
@@ -591,12 +592,12 @@ PortableInterceptor::ObjectReferenceTemplate_var::operator const PortableInterce
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceTemplate_var::operator PortableInterceptor::ObjectReferenceTemplate* () // cast
+PortableInterceptor::ObjectReferenceTemplate_var::operator PortableInterceptor::ObjectReferenceTemplate* () // cast 
 {
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceTemplate*
+PortableInterceptor::ObjectReferenceTemplate* 
 PortableInterceptor::ObjectReferenceTemplate_var::operator-> (void) const
 {
   return this->ptr_;
@@ -622,7 +623,7 @@ PortableInterceptor::ObjectReferenceTemplate_var::out (void)
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceTemplate*
+PortableInterceptor::ObjectReferenceTemplate* 
 PortableInterceptor::ObjectReferenceTemplate_var::_retn (void)
 {
   // yield ownership of managed obj reference
@@ -686,7 +687,7 @@ PortableInterceptor::ObjectReferenceTemplate_out::ptr (void) // ptr
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceTemplate*
+PortableInterceptor::ObjectReferenceTemplate* 
 PortableInterceptor::ObjectReferenceTemplate_out::operator-> (void)
 {
   return this->ptr_;
@@ -713,16 +714,6 @@ void* PortableInterceptor::ObjectReferenceTemplate::_tao_obv_narrow (ptr_arith_t
   return rval;
 }
 
-CORBA::Boolean PortableInterceptor::ObjectReferenceTemplate::_tao_marshal_v (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-CORBA::Boolean PortableInterceptor::ObjectReferenceTemplate::_tao_unmarshal_v (TAO_InputCDR &)
-{
-  return 0;
-}
-
 void
 PortableInterceptor::ObjectReferenceTemplate::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -769,7 +760,7 @@ PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_Objec
 {
   PortableInterceptor::ObjectReferenceTemplate **tmp = 0;
   tmp = _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (length);
-
+  
   if (this->buffer_ != 0)
   {
     PortableInterceptor::ObjectReferenceTemplate **old = ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate**, this->buffer_);
@@ -786,7 +777,7 @@ PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_Objec
             tmp[i] = old[i];
           }
       }
-
+    
     if (this->release_)
       {
         delete[] old;
@@ -801,14 +792,14 @@ PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_Objec
   if (this->buffer_ == 0 || this->release_ == 0)
     return;
   PortableInterceptor::ObjectReferenceTemplate **tmp = ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate**, this->buffer_);
-
+  
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
       if (tmp[i] != 0)
         tmp[i]->_remove_ref ();
       tmp[i] = 0;
     }
-
+  
   _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::freebuf (tmp);
   this->buffer_ = 0;
 }
@@ -822,7 +813,7 @@ void
 PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
 {
   PortableInterceptor::ObjectReferenceTemplate **tmp = ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate**, this->buffer_);
-
+  
   for (CORBA::ULong i = nl; i < ol; ++i)
     {
       if (tmp[i] != 0)
@@ -835,7 +826,7 @@ PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_Objec
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_
@@ -847,30 +838,30 @@ PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_Objec
 PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (void)
 {}
 PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (CORBA::ULong max) // uses max size
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Valuetype_Sequence<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (CORBA::ULong max, CORBA::ULong length, PortableInterceptor::ObjectReferenceTemplate_ptr *buffer, CORBA::Boolean release)
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Valuetype_Sequence<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (const ObjectReferenceTemplateSeq &seq) // copy ctor
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Valuetype_Sequence<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 PortableInterceptor::ObjectReferenceTemplateSeq::~ObjectReferenceTemplateSeq (void) // dtor
@@ -887,55 +878,59 @@ void PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor (void
 static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplateSeq[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  55,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636554),
-  ACE_NTOHL (0x656d706c),
-  ACE_NTOHL (0x61746553),
-  ACE_NTOHL (0x65713a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:PortableInterceptor/ObjectReferenceTemplateSeq:1.0
+  63,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636554), 
+  ACE_NTOHL (0x656d706c), 
+  ACE_NTOHL (0x61746553), 
+  ACE_NTOHL (0x65713a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplateSeq:1.0
   27,
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636554),
-  ACE_NTOHL (0x656d706c),
-  ACE_NTOHL (0x61746553),
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636554), 
+  ACE_NTOHL (0x656d706c), 
+  ACE_NTOHL (0x61746553), 
   ACE_NTOHL (0x65710000),  // name = ObjectReferenceTemplateSeq
   CORBA::tk_sequence, // typecode kind
-  116, // encapsulation length
+  124, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_value, // typecode kind
-    448, // encapsulation length
+    480, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      52,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x506f7274),
-      ACE_NTOHL (0x61626c65),
-      ACE_NTOHL (0x496e7465),
-      ACE_NTOHL (0x72636570),
-      ACE_NTOHL (0x746f722f),
-      ACE_NTOHL (0x4f626a65),
-      ACE_NTOHL (0x63745265),
-      ACE_NTOHL (0x66657265),
-      ACE_NTOHL (0x6e636554),
-      ACE_NTOHL (0x656d706c),
-      ACE_NTOHL (0x6174653a),
-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:PortableInterceptor/ObjectReferenceTemplate:1.0
+      60,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x506f7274), 
+      ACE_NTOHL (0x61626c65), 
+      ACE_NTOHL (0x496e7465), 
+      ACE_NTOHL (0x72636570), 
+      ACE_NTOHL (0x746f722f), 
+      ACE_NTOHL (0x4f626a65), 
+      ACE_NTOHL (0x63745265), 
+      ACE_NTOHL (0x66657265), 
+      ACE_NTOHL (0x6e636554), 
+      ACE_NTOHL (0x656d706c), 
+      ACE_NTOHL (0x6174653a), 
+      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0
       24,
-      ACE_NTOHL (0x4f626a65),
-      ACE_NTOHL (0x63745265),
-      ACE_NTOHL (0x66657265),
-      ACE_NTOHL (0x6e636554),
-      ACE_NTOHL (0x656d706c),
+      ACE_NTOHL (0x4f626a65), 
+      ACE_NTOHL (0x63745265), 
+      ACE_NTOHL (0x66657265), 
+      ACE_NTOHL (0x6e636554), 
+      ACE_NTOHL (0x656d706c), 
       ACE_NTOHL (0x61746500),  // name = ObjectReferenceTemplate
       2, // value modifier
       CORBA::tk_null, // no stateful base valuetype
@@ -962,24 +957,26 @@ TAO_NAMESPACE_END
 static const CORBA::Long _oc_PortableInterceptor_AdapterManagerId[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  45,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x41646170),
-  ACE_NTOHL (0x7465724d),
-  ACE_NTOHL (0x616e6167),
-  ACE_NTOHL (0x65724964),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:PortableInterceptor/AdapterManagerId:1.0
+  53,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x41646170), 
+  ACE_NTOHL (0x7465724d), 
+  ACE_NTOHL (0x616e6167), 
+  ACE_NTOHL (0x65724964), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/AdapterManagerId:1.0
   17,
-  ACE_NTOHL (0x41646170),
-  ACE_NTOHL (0x7465724d),
-  ACE_NTOHL (0x616e6167),
-  ACE_NTOHL (0x65724964),
+  ACE_NTOHL (0x41646170), 
+  ACE_NTOHL (0x7465724d), 
+  ACE_NTOHL (0x616e6167), 
+  ACE_NTOHL (0x65724964), 
   ACE_NTOHL (0x0),  // name = AdapterManagerId
   CORBA::tk_long,
 
@@ -1001,22 +998,24 @@ TAO_NAMESPACE_END
 static const CORBA::Long _oc_PortableInterceptor_AdapterState[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  41,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x41646170),
-  ACE_NTOHL (0x74657253),
-  ACE_NTOHL (0x74617465),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:PortableInterceptor/AdapterState:1.0
+  49,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x41646170), 
+  ACE_NTOHL (0x74657253), 
+  ACE_NTOHL (0x74617465), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/AdapterState:1.0
   13,
-  ACE_NTOHL (0x41646170),
-  ACE_NTOHL (0x74657253),
-  ACE_NTOHL (0x74617465),
+  ACE_NTOHL (0x41646170), 
+  ACE_NTOHL (0x74657253), 
+  ACE_NTOHL (0x74617465), 
   ACE_NTOHL (0x0),  // name = AdapterState
   CORBA::tk_short,
 
@@ -1062,7 +1061,7 @@ operator<<= (CORBA::Any &any, PortableInterceptor::ObjectReferenceFactory *value
   if (stream << value)
   {
     any._tao_replace (
-        PortableInterceptor::_tc_ObjectReferenceFactory,
+        PortableInterceptor::_tc_ObjectReferenceFactory, 
         TAO_ENCAP_BYTE_ORDER,
         stream.begin ());
   }
@@ -1075,7 +1074,7 @@ operator<<= (CORBA::Any &any, PortableInterceptor::ObjectReferenceFactory **valu
   if (stream << *value)
   {
     any._tao_replace (
-        PortableInterceptor::_tc_ObjectReferenceFactory,
+        PortableInterceptor::_tc_ObjectReferenceFactory, 
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -1091,10 +1090,10 @@ operator>>= (const CORBA::Any &any, PortableInterceptor::ObjectReferenceFactory
   {
     value = 0;
     CORBA::TypeCode_var type = any.type ();
-
+    
     CORBA::Boolean result = type->equivalent (PortableInterceptor::_tc_ObjectReferenceFactory ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-
+    
     if (!result)
     {
       return 0; // not equivalent
@@ -1125,7 +1124,7 @@ operator>>= (const CORBA::Any &any, PortableInterceptor::ObjectReferenceFactory
         value = tmp;
         return 1;
       }
-
+      
     }
   }
   ACE_CATCHANY
@@ -1149,7 +1148,7 @@ operator<<= (CORBA::Any &any, PortableInterceptor::ObjectReferenceTemplate *valu
   if (stream << value)
   {
     any._tao_replace (
-        PortableInterceptor::_tc_ObjectReferenceTemplate,
+        PortableInterceptor::_tc_ObjectReferenceTemplate, 
         TAO_ENCAP_BYTE_ORDER,
         stream.begin ());
   }
@@ -1162,7 +1161,7 @@ operator<<= (CORBA::Any &any, PortableInterceptor::ObjectReferenceTemplate **val
   if (stream << *value)
   {
     any._tao_replace (
-        PortableInterceptor::_tc_ObjectReferenceTemplate,
+        PortableInterceptor::_tc_ObjectReferenceTemplate, 
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -1178,10 +1177,10 @@ operator>>= (const CORBA::Any &any, PortableInterceptor::ObjectReferenceTemplate
   {
     value = 0;
     CORBA::TypeCode_var type = any.type ();
-
+    
     CORBA::Boolean result = type->equivalent (PortableInterceptor::_tc_ObjectReferenceTemplate ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-
+    
     if (!result)
     {
       return 0; // not equivalent
@@ -1212,7 +1211,7 @@ operator>>= (const CORBA::Any &any, PortableInterceptor::ObjectReferenceTemplate
         value = tmp;
         return 1;
       }
-
+      
     }
   }
   ACE_CATCHANY
@@ -1229,37 +1228,54 @@ operator>>= (const CORBA::Any &any, PortableInterceptor::ObjectReferenceTemplate
   #  pragma instantiate TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+
+// TAO_IDL - Generated from 
+// be/be_visitor_sequence/any_op_cs.cpp:61
+
+// Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
     const PortableInterceptor::ObjectReferenceTemplateSeq &_tao_elem
-  ) // copying
+  )
 {
   TAO_OutputCDR stream;
+  
   if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        PortableInterceptor::_tc_ObjectReferenceTemplateSeq,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
+    {
+      _tao_any._tao_replace (
+          PortableInterceptor::_tc_ObjectReferenceTemplateSeq,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin ()
+        );
+    }
 }
 
-void operator<<= (CORBA::Any &_tao_any, PortableInterceptor::ObjectReferenceTemplateSeq *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ObjectReferenceTemplateSeq *_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      PortableInterceptor::_tc_ObjectReferenceTemplateSeq,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor
-    );
+  
+  if (stream << *_tao_elem)
+    {
+      _tao_any._tao_replace (
+          PortableInterceptor::_tc_ObjectReferenceTemplateSeq,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          _tao_elem,
+          PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor
+        );
+    }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableInterceptor::ObjectReferenceTemplateSeq *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::ObjectReferenceTemplateSeq *&_tao_elem
+  )
 {
   return _tao_any >>= ACE_const_cast(
       const PortableInterceptor::ObjectReferenceTemplateSeq*&,
@@ -1267,56 +1283,76 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableInterceptor::Obj
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableInterceptor::ObjectReferenceTemplateSeq *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const PortableInterceptor::ObjectReferenceTemplateSeq *&_tao_elem
+  )
 {
   _tao_elem = 0;
+  
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (PortableInterceptor::_tc_ObjectReferenceTemplateSeq ACE_ENV_ARG_PARAMETER);
+    
+    CORBA::Boolean result =
+      type->equivalent (
+          PortableInterceptor::_tc_ObjectReferenceTemplateSeq
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
-
+    
     if (!result)
-      return 0; // not equivalent
-
+      {
+        return 0; // not equivalent
+      }
+    
     if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const PortableInterceptor::ObjectReferenceTemplateSeq*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      PortableInterceptor::ObjectReferenceTemplateSeq *tmp;
-      ACE_NEW_RETURN (tmp, PortableInterceptor::ObjectReferenceTemplateSeq, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
       {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            PortableInterceptor::_tc_ObjectReferenceTemplateSeq,
-            1,
-            ACE_static_cast (void *, tmp),
-            PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor
+        _tao_elem = ACE_static_cast(
+            const PortableInterceptor::ObjectReferenceTemplateSeq*,
+            _tao_any.value ()
           );
-        _tao_elem = tmp;
+        
         return 1;
       }
-      else
+    else
       {
-        delete tmp;
+        PortableInterceptor::ObjectReferenceTemplateSeq *tmp = 0;
+        ACE_NEW_RETURN (
+            tmp,
+            PortableInterceptor::ObjectReferenceTemplateSeq,
+            0
+          );
+        
+        TAO_InputCDR stream (
+            _tao_any._tao_get_cdr (),
+            _tao_any._tao_byte_order ()
+          );
+        
+        if (stream >> *tmp)
+          {
+            ((CORBA::Any *)&_tao_any)->_tao_replace (
+                PortableInterceptor::_tc_ObjectReferenceTemplateSeq,
+                1,
+                ACE_static_cast (void *, tmp),
+                PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor
+              );
+            
+            _tao_elem = tmp;
+            return 1;
+          }
+        else
+          {
+            delete tmp;
+          }
       }
-    }
   }
   ACE_CATCHANY
   {
   }
   ACE_ENDTRY;
+  
   return 0;
 }
 
@@ -1414,16 +1450,16 @@ CORBA::Boolean operator>> (
   CORBA::ULong _tao_seq_len;
   if (strm >> _tao_seq_len)
   {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // 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.)
+    // of the stream. (See bug 1159.)
     if (_tao_seq_len > strm.length())
       return 0;
+    // set the length of the sequence
+    _tao_sequence.length (_tao_seq_len);
+    // If length is 0 we return true.
+    if (0 >= _tao_seq_len) 
+      return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
@@ -1434,3 +1470,4 @@ CORBA::Boolean operator>> (
   }
   return 0; // error
 }
+
diff --git a/TAO/tao/ObjectReferenceTemplateC.h b/TAO/tao/ObjectReferenceTemplateC.h
index 618cb9d1760..d32217bbbe3 100644
--- a/TAO/tao/ObjectReferenceTemplateC.h
+++ b/TAO/tao/ObjectReferenceTemplateC.h
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATEC_H_
-#define _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATEC_H_
+#ifndef _TAO_IDL_OBJECTREFERENCETEMPLATEC_H_
+#define _TAO_IDL_OBJECTREFERENCETEMPLATEC_H_
 
 #include "ace/pre.h"
 #include "tao/corbafwd.h"
@@ -29,7 +29,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "TAO_Export.h"
+#include "tao/TAO_Export.h"
 #include "OctetSeqC.h"
 #include "StringSeqC.h"
 #include "ValueBase.h"
@@ -176,342 +176,326 @@ TAO_NAMESPACE  PortableInterceptor
     
     virtual CORBA::Object_ptr make_object (
         const char *, const PortableInterceptor::ObjectId & ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        )) = 0;
-    
-  protected:
-    ObjectReferenceFactory ();
-    virtual ~ObjectReferenceFactory ();
-
-    // TAO internals
-    virtual void *_tao_obv_narrow (ptr_arith_t);
-    virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &);
-    virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
-
-  private:
-    ObjectReferenceFactory (const ObjectReferenceFactory &);
-    void operator= (const ObjectReferenceFactory &);
-    
-  };
+      ) = 0;
   
-#endif /* end #if !defined */
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceFactory;
+protected:
+  ObjectReferenceFactory ();
+  virtual ~ObjectReferenceFactory ();
+
+  // TAO internals
+  virtual void *_tao_obv_narrow (ptr_arith_t);
   
-  // Valuetype class
-  class ObjectReferenceTemplate;
+private:
+  ObjectReferenceFactory (const ObjectReferenceFactory &);
+  void operator= (const ObjectReferenceFactory &);
   
+};
+
+#endif /* end #if !defined */
+
+TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceFactory;
+
+// Valuetype class
+class ObjectReferenceTemplate;
+
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___PTR_CH_
-  
-  typedef ObjectReferenceTemplate *ObjectReferenceTemplate_ptr;
-  
+
+typedef ObjectReferenceTemplate *ObjectReferenceTemplate_ptr;
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___VAR_CH_
-  
-  class TAO_Export ObjectReferenceTemplate_var
-  {
-  public:
-    ObjectReferenceTemplate_var (void); // default constructor
-    ObjectReferenceTemplate_var (ObjectReferenceTemplate*);
-    ObjectReferenceTemplate_var (const ObjectReferenceTemplate*); // (TAO extension)
-    ObjectReferenceTemplate_var (const ObjectReferenceTemplate_var &); // copy constructor
-    ~ObjectReferenceTemplate_var (void); // destructor
-    
-    ObjectReferenceTemplate_var &operator= (ObjectReferenceTemplate*);
-    ObjectReferenceTemplate_var &operator= (const ObjectReferenceTemplate_var &);
-    ObjectReferenceTemplate* operator-> (void) const;
-    
-    operator const ObjectReferenceTemplate* () const;
-    operator ObjectReferenceTemplate* ();
-    // in, inout, out, _retn 
-    ObjectReferenceTemplate* in (void) const;
-    ObjectReferenceTemplate* &inout (void);
-    ObjectReferenceTemplate* &out (void);
-    ObjectReferenceTemplate* _retn (void);
-    ObjectReferenceTemplate* ptr (void) const;
-  
-  private:
-    ObjectReferenceTemplate* ptr_;
-  };
-  
-  
+
+class TAO_Export ObjectReferenceTemplate_var
+{
+public:
+  ObjectReferenceTemplate_var (void); // default constructor
+  ObjectReferenceTemplate_var (ObjectReferenceTemplate*);
+  ObjectReferenceTemplate_var (const ObjectReferenceTemplate*); // (TAO extension)
+  ObjectReferenceTemplate_var (const ObjectReferenceTemplate_var &); // copy constructor
+  ~ObjectReferenceTemplate_var (void); // destructor
+  
+  ObjectReferenceTemplate_var &operator= (ObjectReferenceTemplate*);
+  ObjectReferenceTemplate_var &operator= (const ObjectReferenceTemplate_var &);
+  ObjectReferenceTemplate* operator-> (void) const;
+  
+  operator const ObjectReferenceTemplate* () const;
+  operator ObjectReferenceTemplate* ();
+  // in, inout, out, _retn 
+  ObjectReferenceTemplate* in (void) const;
+  ObjectReferenceTemplate* &inout (void);
+  ObjectReferenceTemplate* &out (void);
+  ObjectReferenceTemplate* _retn (void);
+  ObjectReferenceTemplate* ptr (void) const;
+
+private:
+  ObjectReferenceTemplate* ptr_;
+};
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___OUT_CH_
-  
-  class TAO_Export ObjectReferenceTemplate_out
-  {
-  public:
-    ObjectReferenceTemplate_out (ObjectReferenceTemplate* &);
-    ObjectReferenceTemplate_out (ObjectReferenceTemplate_var &);
-    ObjectReferenceTemplate_out (const ObjectReferenceTemplate_out &);
-    ObjectReferenceTemplate_out &operator= (const ObjectReferenceTemplate_out &);
-    ObjectReferenceTemplate_out &operator= (const ObjectReferenceTemplate_var &);
-    ObjectReferenceTemplate_out &operator= (ObjectReferenceTemplate*);
-    operator ObjectReferenceTemplate* &();
-    ObjectReferenceTemplate* &ptr (void);
-    ObjectReferenceTemplate* operator-> (void);
-    
-  private:
-    ObjectReferenceTemplate* &ptr_;
-  };
-  
-  
+
+class TAO_Export ObjectReferenceTemplate_out
+{
+public:
+  ObjectReferenceTemplate_out (ObjectReferenceTemplate* &);
+  ObjectReferenceTemplate_out (ObjectReferenceTemplate_var &);
+  ObjectReferenceTemplate_out (const ObjectReferenceTemplate_out &);
+  ObjectReferenceTemplate_out &operator= (const ObjectReferenceTemplate_out &);
+  ObjectReferenceTemplate_out &operator= (const ObjectReferenceTemplate_var &);
+  ObjectReferenceTemplate_out &operator= (ObjectReferenceTemplate*);
+  operator ObjectReferenceTemplate* &();
+  ObjectReferenceTemplate* &ptr (void);
+  ObjectReferenceTemplate* operator-> (void);
+  
+private:
+  ObjectReferenceTemplate* &ptr_;
+};
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_
+
+class TAO_Export ObjectReferenceTemplate
+  : public virtual ObjectReferenceFactory
+{
+public:
   
-  class TAO_Export ObjectReferenceTemplate
-    : public virtual ObjectReferenceFactory
-  {
-  public:
-    
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef ObjectReferenceTemplate* _ptr_type;
-    typedef ObjectReferenceTemplate_var _var_type;
+  typedef ObjectReferenceTemplate* _ptr_type;
+  typedef ObjectReferenceTemplate_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    static ObjectReferenceTemplate* _downcast (CORBA::ValueBase* );
-    // The address of static _downcast is implicit used as type id
-
-    // (TAO extensions or internals)
-    static CORBA::Boolean _tao_unmarshal (
-        TAO_InputCDR &,
-        ObjectReferenceTemplate *&
-      );
-    virtual const char* _tao_obv_repository_id () const;
-    static const char* _tao_obv_static_repository_id ();
-    
-    static void _tao_any_destructor (void *);
-    
-    virtual char * server_id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        )) = 0;
-    virtual char * orb_id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        )) = 0;
-    virtual ::PortableInterceptor::AdapterName * adapter_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        )) = 0;
-    
-  protected:
-    ObjectReferenceTemplate ();
-    virtual ~ObjectReferenceTemplate ();
-
-    // TAO internals
-    virtual void *_tao_obv_narrow (ptr_arith_t);
-    virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &);
-    virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
+  
+  static ObjectReferenceTemplate* _downcast (CORBA::ValueBase* );
+  // The address of static _downcast is implicit used as type id
 
-  private:
-    ObjectReferenceTemplate (const ObjectReferenceTemplate &);
-    void operator= (const ObjectReferenceTemplate &);
-    
-  };
+  // (TAO extensions or internals)
+  static CORBA::Boolean _tao_unmarshal (
+      TAO_InputCDR &,
+      ObjectReferenceTemplate *&
+    );
+  virtual const char* _tao_obv_repository_id () const;
+  static const char* _tao_obv_static_repository_id ();
   
-#endif /* end #if !defined */
+  static void _tao_any_destructor (void *);
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate;
+  virtual char * server_id (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    ) = 0;
+virtual char * orb_id (
+    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+  ) = 0;
+virtual ::PortableInterceptor::AdapterName * adapter_name (
+    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+  ) = 0;
+
+protected:
+  ObjectReferenceTemplate ();
+  virtual ~ObjectReferenceTemplate ();
+
+  // TAO internals
+  virtual void *_tao_obv_narrow (ptr_arith_t);
   
+private:
+  ObjectReferenceTemplate (const ObjectReferenceTemplate &);
+  void operator= (const ObjectReferenceTemplate &);
   
+};
+
+#endif /* end #if !defined */
+
+TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate;
+
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_VALUETYPE_SEQUENCE_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_)
 #define __TAO_UNBOUNDED_VALUETYPE_SEQUENCE_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_
-  
-  class TAO_EXPORT_MACRO _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    // = Initialization and termination methods.
-    _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (void);
-    _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        ObjectReferenceTemplate* *value,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (
-        const _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &rhs
-      );
-    _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &operator= (
-        const _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (void);
-    
-    // = Accessors.
-    TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var> operator[] (CORBA::ULong index) const;
-    
-    // = Static operations.
-    static ObjectReferenceTemplate **allocbuf (CORBA::ULong nelems);
-    static void freebuf (ObjectReferenceTemplate **buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    ObjectReferenceTemplate* *get_buffer (CORBA::Boolean orphan = 0);
-    const ObjectReferenceTemplate* *get_buffer (void) const;
-    virtual void _shrink_buffer (
-        CORBA::ULong nl,
-        CORBA::ULong ol
-      );
-    
-    
-  };
-  
+
+class TAO_EXPORT_MACRO _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq
+  : public TAO_Unbounded_Base_Sequence
+{
+public:
+  // = Initialization and termination methods.
+  _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (void);
+  _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (CORBA::ULong maximum);
+  _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (
+      CORBA::ULong maximum,
+      CORBA::ULong length,
+      ObjectReferenceTemplate* *value,
+      CORBA::Boolean release = 0
+    );
+  _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (
+      const _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &rhs
+    );
+  _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &operator= (
+      const _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &rhs
+    );
+  virtual ~_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (void);
+  
+  // = Accessors.
+  TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var> operator[] (CORBA::ULong index) const;
+  
+  // = Static operations.
+  static ObjectReferenceTemplate **allocbuf (CORBA::ULong nelems);
+  static void freebuf (ObjectReferenceTemplate **buffer);
+  
+  // Implement the TAO_Base_Sequence methods (see Sequence.h)
+  virtual void _allocate_buffer (CORBA::ULong length);
+  virtual void _deallocate_buffer (void);
+  ObjectReferenceTemplate* *get_buffer (CORBA::Boolean orphan = 0);
+  const ObjectReferenceTemplate* *get_buffer (void) const;
+  virtual void _shrink_buffer (
+      CORBA::ULong nl,
+      CORBA::ULong ol
+    );
+  
+  
+};
+
 #endif /* end #if !defined */
-  
-  
+
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_
-  
-  class ObjectReferenceTemplateSeq;
-  class ObjectReferenceTemplateSeq_var;
-  
-  // *************************************************************
-  // ObjectReferenceTemplateSeq
-  // *************************************************************
-  
-  class TAO_Export ObjectReferenceTemplateSeq : public 
+
+class ObjectReferenceTemplateSeq;
+class ObjectReferenceTemplateSeq_var;
+
+// *************************************************************
+// ObjectReferenceTemplateSeq
+// *************************************************************
+
+class TAO_Export ObjectReferenceTemplateSeq : public 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq
+_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Valuetype_Sequence<ObjectReferenceTemplate,ObjectReferenceTemplate_var>
+TAO_Unbounded_Valuetype_Sequence<ObjectReferenceTemplate,ObjectReferenceTemplate_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  {
-  public:
-    ObjectReferenceTemplateSeq (void); // default ctor
-    ObjectReferenceTemplateSeq (CORBA::ULong max); // uses max size
-    ObjectReferenceTemplateSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        ObjectReferenceTemplate_ptr *buffer, 
-        CORBA::Boolean release = 0
-      );
-    ObjectReferenceTemplateSeq (const ObjectReferenceTemplateSeq &); // copy ctor
-    ~ObjectReferenceTemplateSeq (void);
-    static void _tao_any_destructor (void*);
-    
+{
+public:
+  ObjectReferenceTemplateSeq (void); // default ctor
+  ObjectReferenceTemplateSeq (CORBA::ULong max); // uses max size
+  ObjectReferenceTemplateSeq (
+      CORBA::ULong max, 
+      CORBA::ULong length, 
+      ObjectReferenceTemplate_ptr *buffer, 
+      CORBA::Boolean release = 0
+    );
+  ObjectReferenceTemplateSeq (const ObjectReferenceTemplateSeq &); // copy ctor
+  ~ObjectReferenceTemplateSeq (void);
+  static void _tao_any_destructor (void*);
+  
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef ObjectReferenceTemplateSeq_var _var_type;
+  typedef ObjectReferenceTemplateSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
-  };
-  
-#endif /* end #if !defined */
   
   
+};
+
+#endif /* end #if !defined */
+
+
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ___VAR_CH_
+
+// *************************************************************
+// class PortableInterceptor::ObjectReferenceTemplateSeq_var
+// *************************************************************
+
+class TAO_Export ObjectReferenceTemplateSeq_var
+{
+public:
+  ObjectReferenceTemplateSeq_var (void);
+  ObjectReferenceTemplateSeq_var (ObjectReferenceTemplateSeq *);
+  ObjectReferenceTemplateSeq_var (const ObjectReferenceTemplateSeq_var &);
+  ~ObjectReferenceTemplateSeq_var (void);
   
-  // *************************************************************
-  // class PortableInterceptor::ObjectReferenceTemplateSeq_var
-  // *************************************************************
+  ObjectReferenceTemplateSeq_var &operator= (ObjectReferenceTemplateSeq *);
+  ObjectReferenceTemplateSeq_var &operator= (const ObjectReferenceTemplateSeq_var &);
+  ObjectReferenceTemplateSeq *operator-> (void);
+  const ObjectReferenceTemplateSeq *operator-> (void) const;
   
-  class TAO_Export ObjectReferenceTemplateSeq_var
-  {
-  public:
-    ObjectReferenceTemplateSeq_var (void);
-    ObjectReferenceTemplateSeq_var (ObjectReferenceTemplateSeq *);
-    ObjectReferenceTemplateSeq_var (const ObjectReferenceTemplateSeq_var &);
-    ~ObjectReferenceTemplateSeq_var (void);
-    
-    ObjectReferenceTemplateSeq_var &operator= (ObjectReferenceTemplateSeq *);
-    ObjectReferenceTemplateSeq_var &operator= (const ObjectReferenceTemplateSeq_var &);
-    ObjectReferenceTemplateSeq *operator-> (void);
-    const ObjectReferenceTemplateSeq *operator-> (void) const;
-    
-    operator const ObjectReferenceTemplateSeq &() const;
-    operator ObjectReferenceTemplateSeq &();
-    operator ObjectReferenceTemplateSeq &() const;
-    operator ObjectReferenceTemplateSeq *&(); // variable-size base types only
-    
-    TAO_Valuetype_Manager<ObjectReferenceTemplate, ObjectReferenceTemplate_var> operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
-    const ObjectReferenceTemplateSeq &in (void) const;
-    ObjectReferenceTemplateSeq &inout (void);
-    ObjectReferenceTemplateSeq *&out (void);
-    ObjectReferenceTemplateSeq *_retn (void);
-    ObjectReferenceTemplateSeq *ptr (void) const;
-  
-  private:
-    ObjectReferenceTemplateSeq *ptr_;
-  };
+  operator const ObjectReferenceTemplateSeq &() const;
+  operator ObjectReferenceTemplateSeq &();
+  operator ObjectReferenceTemplateSeq &() const;
+  operator ObjectReferenceTemplateSeq *&(); // variable-size base types only
   
+  TAO_Valuetype_Manager<ObjectReferenceTemplate, ObjectReferenceTemplate_var> operator[] (CORBA::ULong index);
   
+  // in, inout, out, _retn 
+  const ObjectReferenceTemplateSeq &in (void) const;
+  ObjectReferenceTemplateSeq &inout (void);
+  ObjectReferenceTemplateSeq *&out (void);
+  ObjectReferenceTemplateSeq *_retn (void);
+  ObjectReferenceTemplateSeq *ptr (void) const;
+
+private:
+  ObjectReferenceTemplateSeq *ptr_;
+};
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ___OUT_CH_
-  
-  class TAO_Export ObjectReferenceTemplateSeq_out
-  {
-  public:
-    ObjectReferenceTemplateSeq_out (ObjectReferenceTemplateSeq *&);
-    ObjectReferenceTemplateSeq_out (ObjectReferenceTemplateSeq_var &);
-    ObjectReferenceTemplateSeq_out (const ObjectReferenceTemplateSeq_out &);
-    ObjectReferenceTemplateSeq_out &operator= (const ObjectReferenceTemplateSeq_out &);
-    ObjectReferenceTemplateSeq_out &operator= (ObjectReferenceTemplateSeq *);
-    operator ObjectReferenceTemplateSeq *&();
-    ObjectReferenceTemplateSeq *&ptr (void);
-    ObjectReferenceTemplateSeq *operator-> (void);
-    TAO_Valuetype_Manager<ObjectReferenceTemplate, ObjectReferenceTemplate_var> operator[] (CORBA::ULong index);
-  
-  private:
-    ObjectReferenceTemplateSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ObjectReferenceTemplateSeq_var &);
-  };
-  
-  
+
+class TAO_Export ObjectReferenceTemplateSeq_out
+{
+public:
+  ObjectReferenceTemplateSeq_out (ObjectReferenceTemplateSeq *&);
+  ObjectReferenceTemplateSeq_out (ObjectReferenceTemplateSeq_var &);
+  ObjectReferenceTemplateSeq_out (const ObjectReferenceTemplateSeq_out &);
+  ObjectReferenceTemplateSeq_out &operator= (const ObjectReferenceTemplateSeq_out &);
+  ObjectReferenceTemplateSeq_out &operator= (ObjectReferenceTemplateSeq *);
+  operator ObjectReferenceTemplateSeq *&();
+  ObjectReferenceTemplateSeq *&ptr (void);
+  ObjectReferenceTemplateSeq *operator-> (void);
+  TAO_Valuetype_Manager<ObjectReferenceTemplate, ObjectReferenceTemplate_var> operator[] (CORBA::ULong index);
+
+private:
+  ObjectReferenceTemplateSeq *&ptr_;
+  // Assignment from T_var not allowed.
+  void operator= (const ObjectReferenceTemplateSeq_var &);
+};
+
+
 #endif /* end #if !defined */
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplateSeq;
-  
-  typedef CORBA::Long AdapterManagerId;
-  typedef CORBA::Long_out AdapterManagerId_out;
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterManagerId;
-  
-  typedef CORBA::Short AdapterState;
-  typedef CORBA::Short_out AdapterState_out;
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterState;
-  
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short HOLDING;
-  
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short ACTIVE;
-  
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short DISCARDING;
-  
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short INACTIVE;
-  
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short NON_EXISTENT;
-  
-  
+
+TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplateSeq;
+
+typedef CORBA::Long AdapterManagerId;
+typedef CORBA::Long_out AdapterManagerId_out;
+TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterManagerId;
+
+typedef CORBA::Short AdapterState;
+typedef CORBA::Short_out AdapterState_out;
+TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterState;
+
+TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short HOLDING;
+
+TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short ACTIVE;
+
+TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short DISCARDING;
+
+TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short INACTIVE;
+
+TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short NON_EXISTENT;
+
+
 }
 TAO_NAMESPACE_CLOSE // module PortableInterceptor
 
diff --git a/TAO/tao/ObjectReferenceTemplateC.i b/TAO/tao/ObjectReferenceTemplateC.i
index 3dea0c2d0bc..2d6b01034f2 100644
--- a/TAO/tao/ObjectReferenceTemplateC.i
+++ b/TAO/tao/ObjectReferenceTemplateC.i
@@ -30,7 +30,7 @@ PortableInterceptor::ObjectReferenceFactory::~ObjectReferenceFactory () // destr
 ACE_INLINE const char* 
 PortableInterceptor::ObjectReferenceFactory::_tao_obv_static_repository_id ()
 {
-  return "IDL:PortableInterceptor/ObjectReferenceFactory:1.0";
+  return "IDL:omg.org/PortableInterceptor/ObjectReferenceFactory:1.0";
 }
 
 ACE_INLINE
@@ -44,7 +44,7 @@ PortableInterceptor::ObjectReferenceTemplate::~ObjectReferenceTemplate () // des
 ACE_INLINE const char* 
 PortableInterceptor::ObjectReferenceTemplate::_tao_obv_static_repository_id ()
 {
-  return "IDL:PortableInterceptor/ObjectReferenceTemplate:1.0";
+  return "IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0";
 }
 
 
diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp
index 4b3e29dbe02..65fa77af286 100644
--- a/TAO/tao/PolicyC.cpp
+++ b/TAO/tao/PolicyC.cpp
@@ -154,7 +154,7 @@ CORBA::PolicyError::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      CORBA::PolicyError (*this),
+      ::CORBA::PolicyError (*this),
       0
     );
   return result;
@@ -419,7 +419,7 @@ CORBA::InvalidPolicies::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      CORBA::InvalidPolicies (*this),
+      ::CORBA::InvalidPolicies (*this),
       0
     );
   return result;
@@ -516,6 +516,10 @@ CORBA::TypeCode_ptr CORBA::InvalidPolicies::_type (void) const
   return ::CORBA::_tc_InvalidPolicies;
 }
 
+
+// TAO_IDL - Generated from 
+// be/be_visitor_interface/interface_cs.cpp:67
+
 int CORBA::Policy::_tao_class_id = 0;
 
 CORBA::Policy_ptr
@@ -1531,7 +1535,7 @@ CORBA::_TAO_Policy_Remote_Proxy_Broker::select_proxy (
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:209
+// be/be_visitor_interface/interface_cs.cpp:198
 
 CORBA::Policy::Policy (int collocated)
 {
@@ -1785,6 +1789,10 @@ TAO_NAMESPACE_BEGIN (CORBA)
 TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_Policy, &_tc_TAO_tc_CORBA_Policy)
 TAO_NAMESPACE_END
 
+
+// TAO_IDL - Generated from 
+// be/be_visitor_interface/interface_cs.cpp:67
+
 int CORBA::PolicyManager::_tao_class_id = 0;
 
 CORBA::PolicyManager_ptr
@@ -2018,7 +2026,7 @@ CORBA::PolicyManager_out::operator-> (void)
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:209
+// be/be_visitor_interface/interface_cs.cpp:198
 
 CORBA::PolicyManager::PolicyManager (void)
 {}
@@ -2026,6 +2034,12 @@ CORBA::PolicyManager::PolicyManager (void)
 CORBA::PolicyManager::~PolicyManager (void)
 {}
 
+void CORBA::PolicyManager::_tao_any_destructor (void *_tao_void_pointer)
+{
+  PolicyManager *tmp = ACE_static_cast (PolicyManager*, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
 CORBA::PolicyManager_ptr CORBA::PolicyManager::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
@@ -2086,6 +2100,43 @@ const char* CORBA::PolicyManager::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/PolicyManager:1.0";
 }
 
+static const CORBA::Long _oc_CORBA_PolicyManager[] =
+{
+  TAO_ENCAP_BYTE_ORDER, // byte order
+  36,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x4d616e61), 
+  ACE_NTOHL (0x6765723a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/PolicyManager:1.0
+  14,
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63794d61), 
+  ACE_NTOHL (0x6e616765), 
+  ACE_NTOHL (0x72000000),  // name = PolicyManager
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyManager (
+    CORBA::tk_objref,
+    sizeof (_oc_CORBA_PolicyManager),
+    (char *) &_oc_CORBA_PolicyManager,
+    0,
+    sizeof (CORBA::PolicyManager)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_PolicyManager, &_tc_TAO_tc_CORBA_PolicyManager)
+TAO_NAMESPACE_END
+
+
+// TAO_IDL - Generated from 
+// be/be_visitor_interface/interface_cs.cpp:67
+
 int CORBA::PolicyCurrent::_tao_class_id = 0;
 
 CORBA::PolicyCurrent_ptr
@@ -2319,7 +2370,7 @@ CORBA::PolicyCurrent_out::operator-> (void)
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:209
+// be/be_visitor_interface/interface_cs.cpp:198
 
 CORBA::PolicyCurrent::PolicyCurrent (void)
 {}
@@ -2327,6 +2378,12 @@ CORBA::PolicyCurrent::PolicyCurrent (void)
 CORBA::PolicyCurrent::~PolicyCurrent (void)
 {}
 
+void CORBA::PolicyCurrent::_tao_any_destructor (void *_tao_void_pointer)
+{
+  PolicyCurrent *tmp = ACE_static_cast (PolicyCurrent*, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
 CORBA::PolicyCurrent_ptr CORBA::PolicyCurrent::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
@@ -2411,32 +2468,86 @@ const char* CORBA::PolicyCurrent::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/PolicyCurrent:1.0";
 }
 
-void operator<<= (CORBA::Any &_tao_any, const CORBA::PolicyError &_tao_elem) // copying
+static const CORBA::Long _oc_CORBA_PolicyCurrent[] =
+{
+  TAO_ENCAP_BYTE_ORDER, // byte order
+  36,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x43757272), 
+  ACE_NTOHL (0x656e743a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/PolicyCurrent:1.0
+  14,
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63794375), 
+  ACE_NTOHL (0x7272656e), 
+  ACE_NTOHL (0x74000000),  // name = PolicyCurrent
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyCurrent (
+    CORBA::tk_objref,
+    sizeof (_oc_CORBA_PolicyCurrent),
+    (char *) &_oc_CORBA_PolicyCurrent,
+    0,
+    sizeof (CORBA::PolicyCurrent)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_PolicyCurrent, &_tc_TAO_tc_CORBA_PolicyCurrent)
+TAO_NAMESPACE_END
+
+
+// TAO_IDL - Generated from 
+// be/be_visitor_exception/any_op_cs.cpp:60
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::PolicyError &_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
-      CORBA::_tc_PolicyError,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
-    );
+  
+  if (stream << _tao_elem)
+    {
+      _tao_any._tao_replace (
+          CORBA::_tc_PolicyError,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin ()
+        );
+    }
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::PolicyError *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::PolicyError *_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      CORBA::_tc_PolicyError,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      CORBA::PolicyError::_tao_any_destructor
-    );
+  
+  if (stream << *_tao_elem)
+    {
+      _tao_any._tao_replace (
+          CORBA::_tc_PolicyError,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          _tao_elem,
+          CORBA::PolicyError::_tao_any_destructor
+        );
+    }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PolicyError *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,CORBA::PolicyError *&_tao_elem
+  )
 {
   return _tao_any >>= ACE_const_cast(
       const CORBA::PolicyError*&,
@@ -2444,89 +2555,136 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PolicyError *&_ta
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::PolicyError *&_tao_elem)
+// Extraction to const pointer.
+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 (CORBA::_tc_PolicyError ACE_ENV_ARG_PARAMETER);
+    CORBA::Boolean result =
+      type->equivalent (
+          CORBA::_tc_PolicyError
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
     
-    if (!result)
-      return 0; // not equivalent
+    if (result == 0)
+      {
+        return 0; // not equivalent
+      }
     
     if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::PolicyError *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      CORBA::PolicyError *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::PolicyError, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      CORBA::String_var interface_repository_id;
-      if (!(stream >> interface_repository_id.out ()))
-        return 0;
-      if (ACE_OS::strcmp (
-          interface_repository_id.in (),
-          "IDL:omg.org/CORBA/PolicyError:1.0"))
-        return 0;
-      if (stream >> *tmp)
       {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_PolicyError,
-            1,
-            tmp,
-            CORBA::PolicyError::_tao_any_destructor
-          );
-        _tao_elem = tmp;
+        _tao_elem = (CORBA::PolicyError *)_tao_any.value ();
         return 1;
       }
-      else
+    else
       {
-        delete tmp;
+        CORBA::PolicyError *tmp = 0;
+        ACE_NEW_RETURN (
+            tmp,
+            CORBA::PolicyError,
+            0
+          );
+        
+        TAO_InputCDR stream (
+            _tao_any._tao_get_cdr (),
+            _tao_any._tao_byte_order ()
+          );
+        
+        CORBA::String_var interface_repository_id;
+        
+        if (!(stream >> interface_repository_id.out ()))
+          {
+            return 0;
+          }
+        
+        if (ACE_OS::strcmp (
+                interface_repository_id.in (),
+                "IDL:omg.org/CORBA/PolicyError:1.0")
+              )
+          {
+            return 0;
+          }
+        
+        if (stream >> *tmp)
+          {
+            ((CORBA::Any *)&_tao_any)->_tao_replace (
+                CORBA::_tc_PolicyError,
+                1,
+                tmp,
+                CORBA::PolicyError::_tao_any_destructor
+              );
+            
+            _tao_elem = tmp;
+            return 1;
+          }
+        else
+          {
+            delete tmp;
+          }
       }
-    }
   }
   ACE_CATCHANY
   {
   }
   ACE_ENDTRY;
+  
   return 0;
 }
 
-void operator<<= (CORBA::Any &_tao_any, const CORBA::InvalidPolicies &_tao_elem) // copying
+
+// TAO_IDL - Generated from 
+// be/be_visitor_exception/any_op_cs.cpp:60
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::InvalidPolicies &_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
-      CORBA::_tc_InvalidPolicies,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
-    );
+  
+  if (stream << _tao_elem)
+    {
+      _tao_any._tao_replace (
+          CORBA::_tc_InvalidPolicies,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin ()
+        );
+    }
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::InvalidPolicies *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::InvalidPolicies *_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      CORBA::_tc_InvalidPolicies,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      CORBA::InvalidPolicies::_tao_any_destructor
-    );
+  
+  if (stream << *_tao_elem)
+    {
+      _tao_any._tao_replace (
+          CORBA::_tc_InvalidPolicies,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          _tao_elem,
+          CORBA::InvalidPolicies::_tao_any_destructor
+        );
+    }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::InvalidPolicies *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,CORBA::InvalidPolicies *&_tao_elem
+  )
 {
   return _tao_any >>= ACE_const_cast(
       const CORBA::InvalidPolicies*&,
@@ -2534,136 +2692,346 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::InvalidPolicies *
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::InvalidPolicies *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::InvalidPolicies *&_tao_elem
+  )
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_InvalidPolicies ACE_ENV_ARG_PARAMETER);
+    CORBA::Boolean result =
+      type->equivalent (
+          CORBA::_tc_InvalidPolicies
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
     
-    if (!result)
-      return 0; // not equivalent
+    if (result == 0)
+      {
+        return 0; // not equivalent
+      }
     
     if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::InvalidPolicies *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      CORBA::InvalidPolicies *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::InvalidPolicies, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      CORBA::String_var interface_repository_id;
-      if (!(stream >> interface_repository_id.out ()))
-        return 0;
-      if (ACE_OS::strcmp (
-          interface_repository_id.in (),
-          "IDL:omg.org/CORBA/InvalidPolicies:1.0"))
-        return 0;
-      if (stream >> *tmp)
       {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_InvalidPolicies,
-            1,
-            tmp,
-            CORBA::InvalidPolicies::_tao_any_destructor
-          );
-        _tao_elem = tmp;
+        _tao_elem = (CORBA::InvalidPolicies *)_tao_any.value ();
         return 1;
       }
-      else
+    else
       {
-        delete tmp;
+        CORBA::InvalidPolicies *tmp = 0;
+        ACE_NEW_RETURN (
+            tmp,
+            CORBA::InvalidPolicies,
+            0
+          );
+        
+        TAO_InputCDR stream (
+            _tao_any._tao_get_cdr (),
+            _tao_any._tao_byte_order ()
+          );
+        
+        CORBA::String_var interface_repository_id;
+        
+        if (!(stream >> interface_repository_id.out ()))
+          {
+            return 0;
+          }
+        
+        if (ACE_OS::strcmp (
+                interface_repository_id.in (),
+                "IDL:omg.org/CORBA/InvalidPolicies:1.0")
+              )
+          {
+            return 0;
+          }
+        
+        if (stream >> *tmp)
+          {
+            ((CORBA::Any *)&_tao_any)->_tao_replace (
+                CORBA::_tc_InvalidPolicies,
+                1,
+                tmp,
+                CORBA::InvalidPolicies::_tao_any_destructor
+              );
+            
+            _tao_elem = tmp;
+            return 1;
+          }
+        else
+          {
+            delete tmp;
+          }
       }
-    }
   }
   ACE_CATCHANY
   {
   }
   ACE_ENDTRY;
+  
   return 0;
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::Policy_ptr _tao_elem)
+
+// TAO_IDL - Generated from 
+// be/be_visitor_interface/any_op_cs.cpp:60
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::Policy_ptr _tao_elem
+  )
 {
   TAO_OutputCDR stream;
+  
   if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        CORBA::_tc_Policy, 
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin (),
-        1,
-        CORBA::Policy::_duplicate (_tao_elem),
-        CORBA::Policy::_tao_any_destructor
-      );
-  }
+    {
+      _tao_any._tao_replace (
+          CORBA::_tc_Policy, 
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          CORBA::Policy::_duplicate (_tao_elem),
+          CORBA::Policy::_tao_any_destructor
+        );
+    }
 }
 
-CORBA::Boolean operator>>= (const 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 (
+          CORBA::_tc_Policy, 
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          *_tao_elem,
+          CORBA::Policy::_tao_any_destructor
+        );
+    }
+}
+
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::Policy_ptr &_tao_elem
+  )
 {
   ACE_TRY_NEW_ENV
   {
     _tao_elem = CORBA::Policy::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
     
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_Policy ACE_ENV_ARG_PARAMETER);
+    CORBA::Boolean result =
+      type->equivalent (
+          CORBA::_tc_Policy
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
     
     if (!result)
-      return 0; // not equivalent
+      {
+        return 0; // not equivalent
+      }
     
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
       );
+    
     if (stream >> _tao_elem)
-    {
-      ((CORBA::Any *)&_tao_any)->_tao_replace (
-          CORBA::_tc_Policy,
-          1,
-          _tao_elem,
-          CORBA::Policy::_tao_any_destructor
-        );
-      return 1;
-    }
+      {
+        ((CORBA::Any *)&_tao_any)->_tao_replace (
+            CORBA::_tc_Policy,
+            1,
+            _tao_elem,
+            CORBA::Policy::_tao_any_destructor
+          );
+        
+        return 1;
+      }
   }
   ACE_CATCHANY
   {
-    _tao_elem = CORBA::Policy::_nil ();
-    return 0;
   }
   ACE_ENDTRY;
+  
   _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>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate 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>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+
+// TAO_IDL - Generated from 
+// be/be_visitor_interface/any_op_cs.cpp:60
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::PolicyManager_ptr _tao_elem
+  )
+{
+  _tao_any._tao_replace (
+      CORBA::_tc_PolicyManager, 
+      1,
+      CORBA::PolicyManager::_duplicate (_tao_elem),
+      CORBA::PolicyManager::_tao_any_destructor
+    );
+  
+  _tao_any.contains_local (1);
+}
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::PolicyManager_ptr *_tao_elem
+  )
+{
+  _tao_any._tao_replace (
+      CORBA::_tc_PolicyManager, 
+      1,
+      *_tao_elem,
+      CORBA::PolicyManager::_tao_any_destructor
+    );
+  
+  _tao_any.contains_local (1);
+}
+
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::PolicyManager_ptr &_tao_elem
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    _tao_elem = CORBA::PolicyManager::_nil ();
+    CORBA::TypeCode_var type = _tao_any.type ();
+    
+    CORBA::Boolean result =
+      type->equivalent (
+          CORBA::_tc_PolicyManager
+          ACE_ENV_ARG_PARAMETER
+        );
+    ACE_TRY_CHECK;
+    
+    if (!result)
+      {
+        return 0; // not equivalent
+      }
+    
+    _tao_elem =
+      ACE_reinterpret_cast (
+          CORBA::PolicyManager_ptr,
+          ACE_const_cast (void *, _tao_any.value ())
+        );
+    
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+  }
+  ACE_ENDTRY;
+  
+  _tao_elem = CORBA::PolicyManager::_nil ();
+  return 0;
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::PolicyManager,CORBA::PolicyManager_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::PolicyManager,CORBA::PolicyManager_var>
+  template class TAO_Object_Manager<CORBA::PolicyManager,CORBA::PolicyManager_var>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#  pragma instantiate TAO_Object_Manager<CORBA::PolicyManager,CORBA::PolicyManager_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+
+// TAO_IDL - Generated from 
+// be/be_visitor_interface/any_op_cs.cpp:60
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::PolicyCurrent_ptr _tao_elem
+  )
+{
+  _tao_any._tao_replace (
+      CORBA::_tc_PolicyCurrent, 
+      1,
+      CORBA::PolicyCurrent::_duplicate (_tao_elem),
+      CORBA::PolicyCurrent::_tao_any_destructor
+    );
+  
+  _tao_any.contains_local (1);
+}
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::PolicyCurrent_ptr *_tao_elem
+  )
+{
+  _tao_any._tao_replace (
+      CORBA::_tc_PolicyCurrent, 
+      1,
+      *_tao_elem,
+      CORBA::PolicyCurrent::_tao_any_destructor
+    );
+  
+  _tao_any.contains_local (1);
+}
+
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::PolicyCurrent_ptr &_tao_elem
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    _tao_elem = CORBA::PolicyCurrent::_nil ();
+    CORBA::TypeCode_var type = _tao_any.type ();
+    
+    CORBA::Boolean result =
+      type->equivalent (
+          CORBA::_tc_PolicyCurrent
+          ACE_ENV_ARG_PARAMETER
+        );
+    ACE_TRY_CHECK;
+    
+    if (!result)
+      {
+        return 0; // not equivalent
+      }
+    
+    _tao_elem =
+      ACE_reinterpret_cast (
+          CORBA::PolicyCurrent_ptr,
+          ACE_const_cast (void *, _tao_any.value ())
+        );
+    
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+  }
+  ACE_ENDTRY;
+  
+  _tao_elem = CORBA::PolicyCurrent::_nil ();
+  return 0;
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::PolicyCurrent,CORBA::PolicyCurrent_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::PolicyCurrent,CORBA::PolicyCurrent_var>
+  template class TAO_Object_Manager<CORBA::PolicyCurrent,CORBA::PolicyCurrent_var>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#  pragma instantiate TAO_Object_Manager<CORBA::PolicyCurrent,CORBA::PolicyCurrent_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 
@@ -2691,16 +3059,16 @@ CORBA::Boolean operator>> (
   CORBA::ULong _tao_seq_len;
   if (strm >> _tao_seq_len)
   {
+    // Add a check to the length of the sequence
+    // to make sure it does not exceed the length
+    // of the stream. (See bug 1159.)
+    if (_tao_seq_len > strm.length())
+      return 0;
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // 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
     return strm.read_ushort_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
   }
diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h
index c05b50ddffa..0d8346ce943 100644
--- a/TAO/tao/PolicyC.h
+++ b/TAO/tao/PolicyC.h
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_ORIG_POLICYC_H_
-#define _TAO_IDL_ORIG_POLICYC_H_
+#ifndef _TAO_IDL_POLICYC_H_
+#define _TAO_IDL_POLICYC_H_
 
 #include "ace/pre.h"
 #include "tao/corbafwd.h"
@@ -29,7 +29,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "TAO_Export.h"
+#include "tao/TAO_Export.h"
 #include "CurrentC.h"
 #include "Policy_ForwardC.h"
 #include "Exception.h"
@@ -337,6 +337,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
   
 #endif /* end #if !defined */
   
+  // *************************************************************
+  // CORBA::Policy
+  // TAO_IDL - Generated from
+  // be/be_visitor_interface/interface_ch.cpp:106
+  // *************************************************************
+  
   
 #if !defined (_CORBA_POLICY_CH_)
 #define _CORBA_POLICY_CH_
@@ -683,6 +689,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
   
 #endif /* end #if !defined */
   
+  // *************************************************************
+  // CORBA::PolicyManager
+  // TAO_IDL - Generated from
+  // be/be_visitor_interface/interface_ch.cpp:106
+  // *************************************************************
+  
   
 #if !defined (_CORBA_POLICYMANAGER_CH_)
 #define _CORBA_POLICYMANAGER_CH_
@@ -716,6 +728,8 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
         return (PolicyManager_ptr)0;
       }
     
+    static void _tao_any_destructor (void*);
+    
     virtual ::CORBA::PolicyList * get_policy_overrides (
         const CORBA::PolicyTypeSeq & ts
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -751,6 +765,8 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
   
 #endif /* end #if !defined */
   
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyManager;
+  
   
 #if !defined (_CORBA_POLICYCURRENT___PTR_CH_)
 #define _CORBA_POLICYCURRENT___PTR_CH_
@@ -830,6 +846,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
   
 #endif /* end #if !defined */
   
+  // *************************************************************
+  // CORBA::PolicyCurrent
+  // TAO_IDL - Generated from
+  // be/be_visitor_interface/interface_ch.cpp:106
+  // *************************************************************
+  
   
 #if !defined (_CORBA_POLICYCURRENT_CH_)
 #define _CORBA_POLICYCURRENT_CH_
@@ -864,6 +886,8 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
         return (PolicyCurrent_ptr)0;
       }
     
+    static void _tao_any_destructor (void*);
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
@@ -881,6 +905,8 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
   
 #endif /* end #if !defined */
   
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyCurrent;
+  
   
 }
 TAO_NAMESPACE_CLOSE // module CORBA
@@ -902,8 +928,17 @@ TAO_Export void operator<<= (CORBA::Any &, CORBA::InvalidPolicies*); // noncopyi
 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 &, CORBA::Policy_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Policy_ptr &);
+// Any operators for interface CORBA::PolicyManager
+TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyManager_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyManager_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyManager_ptr &);
+// Any operators for interface CORBA::PolicyCurrent
+TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyCurrent_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyCurrent_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyCurrent_ptr &);
 
 #ifndef __ACE_INLINE__
 
diff --git a/TAO/tao/PolicyS.h b/TAO/tao/PolicyS.h
index 70b87da46b6..780e7ef3dee 100644
--- a/TAO/tao/PolicyS.h
+++ b/TAO/tao/PolicyS.h
@@ -1,23 +1,314 @@
-/* -*- C++ -*- $Id$ */
-//=============================================================================
-/**
- *  @file   PolicyS.h
- *
- *  $Id$
- *
- * The file is almost empty and only present to keep other IDL files
- * that include Policy.pidl happy.
- *
- */
-//=============================================================================
-
-#ifndef TAO_PIDL_POLICY_S_H
-#define TAO_PIDL_POLICY_S_H
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+#ifndef _TAO_IDL_POLICYS_H_
+#define _TAO_IDL_POLICYS_H_
+
+#include "ace/pre.h"
 #include "tao/PolicyC.h"
 
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/Servant_Base.h"
+#include "tao/PortableServer/Collocated_Object.h"
+#include "tao/PortableServer/ThruPOA_Object_Proxy_Impl.h"
+#include "tao/PortableServer/Direct_Object_Proxy_Impl.h"
+
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#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  POA_CORBA
+{
+  class Policy;
+  typedef Policy *Policy_ptr;
+  // Forward Classes Declaration
+  class _TAO_Policy_ThruPOA_Proxy_Impl;
+  class _TAO_Policy_Direct_Proxy_Impl;
+  class _TAO_Policy_Strategized_Proxy_Broker;
+  
+  class TAO_PortableServer_Export Policy
+    : public virtual PortableServer::ServantBase
+  {
+  protected:
+    Policy (void);
+
+  public:
+    Policy (const Policy& rhs);
+    virtual ~Policy (void);
+
+
+    virtual CORBA::Boolean _is_a (
+        const char* logical_type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+
+    virtual void* _downcast (
+        const char* logical_type_id
+      );
+
+    static void _is_a_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+
+    static void _non_existent_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+
+    static void _interface_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+
+    virtual void _dispatch (
+        TAO_ServerRequest &req,
+        void *_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+
+    ::CORBA::Policy *_this (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      );
+
+    virtual const char* _interface_repository_id (void) const;
+
+    virtual CORBA::PolicyType policy_type (
+        
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+        static void _get_policy_type_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_obj,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+
+    virtual ::CORBA::Policy_ptr copy (
+        
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+        static void copy_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_obj,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+
+    virtual void destroy (
+        
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+        static void destroy_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_obj,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+
+
+  };
+
+  
+  ///////////////////////////////////////////////////////////////////////
+  //               Strategized Proxy Broker Declaration 
+  //
+  
+  class TAO_PortableServer_Export _TAO_Policy_Strategized_Proxy_Broker : public virtual ::CORBA::_TAO_Policy_Proxy_Broker
+  {
+  public: 
+    _TAO_Policy_Strategized_Proxy_Broker (void);
+    
+    virtual ~_TAO_Policy_Strategized_Proxy_Broker (void);
+    
+    virtual ::CORBA::_TAO_Policy_Proxy_Impl &select_proxy (
+      ::CORBA::Policy *object
+      ACE_ENV_ARG_DECL
+    );
+  
+  private:
+    // Helper methods that takes care to create the proxy
+    // as soon as their use is necessary.
+    void create_proxy (
+      int collocation_strategy
+      ACE_ENV_ARG_DECL
+    );
+    
+    // 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];
+    
+    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_Policy_Strategized_Proxy_Broker *the_TAO_Policy_Strategized_Proxy_Broker (void);
+  };
+  
+  
+  //
+  //            End Strategized Proxy Broker Declaration 
+  ///////////////////////////////////////////////////////////////////////
+  
+  
+  ///////////////////////////////////////////////////////////////////////
+  //                    ThruPOA  Impl. Declaration
+  //
+  
+  class TAO_PortableServer_Export _TAO_Policy_ThruPOA_Proxy_Impl :
+    public virtual ::CORBA::_TAO_Policy_Proxy_Impl,
+    public virtual TAO_ThruPOA_Object_Proxy_Impl
+  {
+  public:
+    _TAO_Policy_ThruPOA_Proxy_Impl (void);
+    
+    virtual ~_TAO_Policy_ThruPOA_Proxy_Impl (void) { }
+    
+    virtual CORBA::PolicyType policy_type (
+        CORBA_Object *_collocated_tao_target_
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    virtual ::CORBA::Policy_ptr copy (
+        CORBA_Object *_collocated_tao_target_
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    virtual void destroy (
+        CORBA_Object *_collocated_tao_target_
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    
+  };
+  
+  //
+  //                ThruPOA  Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
+  
+  
+///////////////////////////////////////////////////////////////////////
+//                    Direct  Impl. Declaration
+//
+
+class TAO_PortableServer_Export _TAO_Policy_Direct_Proxy_Impl :
+  public virtual CORBA::_TAO_Policy_Proxy_Impl,
+  public virtual TAO_Direct_Object_Proxy_Impl
+{
+public:
+  _TAO_Policy_Direct_Proxy_Impl (void);
+  
+  virtual ~_TAO_Policy_Direct_Proxy_Impl (void) { }
+  
+  virtual CORBA::PolicyType policy_type (
+      CORBA_Object *_collocated_tao_target_
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+  
+  virtual ::CORBA::Policy_ptr copy (
+      CORBA_Object *_collocated_tao_target_
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+  
+  virtual void destroy (
+      CORBA_Object *_collocated_tao_target_
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+  
+  };
+
+
+//
+//                Direct  Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+}
+TAO_NAMESPACE_CLOSE // module CORBA
+
+#include "PolicyS_T.h"
+
+#if defined (__ACE_INLINE__)
+#include "PolicyS.i"
+#endif /* defined INLINE */
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
 
-#endif /* TAO_PIDL_POLICY_S_H*/
+#include "ace/post.h"
+#endif /* ifndef */
diff --git a/TAO/tao/Policy_ForwardC.cpp b/TAO/tao/Policy_ForwardC.cpp
index 56255fddae1..2acfd50b377 100644
--- a/TAO/tao/Policy_ForwardC.cpp
+++ b/TAO/tao/Policy_ForwardC.cpp
@@ -465,37 +465,54 @@ TAO_NAMESPACE_BEGIN (CORBA)
 TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_SetOverrideType, &_tc_TAO_tc_CORBA_SetOverrideType)
 TAO_NAMESPACE_END
 
+
+// TAO_IDL - Generated from 
+// be/be_visitor_sequence/any_op_cs.cpp:61
+
+// Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
     const CORBA::PolicyList &_tao_elem
-  ) // copying
+  )
 {
   TAO_OutputCDR stream;
+  
   if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        CORBA::_tc_PolicyList,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
+    {
+      _tao_any._tao_replace (
+          CORBA::_tc_PolicyList,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin ()
+        );
+    }
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::PolicyList *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::PolicyList *_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      CORBA::_tc_PolicyList,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      CORBA::PolicyList::_tao_any_destructor
-    );
+  
+  if (stream << *_tao_elem)
+    {
+      _tao_any._tao_replace (
+          CORBA::_tc_PolicyList,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          _tao_elem,
+          CORBA::PolicyList::_tao_any_destructor
+        );
+    }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PolicyList *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::PolicyList *&_tao_elem
+  )
 {
   return _tao_any >>= ACE_const_cast(
       const CORBA::PolicyList*&,
@@ -503,90 +520,127 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PolicyList *&_tao
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::PolicyList *&_tao_elem)
+// Extraction to const pointer.
+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 (CORBA::_tc_PolicyList ACE_ENV_ARG_PARAMETER);
+    CORBA::Boolean result =
+      type->equivalent (
+          CORBA::_tc_PolicyList
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
     
     if (!result)
-      return 0; // not equivalent
+      {
+        return 0; // not equivalent
+      }
     
     if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const CORBA::PolicyList*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      CORBA::PolicyList *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::PolicyList, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
       {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_PolicyList,
-            1,
-            ACE_static_cast (void *, tmp),
-            CORBA::PolicyList::_tao_any_destructor
+        _tao_elem = ACE_static_cast(
+            const CORBA::PolicyList*,
+            _tao_any.value ()
           );
-        _tao_elem = tmp;
+        
         return 1;
       }
-      else
+    else
       {
-        delete tmp;
+        CORBA::PolicyList *tmp = 0;
+        ACE_NEW_RETURN (
+            tmp,
+            CORBA::PolicyList,
+            0
+          );
+        
+        TAO_InputCDR stream (
+            _tao_any._tao_get_cdr (),
+            _tao_any._tao_byte_order ()
+          );
+        
+        if (stream >> *tmp)
+          {
+            ((CORBA::Any *)&_tao_any)->_tao_replace (
+                CORBA::_tc_PolicyList,
+                1,
+                ACE_static_cast (void *, tmp),
+                CORBA::PolicyList::_tao_any_destructor
+              );
+            
+            _tao_elem = tmp;
+            return 1;
+          }
+        else
+          {
+            delete tmp;
+          }
       }
-    }
   }
   ACE_CATCHANY
   {
   }
   ACE_ENDTRY;
+  
   return 0;
 }
 
+
+// TAO_IDL - Generated from 
+// be/be_visitor_sequence/any_op_cs.cpp:61
+
+// Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
     const CORBA::PolicyTypeSeq &_tao_elem
-  ) // copying
+  )
 {
   TAO_OutputCDR stream;
+  
   if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        CORBA::_tc_PolicyTypeSeq,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
+    {
+      _tao_any._tao_replace (
+          CORBA::_tc_PolicyTypeSeq,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin ()
+        );
+    }
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::PolicyTypeSeq *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::PolicyTypeSeq *_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      CORBA::_tc_PolicyTypeSeq,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      CORBA::PolicyTypeSeq::_tao_any_destructor
-    );
+  
+  if (stream << *_tao_elem)
+    {
+      _tao_any._tao_replace (
+          CORBA::_tc_PolicyTypeSeq,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          _tao_elem,
+          CORBA::PolicyTypeSeq::_tao_any_destructor
+        );
+    }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PolicyTypeSeq *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::PolicyTypeSeq *&_tao_elem
+  )
 {
   return _tao_any >>= ACE_const_cast(
       const CORBA::PolicyTypeSeq*&,
@@ -594,56 +648,76 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PolicyTypeSeq *&_
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::PolicyTypeSeq *&_tao_elem)
+// Extraction to const pointer.
+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 (CORBA::_tc_PolicyTypeSeq ACE_ENV_ARG_PARAMETER);
+    CORBA::Boolean result =
+      type->equivalent (
+          CORBA::_tc_PolicyTypeSeq
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
     
     if (!result)
-      return 0; // not equivalent
+      {
+        return 0; // not equivalent
+      }
     
     if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const CORBA::PolicyTypeSeq*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      CORBA::PolicyTypeSeq *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::PolicyTypeSeq, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
       {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_PolicyTypeSeq,
-            1,
-            ACE_static_cast (void *, tmp),
-            CORBA::PolicyTypeSeq::_tao_any_destructor
+        _tao_elem = ACE_static_cast(
+            const CORBA::PolicyTypeSeq*,
+            _tao_any.value ()
           );
-        _tao_elem = tmp;
+        
         return 1;
       }
-      else
+    else
       {
-        delete tmp;
+        CORBA::PolicyTypeSeq *tmp = 0;
+        ACE_NEW_RETURN (
+            tmp,
+            CORBA::PolicyTypeSeq,
+            0
+          );
+        
+        TAO_InputCDR stream (
+            _tao_any._tao_get_cdr (),
+            _tao_any._tao_byte_order ()
+          );
+        
+        if (stream >> *tmp)
+          {
+            ((CORBA::Any *)&_tao_any)->_tao_replace (
+                CORBA::_tc_PolicyTypeSeq,
+                1,
+                ACE_static_cast (void *, tmp),
+                CORBA::PolicyTypeSeq::_tao_any_destructor
+              );
+            
+            _tao_elem = tmp;
+            return 1;
+          }
+        else
+          {
+            delete tmp;
+          }
       }
-    }
   }
   ACE_CATCHANY
   {
   }
   ACE_ENDTRY;
+  
   return 0;
 }
 
@@ -713,16 +787,16 @@ CORBA::Boolean operator>> (
   CORBA::ULong _tao_seq_len;
   if (strm >> _tao_seq_len)
   {
+    // Add a check to the length of the sequence
+    // to make sure it does not exceed the length
+    // of the stream. (See bug 1159.)
+    if (_tao_seq_len > strm.length())
+      return 0;
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // 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++)
@@ -755,16 +829,16 @@ CORBA::Boolean operator>> (
   CORBA::ULong _tao_seq_len;
   if (strm >> _tao_seq_len)
   {
+    // Add a check to the length of the sequence
+    // to make sure it does not exceed the length
+    // of the stream. (See bug 1159.)
+    if (_tao_seq_len > strm.length())
+      return 0;
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // 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
     return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
   }
diff --git a/TAO/tao/Policy_ForwardC.h b/TAO/tao/Policy_ForwardC.h
index 73f21008016..8964b32dcc9 100644
--- a/TAO/tao/Policy_ForwardC.h
+++ b/TAO/tao/Policy_ForwardC.h
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_ORIG_POLICY_FORWARDC_H_
-#define _TAO_IDL_ORIG_POLICY_FORWARDC_H_
+#ifndef _TAO_IDL_POLICY_FORWARDC_H_
+#define _TAO_IDL_POLICY_FORWARDC_H_
 
 #include "ace/pre.h"
 #include "tao/corbafwd.h"
@@ -29,7 +29,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "TAO_Export.h"
+#include "tao/TAO_Export.h"
 #include "Sequence.h"
 #include "CDR.h"
 
@@ -61,41 +61,41 @@ TAO_NAMESPACE  CORBA
   typedef CORBA::ULong PolicyType;
   typedef CORBA::ULong_out PolicyType_out;
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyType;
-
+  
   class Policy;
-
+  
 #if !defined (_CORBA_POLICY___PTR_CH_)
 #define _CORBA_POLICY___PTR_CH_
-
+  
   typedef Policy *Policy_ptr;
-
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_CORBA_POLICY___VAR_CH_)
 #define _CORBA_POLICY___VAR_CH_
-
+  
   class TAO_Export Policy_var : public TAO_Base_var
   {
   public:
     Policy_var (void); // default constructor
-    Policy_var (Policy_ptr p) : ptr_ (p) {}
+    Policy_var (Policy_ptr p) : ptr_ (p) {} 
     Policy_var (const Policy_var &); // copy constructor
     ~Policy_var (void); // destructor
-
+    
     Policy_var &operator= (Policy_ptr);
     Policy_var &operator= (const Policy_var &);
     Policy_ptr operator-> (void) const;
-
+    
     operator const Policy_ptr &() const;
     operator Policy_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     Policy_ptr in (void) const;
     Policy_ptr &inout (void);
     Policy_ptr &out (void);
     Policy_ptr _retn (void);
     Policy_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static Policy_ptr tao_duplicate (Policy_ptr);
@@ -106,7 +106,7 @@ TAO_NAMESPACE  CORBA
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     Policy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -116,11 +116,11 @@ TAO_NAMESPACE  CORBA
 
 
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_CORBA_POLICY___OUT_CH_)
 #define _CORBA_POLICY___OUT_CH_
-
+  
   class TAO_Export Policy_out
   {
   public:
@@ -133,20 +133,20 @@ TAO_NAMESPACE  CORBA
     operator Policy_ptr &();
     Policy_ptr &ptr (void);
     Policy_ptr operator-> (void);
-
+  
   private:
     Policy_ptr &ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+  
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CH_
-
+  
   class TAO_EXPORT_MACRO _TAO_Unbounded_Object_Sequence_CORBA_PolicyList
     : public TAO_Unbounded_Base_Sequence
   {
@@ -167,14 +167,14 @@ TAO_NAMESPACE  CORBA
         const _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &rhs
       );
     virtual ~_TAO_Unbounded_Object_Sequence_CORBA_PolicyList (void);
-
+    
     // = Accessors.
     TAO_Object_Manager<CORBA::Policy,CORBA::Policy_var> operator[] (CORBA::ULong index) const;
-
+    
     // = Static operations.
     static Policy **allocbuf (CORBA::ULong nelems);
     static void freebuf (Policy **buffer);
-
+    
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -184,7 +184,7 @@ TAO_NAMESPACE  CORBA
         CORBA::ULong nl,
         CORBA::ULong ol
       );
-
+    
     virtual void _downcast (
         void* target,
         CORBA_Object *src
@@ -192,59 +192,59 @@ TAO_NAMESPACE  CORBA
       );
     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 PolicyList;
   class PolicyList_var;
-
+  
   // *************************************************************
   // PolicyList
   // *************************************************************
-
-  class TAO_Export PolicyList : public
+  
+  class TAO_Export PolicyList : public 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<Policy,Policy_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     PolicyList (void); // default ctor
     PolicyList (CORBA::ULong max); // uses max size
     PolicyList (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        Policy_ptr *buffer,
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        Policy_ptr *buffer, 
         CORBA::Boolean release = 0
       );
     PolicyList (const PolicyList &); // copy ctor
     ~PolicyList (void);
     static void _tao_any_destructor (void*);
-
+    
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef PolicyList_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-
-
+    
+    
   };
-
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_CORBA_POLICYLIST___VAR_CH_)
 #define _CORBA_POLICYLIST___VAR_CH_
-
+  
   // *************************************************************
   // class CORBA::PolicyList_var
   // *************************************************************
-
+  
   class TAO_Export PolicyList_var
   {
   public:
@@ -252,37 +252,37 @@ TAO_NAMESPACE  CORBA
     PolicyList_var (PolicyList *);
     PolicyList_var (const PolicyList_var &);
     ~PolicyList_var (void);
-
+    
     PolicyList_var &operator= (PolicyList *);
     PolicyList_var &operator= (const PolicyList_var &);
     PolicyList *operator-> (void);
     const PolicyList *operator-> (void) const;
-
+    
     operator const PolicyList &() const;
     operator PolicyList &();
     operator PolicyList &() const;
     operator PolicyList *&(); // variable-size base types only
-
+    
     TAO_Object_Manager<Policy, Policy_var> operator[] (CORBA::ULong index);
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const PolicyList &in (void) const;
     PolicyList &inout (void);
     PolicyList *&out (void);
     PolicyList *_retn (void);
     PolicyList *ptr (void) const;
-
+  
   private:
     PolicyList *ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_CORBA_POLICYLIST___OUT_CH_)
 #define _CORBA_POLICYLIST___OUT_CH_
-
+  
   class TAO_Export PolicyList_out
   {
   public:
@@ -295,31 +295,31 @@ TAO_NAMESPACE  CORBA
     PolicyList *&ptr (void);
     PolicyList *operator-> (void);
     TAO_Object_Manager<Policy, Policy_var> operator[] (CORBA::ULong index);
-
+  
   private:
     PolicyList *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const PolicyList_var &);
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyList;
-
-
+  
+  
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+  
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CH_
-
+  
   class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq
     : public TAO_Unbounded_Base_Sequence
   {
   public:
     // = Initialization and termination methods.
     _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (void);
-    _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,
@@ -333,15 +333,15 @@ TAO_NAMESPACE  CORBA
         const _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &rhs
       );
     virtual ~_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (void);
-
+    
     // = Accessors.
     CORBA::ULong &operator[] (CORBA::ULong i);
     const CORBA::ULong &operator[] (CORBA::ULong i) const;
-
+    
     // = Static operations.
     static CORBA::ULong *allocbuf (CORBA::ULong size);
     static void freebuf (CORBA::ULong *buffer);
-
+    
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -354,59 +354,59 @@ TAO_NAMESPACE  CORBA
         CORBA::Boolean release
       );
   };
-
+  
 #endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+  
+  
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  
 #if !defined (_CORBA_POLICYTYPESEQ_CH_)
 #define _CORBA_POLICYTYPESEQ_CH_
-
+  
   class PolicyTypeSeq;
   class PolicyTypeSeq_var;
-
+  
   // *************************************************************
   // PolicyTypeSeq
   // *************************************************************
-
-  class TAO_Export PolicyTypeSeq : public
+  
+  class TAO_Export 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:
     PolicyTypeSeq (void); // default ctor
     PolicyTypeSeq (CORBA::ULong max); // uses max size
     PolicyTypeSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::ULong *buffer,
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        CORBA::ULong *buffer, 
         CORBA::Boolean release = 0
       );
     PolicyTypeSeq (const PolicyTypeSeq &); // copy ctor
     ~PolicyTypeSeq (void);
     static void _tao_any_destructor (void*);
-
+    
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef PolicyTypeSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-
-
+    
+    
   };
-
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_CORBA_POLICYTYPESEQ___VAR_CH_)
 #define _CORBA_POLICYTYPESEQ___VAR_CH_
-
+  
   // *************************************************************
   // class CORBA::PolicyTypeSeq_var
   // *************************************************************
-
+  
   class TAO_Export PolicyTypeSeq_var
   {
   public:
@@ -416,39 +416,39 @@ TAO_NAMESPACE  CORBA
     // Fixed-size base types only.
     PolicyTypeSeq_var (const PolicyTypeSeq &);
     ~PolicyTypeSeq_var (void);
-
+    
     PolicyTypeSeq_var &operator= (PolicyTypeSeq *);
     PolicyTypeSeq_var &operator= (const PolicyTypeSeq_var &);
     // Fixed-size base types only.
     PolicyTypeSeq_var &operator= (const PolicyTypeSeq &);
     PolicyTypeSeq *operator-> (void);
     const PolicyTypeSeq *operator-> (void) const;
-
+    
     operator const PolicyTypeSeq &() const;
     operator PolicyTypeSeq &();
     operator PolicyTypeSeq &() const;
-
+    
     PolicyType & operator[] (CORBA::ULong index);
     const PolicyType & operator[] (CORBA::ULong index) const;
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const PolicyTypeSeq &in (void) const;
     PolicyTypeSeq &inout (void);
     PolicyTypeSeq *&out (void);
     PolicyTypeSeq *_retn (void);
     PolicyTypeSeq *ptr (void) const;
-
+  
   private:
     PolicyTypeSeq *ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_CORBA_POLICYTYPESEQ___OUT_CH_)
 #define _CORBA_POLICYTYPESEQ___OUT_CH_
-
+  
   class TAO_Export PolicyTypeSeq_out
   {
   public:
@@ -461,28 +461,28 @@ TAO_NAMESPACE  CORBA
     PolicyTypeSeq *&ptr (void);
     PolicyTypeSeq *operator-> (void);
     PolicyType & operator[] (CORBA::ULong index);
-
+  
   private:
     PolicyTypeSeq *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const PolicyTypeSeq_var &);
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyTypeSeq;
-
+  
   enum SetOverrideType
   {
     SET_OVERRIDE,
     ADD_OVERRIDE
   };
-
+  
   typedef SetOverrideType &SetOverrideType_out;
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SetOverrideType;
-
-
+  
+  
 }
 TAO_NAMESPACE_CLOSE // module CORBA
 
@@ -563,7 +563,7 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_CORBA_PolicyTypeSeq_H_ */
 
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::SetOverrideType &); //
+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/PortableServer/ImplRepoC.cpp b/TAO/tao/PortableServer/ImplRepoC.cpp
index 8a8c6ebb570..9745b20a8e2 100644
--- a/TAO/tao/PortableServer/ImplRepoC.cpp
+++ b/TAO/tao/PortableServer/ImplRepoC.cpp
@@ -39,6 +39,10 @@
 #include "ImplRepoC.i"
 #endif /* !defined INLINE */
 
+
+// TAO_IDL - Generated from 
+// be/be_visitor_interface/interface_cs.cpp:67
+
 int ImplementationRepository::ServerObject::_tao_class_id = 0;
 
 ImplementationRepository::ServerObject_ptr
@@ -780,7 +784,7 @@ ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Broker::select_proxy (
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:209
+// be/be_visitor_interface/interface_cs.cpp:198
 
 ImplementationRepository::ServerObject::ServerObject (int collocated)
 {
@@ -2065,6 +2069,10 @@ TAO_NAMESPACE_BEGIN (ImplementationRepository)
 TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ServerInformationList, &_tc_TAO_tc_ImplementationRepository_ServerInformationList)
 TAO_NAMESPACE_END
 
+
+// TAO_IDL - Generated from 
+// be/be_visitor_interface/interface_cs.cpp:67
+
 int ImplementationRepository::Administration::_tao_class_id = 0;
 
 ImplementationRepository::Administration_ptr
@@ -4826,7 +4834,7 @@ ImplementationRepository::_TAO_Administration_Remote_Proxy_Broker::select_proxy
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:209
+// be/be_visitor_interface/interface_cs.cpp:198
 
 ImplementationRepository::Administration::Administration (int collocated)
 {
@@ -5030,7 +5038,7 @@ ImplementationRepository::Administration::AlreadyRegistered::_tao_duplicate (voi
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      ImplementationRepository::Administration::AlreadyRegistered (*this),
+      ::ImplementationRepository::Administration::AlreadyRegistered (*this),
       0
     );
   return result;
@@ -5174,7 +5182,7 @@ ImplementationRepository::Administration::CannotActivate::_tao_duplicate (void)
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      ImplementationRepository::Administration::CannotActivate (*this),
+      ::ImplementationRepository::Administration::CannotActivate (*this),
       0
     );
   return result;
@@ -5327,7 +5335,7 @@ ImplementationRepository::Administration::NotFound::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      ImplementationRepository::Administration::NotFound (*this),
+      ::ImplementationRepository::Administration::NotFound (*this),
       0
     );
   return result;
@@ -5628,6 +5636,10 @@ TAO_NAMESPACE_BEGIN (ImplementationRepository)
 TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_Administration, &_tc_TAO_tc_ImplementationRepository_Administration)
 TAO_NAMESPACE_END
 
+
+// TAO_IDL - Generated from 
+// be/be_visitor_interface/interface_cs.cpp:67
+
 int ImplementationRepository::ServerInformationIterator::_tao_class_id = 0;
 
 ImplementationRepository::ServerInformationIterator_ptr
@@ -6426,7 +6438,7 @@ ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Broker::se
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:209
+// be/be_visitor_interface/interface_cs.cpp:198
 
 ImplementationRepository::ServerInformationIterator::ServerInformationIterator (int collocated)
 {
@@ -6652,181 +6664,281 @@ TAO_NAMESPACE_BEGIN (ImplementationRepository)
 TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ServerInformationIterator, &_tc_TAO_tc_ImplementationRepository_ServerInformationIterator)
 TAO_NAMESPACE_END
 
-void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::ServerObject_ptr _tao_elem)
+
+// TAO_IDL - Generated from 
+// be/be_visitor_interface/any_op_cs.cpp:60
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    ImplementationRepository::ServerObject_ptr _tao_elem
+  )
 {
   TAO_OutputCDR stream;
+  
   if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        ImplementationRepository::_tc_ServerObject, 
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin (),
-        1,
-        ImplementationRepository::ServerObject::_duplicate (_tao_elem),
-        ImplementationRepository::ServerObject::_tao_any_destructor
-      );
-  }
+    {
+      _tao_any._tao_replace (
+          ImplementationRepository::_tc_ServerObject, 
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          ImplementationRepository::ServerObject::_duplicate (_tao_elem),
+          ImplementationRepository::ServerObject::_tao_any_destructor
+        );
+    }
+}
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    ImplementationRepository::ServerObject_ptr *_tao_elem
+  )
+{
+  TAO_OutputCDR stream;
+  
+  if (stream << *_tao_elem)
+    {
+      _tao_any._tao_replace (
+          ImplementationRepository::_tc_ServerObject, 
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          *_tao_elem,
+          ImplementationRepository::ServerObject::_tao_any_destructor
+        );
+    }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository::ServerObject_ptr &_tao_elem)
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    ImplementationRepository::ServerObject_ptr &_tao_elem
+  )
 {
   ACE_TRY_NEW_ENV
   {
     _tao_elem = ImplementationRepository::ServerObject::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
     
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerObject ACE_ENV_ARG_PARAMETER);
+    CORBA::Boolean result =
+      type->equivalent (
+          ImplementationRepository::_tc_ServerObject
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
     
     if (!result)
-      return 0; // not equivalent
+      {
+        return 0; // not equivalent
+      }
     
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
       );
+    
     if (stream >> _tao_elem)
-    {
-      ((CORBA::Any *)&_tao_any)->_tao_replace (
-          ImplementationRepository::_tc_ServerObject,
-          1,
-          _tao_elem,
-          ImplementationRepository::ServerObject::_tao_any_destructor
-        );
-      return 1;
-    }
+      {
+        ((CORBA::Any *)&_tao_any)->_tao_replace (
+            ImplementationRepository::_tc_ServerObject,
+            1,
+            _tao_elem,
+            ImplementationRepository::ServerObject::_tao_any_destructor
+          );
+        
+        return 1;
+      }
   }
   ACE_CATCHANY
   {
-    _tao_elem = ImplementationRepository::ServerObject::_nil ();
-    return 0;
   }
   ACE_ENDTRY;
+  
   _tao_elem = ImplementationRepository::ServerObject::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<ImplementationRepository::ServerObject,ImplementationRepository::ServerObject_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<ImplementationRepository::ServerObject,ImplementationRepository::ServerObject_var>
+  template class TAO_Object_Manager<ImplementationRepository::ServerObject,ImplementationRepository::ServerObject_var>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#  pragma instantiate TAO_Object_Manager<ImplementationRepository::ServerObject,ImplementationRepository::ServerObject_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, const ImplementationRepository::EnvironmentVariable &_tao_elem) // copying
+
+// TAO_IDL - Generated from 
+// be/be_visitor_structure/any_op_cs.cpp:58
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const ImplementationRepository::EnvironmentVariable &_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
-      ImplementationRepository::_tc_EnvironmentVariable,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
-    );
+  
+  if (stream << _tao_elem)
+    {
+      _tao_any._tao_replace (
+          ImplementationRepository::_tc_EnvironmentVariable,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin ()
+        );
+    }
 }
 
-void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::EnvironmentVariable *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    ImplementationRepository::EnvironmentVariable *_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      ImplementationRepository::_tc_EnvironmentVariable,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      ImplementationRepository::EnvironmentVariable::_tao_any_destructor
-    );
+  
+  if (stream << *_tao_elem)
+    {
+      _tao_any._tao_replace (
+          ImplementationRepository::_tc_EnvironmentVariable,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          _tao_elem,
+          ImplementationRepository::EnvironmentVariable::_tao_any_destructor
+        );
+    }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository::EnvironmentVariable *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    ImplementationRepository::EnvironmentVariable *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(const ImplementationRepository::EnvironmentVariable*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast (
+      const ImplementationRepository::EnvironmentVariable *&,
+      _tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepository::EnvironmentVariable *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const ImplementationRepository::EnvironmentVariable *&_tao_elem
+  )
 {
   _tao_elem = 0;
+  
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_EnvironmentVariable ACE_ENV_ARG_PARAMETER);
+    CORBA::Boolean result =
+      type->equivalent (
+          ImplementationRepository::_tc_EnvironmentVariable
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
     
-    if (!result)
-      return 0; // not equivalent
+    if (result == 0)
+      {
+        return 0; // not equivalent
+      }
     
     if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const ImplementationRepository::EnvironmentVariable*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      ImplementationRepository::EnvironmentVariable *tmp;
-      ACE_NEW_RETURN (tmp, ImplementationRepository::EnvironmentVariable, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
       {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            ImplementationRepository::_tc_EnvironmentVariable,
-            1,
-            ACE_static_cast (void *, tmp),
-            ImplementationRepository::EnvironmentVariable::_tao_any_destructor
+        _tao_elem = ACE_static_cast (
+            const ImplementationRepository::EnvironmentVariable*,
+            _tao_any.value ()
           );
-        _tao_elem = tmp;
+        
         return 1;
       }
-      else
+    else
       {
-        delete tmp;
+        ImplementationRepository::EnvironmentVariable *tmp;
+        ACE_NEW_RETURN (
+            tmp,
+            ImplementationRepository::EnvironmentVariable,
+            0
+          );
+        
+        TAO_InputCDR stream (
+            _tao_any._tao_get_cdr (),
+            _tao_any._tao_byte_order ()
+          );
+        
+        if (stream >> *tmp)
+          {
+            ((CORBA::Any *)&_tao_any)->_tao_replace (
+                ImplementationRepository::_tc_EnvironmentVariable,
+                1,
+                ACE_static_cast (void *, tmp),
+                ImplementationRepository::EnvironmentVariable::_tao_any_destructor
+              );
+            
+            _tao_elem = tmp;
+            return 1;
+          }
+        else
+          {
+            delete tmp;
+          }
       }
-    }
   }
   ACE_CATCHANY
   {
   }
   ACE_ENDTRY;
+  
   return 0;
 }
 
+
+// TAO_IDL - Generated from 
+// be/be_visitor_sequence/any_op_cs.cpp:61
+
+// Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
     const ImplementationRepository::EnvironmentList &_tao_elem
-  ) // copying
+  )
 {
   TAO_OutputCDR stream;
+  
   if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        ImplementationRepository::_tc_EnvironmentList,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
+    {
+      _tao_any._tao_replace (
+          ImplementationRepository::_tc_EnvironmentList,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin ()
+        );
+    }
 }
 
-void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::EnvironmentList *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    ImplementationRepository::EnvironmentList *_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      ImplementationRepository::_tc_EnvironmentList,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      ImplementationRepository::EnvironmentList::_tao_any_destructor
-    );
+  
+  if (stream << *_tao_elem)
+    {
+      _tao_any._tao_replace (
+          ImplementationRepository::_tc_EnvironmentList,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          _tao_elem,
+          ImplementationRepository::EnvironmentList::_tao_any_destructor
+        );
+    }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository::EnvironmentList *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    ImplementationRepository::EnvironmentList *&_tao_elem
+  )
 {
   return _tao_any >>= ACE_const_cast(
       const ImplementationRepository::EnvironmentList*&,
@@ -6834,56 +6946,76 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepository::EnvironmentList *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const ImplementationRepository::EnvironmentList *&_tao_elem
+  )
 {
   _tao_elem = 0;
+  
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_EnvironmentList ACE_ENV_ARG_PARAMETER);
+    CORBA::Boolean result =
+      type->equivalent (
+          ImplementationRepository::_tc_EnvironmentList
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
     
     if (!result)
-      return 0; // not equivalent
+      {
+        return 0; // not equivalent
+      }
     
     if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const ImplementationRepository::EnvironmentList*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      ImplementationRepository::EnvironmentList *tmp;
-      ACE_NEW_RETURN (tmp, ImplementationRepository::EnvironmentList, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
       {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            ImplementationRepository::_tc_EnvironmentList,
-            1,
-            ACE_static_cast (void *, tmp),
-            ImplementationRepository::EnvironmentList::_tao_any_destructor
+        _tao_elem = ACE_static_cast(
+            const ImplementationRepository::EnvironmentList*,
+            _tao_any.value ()
           );
-        _tao_elem = tmp;
+        
         return 1;
       }
-      else
+    else
       {
-        delete tmp;
+        ImplementationRepository::EnvironmentList *tmp = 0;
+        ACE_NEW_RETURN (
+            tmp,
+            ImplementationRepository::EnvironmentList,
+            0
+          );
+        
+        TAO_InputCDR stream (
+            _tao_any._tao_get_cdr (),
+            _tao_any._tao_byte_order ()
+          );
+        
+        if (stream >> *tmp)
+          {
+            ((CORBA::Any *)&_tao_any)->_tao_replace (
+                ImplementationRepository::_tc_EnvironmentList,
+                1,
+                ACE_static_cast (void *, tmp),
+                ImplementationRepository::EnvironmentList::_tao_any_destructor
+              );
+            
+            _tao_elem = tmp;
+            return 1;
+          }
+        else
+          {
+            delete tmp;
+          }
       }
-    }
   }
   ACE_CATCHANY
   {
   }
   ACE_ENDTRY;
+  
   return 0;
 }
 
@@ -6927,203 +7059,310 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository
   return 0;
 }
 
-void operator<<= (CORBA::Any &_tao_any, const ImplementationRepository::StartupOptions &_tao_elem) // copying
+
+// TAO_IDL - Generated from 
+// be/be_visitor_structure/any_op_cs.cpp:58
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const ImplementationRepository::StartupOptions &_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
-      ImplementationRepository::_tc_StartupOptions,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
-    );
+  
+  if (stream << _tao_elem)
+    {
+      _tao_any._tao_replace (
+          ImplementationRepository::_tc_StartupOptions,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin ()
+        );
+    }
 }
 
-void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::StartupOptions *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    ImplementationRepository::StartupOptions *_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      ImplementationRepository::_tc_StartupOptions,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      ImplementationRepository::StartupOptions::_tao_any_destructor
-    );
+  
+  if (stream << *_tao_elem)
+    {
+      _tao_any._tao_replace (
+          ImplementationRepository::_tc_StartupOptions,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          _tao_elem,
+          ImplementationRepository::StartupOptions::_tao_any_destructor
+        );
+    }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository::StartupOptions *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    ImplementationRepository::StartupOptions *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(const ImplementationRepository::StartupOptions*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast (
+      const ImplementationRepository::StartupOptions *&,
+      _tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepository::StartupOptions *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const ImplementationRepository::StartupOptions *&_tao_elem
+  )
 {
   _tao_elem = 0;
+  
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_StartupOptions ACE_ENV_ARG_PARAMETER);
+    CORBA::Boolean result =
+      type->equivalent (
+          ImplementationRepository::_tc_StartupOptions
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
     
-    if (!result)
-      return 0; // not equivalent
+    if (result == 0)
+      {
+        return 0; // not equivalent
+      }
     
     if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const ImplementationRepository::StartupOptions*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      ImplementationRepository::StartupOptions *tmp;
-      ACE_NEW_RETURN (tmp, ImplementationRepository::StartupOptions, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
       {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            ImplementationRepository::_tc_StartupOptions,
-            1,
-            ACE_static_cast (void *, tmp),
-            ImplementationRepository::StartupOptions::_tao_any_destructor
+        _tao_elem = ACE_static_cast (
+            const ImplementationRepository::StartupOptions*,
+            _tao_any.value ()
           );
-        _tao_elem = tmp;
+        
         return 1;
       }
-      else
+    else
       {
-        delete tmp;
+        ImplementationRepository::StartupOptions *tmp;
+        ACE_NEW_RETURN (
+            tmp,
+            ImplementationRepository::StartupOptions,
+            0
+          );
+        
+        TAO_InputCDR stream (
+            _tao_any._tao_get_cdr (),
+            _tao_any._tao_byte_order ()
+          );
+        
+        if (stream >> *tmp)
+          {
+            ((CORBA::Any *)&_tao_any)->_tao_replace (
+                ImplementationRepository::_tc_StartupOptions,
+                1,
+                ACE_static_cast (void *, tmp),
+                ImplementationRepository::StartupOptions::_tao_any_destructor
+              );
+            
+            _tao_elem = tmp;
+            return 1;
+          }
+        else
+          {
+            delete tmp;
+          }
       }
-    }
   }
   ACE_CATCHANY
   {
   }
   ACE_ENDTRY;
+  
   return 0;
 }
 
-void operator<<= (CORBA::Any &_tao_any, const ImplementationRepository::ServerInformation &_tao_elem) // copying
+
+// TAO_IDL - Generated from 
+// be/be_visitor_structure/any_op_cs.cpp:58
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const ImplementationRepository::ServerInformation &_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
-      ImplementationRepository::_tc_ServerInformation,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
-    );
+  
+  if (stream << _tao_elem)
+    {
+      _tao_any._tao_replace (
+          ImplementationRepository::_tc_ServerInformation,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin ()
+        );
+    }
 }
 
-void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::ServerInformation *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    ImplementationRepository::ServerInformation *_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      ImplementationRepository::_tc_ServerInformation,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      ImplementationRepository::ServerInformation::_tao_any_destructor
-    );
+  
+  if (stream << *_tao_elem)
+    {
+      _tao_any._tao_replace (
+          ImplementationRepository::_tc_ServerInformation,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          _tao_elem,
+          ImplementationRepository::ServerInformation::_tao_any_destructor
+        );
+    }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository::ServerInformation *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    ImplementationRepository::ServerInformation *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(const ImplementationRepository::ServerInformation*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast (
+      const ImplementationRepository::ServerInformation *&,
+      _tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepository::ServerInformation *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const ImplementationRepository::ServerInformation *&_tao_elem
+  )
 {
   _tao_elem = 0;
+  
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformation ACE_ENV_ARG_PARAMETER);
+    CORBA::Boolean result =
+      type->equivalent (
+          ImplementationRepository::_tc_ServerInformation
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
     
-    if (!result)
-      return 0; // not equivalent
+    if (result == 0)
+      {
+        return 0; // not equivalent
+      }
     
     if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const ImplementationRepository::ServerInformation*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      ImplementationRepository::ServerInformation *tmp;
-      ACE_NEW_RETURN (tmp, ImplementationRepository::ServerInformation, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
       {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            ImplementationRepository::_tc_ServerInformation,
-            1,
-            ACE_static_cast (void *, tmp),
-            ImplementationRepository::ServerInformation::_tao_any_destructor
+        _tao_elem = ACE_static_cast (
+            const ImplementationRepository::ServerInformation*,
+            _tao_any.value ()
           );
-        _tao_elem = tmp;
+        
         return 1;
       }
-      else
+    else
       {
-        delete tmp;
+        ImplementationRepository::ServerInformation *tmp;
+        ACE_NEW_RETURN (
+            tmp,
+            ImplementationRepository::ServerInformation,
+            0
+          );
+        
+        TAO_InputCDR stream (
+            _tao_any._tao_get_cdr (),
+            _tao_any._tao_byte_order ()
+          );
+        
+        if (stream >> *tmp)
+          {
+            ((CORBA::Any *)&_tao_any)->_tao_replace (
+                ImplementationRepository::_tc_ServerInformation,
+                1,
+                ACE_static_cast (void *, tmp),
+                ImplementationRepository::ServerInformation::_tao_any_destructor
+              );
+            
+            _tao_elem = tmp;
+            return 1;
+          }
+        else
+          {
+            delete tmp;
+          }
       }
-    }
   }
   ACE_CATCHANY
   {
   }
   ACE_ENDTRY;
+  
   return 0;
 }
 
+
+// TAO_IDL - Generated from 
+// be/be_visitor_sequence/any_op_cs.cpp:61
+
+// Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
     const ImplementationRepository::ServerInformationList &_tao_elem
-  ) // copying
+  )
 {
   TAO_OutputCDR stream;
+  
   if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        ImplementationRepository::_tc_ServerInformationList,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
+    {
+      _tao_any._tao_replace (
+          ImplementationRepository::_tc_ServerInformationList,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin ()
+        );
+    }
 }
 
-void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::ServerInformationList *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    ImplementationRepository::ServerInformationList *_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      ImplementationRepository::_tc_ServerInformationList,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      ImplementationRepository::ServerInformationList::_tao_any_destructor
-    );
+  
+  if (stream << *_tao_elem)
+    {
+      _tao_any._tao_replace (
+          ImplementationRepository::_tc_ServerInformationList,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          _tao_elem,
+          ImplementationRepository::ServerInformationList::_tao_any_destructor
+        );
+    }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository::ServerInformationList *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    ImplementationRepository::ServerInformationList *&_tao_elem
+  )
 {
   return _tao_any >>= ACE_const_cast(
       const ImplementationRepository::ServerInformationList*&,
@@ -7131,146 +7370,225 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepository::ServerInformationList *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const ImplementationRepository::ServerInformationList *&_tao_elem
+  )
 {
   _tao_elem = 0;
+  
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformationList ACE_ENV_ARG_PARAMETER);
+    CORBA::Boolean result =
+      type->equivalent (
+          ImplementationRepository::_tc_ServerInformationList
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
     
     if (!result)
-      return 0; // not equivalent
+      {
+        return 0; // not equivalent
+      }
     
     if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const ImplementationRepository::ServerInformationList*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      ImplementationRepository::ServerInformationList *tmp;
-      ACE_NEW_RETURN (tmp, ImplementationRepository::ServerInformationList, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
       {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            ImplementationRepository::_tc_ServerInformationList,
-            1,
-            ACE_static_cast (void *, tmp),
-            ImplementationRepository::ServerInformationList::_tao_any_destructor
+        _tao_elem = ACE_static_cast(
+            const ImplementationRepository::ServerInformationList*,
+            _tao_any.value ()
           );
-        _tao_elem = tmp;
+        
         return 1;
       }
-      else
+    else
       {
-        delete tmp;
+        ImplementationRepository::ServerInformationList *tmp = 0;
+        ACE_NEW_RETURN (
+            tmp,
+            ImplementationRepository::ServerInformationList,
+            0
+          );
+        
+        TAO_InputCDR stream (
+            _tao_any._tao_get_cdr (),
+            _tao_any._tao_byte_order ()
+          );
+        
+        if (stream >> *tmp)
+          {
+            ((CORBA::Any *)&_tao_any)->_tao_replace (
+                ImplementationRepository::_tc_ServerInformationList,
+                1,
+                ACE_static_cast (void *, tmp),
+                ImplementationRepository::ServerInformationList::_tao_any_destructor
+              );
+            
+            _tao_elem = tmp;
+            return 1;
+          }
+        else
+          {
+            delete tmp;
+          }
       }
-    }
   }
   ACE_CATCHANY
   {
   }
   ACE_ENDTRY;
+  
   return 0;
 }
 
-void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::Administration_ptr _tao_elem)
+
+// TAO_IDL - Generated from 
+// be/be_visitor_interface/any_op_cs.cpp:60
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    ImplementationRepository::Administration_ptr _tao_elem
+  )
 {
   TAO_OutputCDR stream;
+  
   if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        ImplementationRepository::_tc_Administration, 
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin (),
-        1,
-        ImplementationRepository::Administration::_duplicate (_tao_elem),
-        ImplementationRepository::Administration::_tao_any_destructor
-      );
-  }
+    {
+      _tao_any._tao_replace (
+          ImplementationRepository::_tc_Administration, 
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          ImplementationRepository::Administration::_duplicate (_tao_elem),
+          ImplementationRepository::Administration::_tao_any_destructor
+        );
+    }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository::Administration_ptr &_tao_elem)
+void operator<<= (
+    CORBA::Any &_tao_any,
+    ImplementationRepository::Administration_ptr *_tao_elem
+  )
+{
+  TAO_OutputCDR stream;
+  
+  if (stream << *_tao_elem)
+    {
+      _tao_any._tao_replace (
+          ImplementationRepository::_tc_Administration, 
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          *_tao_elem,
+          ImplementationRepository::Administration::_tao_any_destructor
+        );
+    }
+}
+
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    ImplementationRepository::Administration_ptr &_tao_elem
+  )
 {
   ACE_TRY_NEW_ENV
   {
     _tao_elem = ImplementationRepository::Administration::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
     
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_Administration ACE_ENV_ARG_PARAMETER);
+    CORBA::Boolean result =
+      type->equivalent (
+          ImplementationRepository::_tc_Administration
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
     
     if (!result)
-      return 0; // not equivalent
+      {
+        return 0; // not equivalent
+      }
     
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
       );
+    
     if (stream >> _tao_elem)
-    {
-      ((CORBA::Any *)&_tao_any)->_tao_replace (
-          ImplementationRepository::_tc_Administration,
-          1,
-          _tao_elem,
-          ImplementationRepository::Administration::_tao_any_destructor
-        );
-      return 1;
-    }
+      {
+        ((CORBA::Any *)&_tao_any)->_tao_replace (
+            ImplementationRepository::_tc_Administration,
+            1,
+            _tao_elem,
+            ImplementationRepository::Administration::_tao_any_destructor
+          );
+        
+        return 1;
+      }
   }
   ACE_CATCHANY
   {
-    _tao_elem = ImplementationRepository::Administration::_nil ();
-    return 0;
   }
   ACE_ENDTRY;
+  
   _tao_elem = ImplementationRepository::Administration::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<ImplementationRepository::Administration,ImplementationRepository::Administration_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<ImplementationRepository::Administration,ImplementationRepository::Administration_var>
+  template class TAO_Object_Manager<ImplementationRepository::Administration,ImplementationRepository::Administration_var>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#  pragma instantiate TAO_Object_Manager<ImplementationRepository::Administration,ImplementationRepository::Administration_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, const ImplementationRepository::Administration::AlreadyRegistered &_tao_elem) // copying
+
+// TAO_IDL - Generated from 
+// be/be_visitor_exception/any_op_cs.cpp:60
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const ImplementationRepository::Administration::AlreadyRegistered &_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
-      ImplementationRepository::Administration::_tc_AlreadyRegistered,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
-    );
+  
+  if (stream << _tao_elem)
+    {
+      _tao_any._tao_replace (
+          ImplementationRepository::Administration::_tc_AlreadyRegistered,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin ()
+        );
+    }
 }
 
-void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::Administration::AlreadyRegistered *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    ImplementationRepository::Administration::AlreadyRegistered *_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      ImplementationRepository::Administration::_tc_AlreadyRegistered,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      ImplementationRepository::Administration::AlreadyRegistered::_tao_any_destructor
-    );
+  
+  if (stream << *_tao_elem)
+    {
+      _tao_any._tao_replace (
+          ImplementationRepository::Administration::_tc_AlreadyRegistered,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          _tao_elem,
+          ImplementationRepository::Administration::AlreadyRegistered::_tao_any_destructor
+        );
+    }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository::Administration::AlreadyRegistered *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,ImplementationRepository::Administration::AlreadyRegistered *&_tao_elem
+  )
 {
   return _tao_any >>= ACE_const_cast(
       const ImplementationRepository::Administration::AlreadyRegistered*&,
@@ -7278,89 +7596,136 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepository::Administration::AlreadyRegistered *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const ImplementationRepository::Administration::AlreadyRegistered *&_tao_elem
+  )
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_AlreadyRegistered ACE_ENV_ARG_PARAMETER);
+    CORBA::Boolean result =
+      type->equivalent (
+          ImplementationRepository::Administration::_tc_AlreadyRegistered
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
     
-    if (!result)
-      return 0; // not equivalent
+    if (result == 0)
+      {
+        return 0; // not equivalent
+      }
     
     if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (ImplementationRepository::Administration::AlreadyRegistered *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ImplementationRepository::Administration::AlreadyRegistered *tmp;
-      ACE_NEW_RETURN (tmp, ImplementationRepository::Administration::AlreadyRegistered, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      CORBA::String_var interface_repository_id;
-      if (!(stream >> interface_repository_id.out ()))
-        return 0;
-      if (ACE_OS::strcmp (
-          interface_repository_id.in (),
-          "IDL:ImplementationRepository/Administration/AlreadyRegistered:1.0"))
-        return 0;
-      if (stream >> *tmp)
       {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            ImplementationRepository::Administration::_tc_AlreadyRegistered,
-            1,
-            tmp,
-            ImplementationRepository::Administration::AlreadyRegistered::_tao_any_destructor
-          );
-        _tao_elem = tmp;
+        _tao_elem = (ImplementationRepository::Administration::AlreadyRegistered *)_tao_any.value ();
         return 1;
       }
-      else
+    else
       {
-        delete tmp;
+        ImplementationRepository::Administration::AlreadyRegistered *tmp = 0;
+        ACE_NEW_RETURN (
+            tmp,
+            ImplementationRepository::Administration::AlreadyRegistered,
+            0
+          );
+        
+        TAO_InputCDR stream (
+            _tao_any._tao_get_cdr (),
+            _tao_any._tao_byte_order ()
+          );
+        
+        CORBA::String_var interface_repository_id;
+        
+        if (!(stream >> interface_repository_id.out ()))
+          {
+            return 0;
+          }
+        
+        if (ACE_OS::strcmp (
+                interface_repository_id.in (),
+                "IDL:ImplementationRepository/Administration/AlreadyRegistered:1.0")
+              )
+          {
+            return 0;
+          }
+        
+        if (stream >> *tmp)
+          {
+            ((CORBA::Any *)&_tao_any)->_tao_replace (
+                ImplementationRepository::Administration::_tc_AlreadyRegistered,
+                1,
+                tmp,
+                ImplementationRepository::Administration::AlreadyRegistered::_tao_any_destructor
+              );
+            
+            _tao_elem = tmp;
+            return 1;
+          }
+        else
+          {
+            delete tmp;
+          }
       }
-    }
   }
   ACE_CATCHANY
   {
   }
   ACE_ENDTRY;
+  
   return 0;
 }
 
-void operator<<= (CORBA::Any &_tao_any, const ImplementationRepository::Administration::CannotActivate &_tao_elem) // copying
+
+// TAO_IDL - Generated from 
+// be/be_visitor_exception/any_op_cs.cpp:60
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const ImplementationRepository::Administration::CannotActivate &_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
-      ImplementationRepository::Administration::_tc_CannotActivate,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
-    );
+  
+  if (stream << _tao_elem)
+    {
+      _tao_any._tao_replace (
+          ImplementationRepository::Administration::_tc_CannotActivate,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin ()
+        );
+    }
 }
 
-void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::Administration::CannotActivate *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    ImplementationRepository::Administration::CannotActivate *_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      ImplementationRepository::Administration::_tc_CannotActivate,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      ImplementationRepository::Administration::CannotActivate::_tao_any_destructor
-    );
+  
+  if (stream << *_tao_elem)
+    {
+      _tao_any._tao_replace (
+          ImplementationRepository::Administration::_tc_CannotActivate,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          _tao_elem,
+          ImplementationRepository::Administration::CannotActivate::_tao_any_destructor
+        );
+    }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository::Administration::CannotActivate *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,ImplementationRepository::Administration::CannotActivate *&_tao_elem
+  )
 {
   return _tao_any >>= ACE_const_cast(
       const ImplementationRepository::Administration::CannotActivate*&,
@@ -7368,89 +7733,136 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepository::Administration::CannotActivate *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const ImplementationRepository::Administration::CannotActivate *&_tao_elem
+  )
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_CannotActivate ACE_ENV_ARG_PARAMETER);
+    CORBA::Boolean result =
+      type->equivalent (
+          ImplementationRepository::Administration::_tc_CannotActivate
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
     
-    if (!result)
-      return 0; // not equivalent
+    if (result == 0)
+      {
+        return 0; // not equivalent
+      }
     
     if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (ImplementationRepository::Administration::CannotActivate *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ImplementationRepository::Administration::CannotActivate *tmp;
-      ACE_NEW_RETURN (tmp, ImplementationRepository::Administration::CannotActivate, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      CORBA::String_var interface_repository_id;
-      if (!(stream >> interface_repository_id.out ()))
-        return 0;
-      if (ACE_OS::strcmp (
-          interface_repository_id.in (),
-          "IDL:ImplementationRepository/Administration/CannotActivate:1.0"))
-        return 0;
-      if (stream >> *tmp)
       {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            ImplementationRepository::Administration::_tc_CannotActivate,
-            1,
-            tmp,
-            ImplementationRepository::Administration::CannotActivate::_tao_any_destructor
-          );
-        _tao_elem = tmp;
+        _tao_elem = (ImplementationRepository::Administration::CannotActivate *)_tao_any.value ();
         return 1;
       }
-      else
+    else
       {
-        delete tmp;
+        ImplementationRepository::Administration::CannotActivate *tmp = 0;
+        ACE_NEW_RETURN (
+            tmp,
+            ImplementationRepository::Administration::CannotActivate,
+            0
+          );
+        
+        TAO_InputCDR stream (
+            _tao_any._tao_get_cdr (),
+            _tao_any._tao_byte_order ()
+          );
+        
+        CORBA::String_var interface_repository_id;
+        
+        if (!(stream >> interface_repository_id.out ()))
+          {
+            return 0;
+          }
+        
+        if (ACE_OS::strcmp (
+                interface_repository_id.in (),
+                "IDL:ImplementationRepository/Administration/CannotActivate:1.0")
+              )
+          {
+            return 0;
+          }
+        
+        if (stream >> *tmp)
+          {
+            ((CORBA::Any *)&_tao_any)->_tao_replace (
+                ImplementationRepository::Administration::_tc_CannotActivate,
+                1,
+                tmp,
+                ImplementationRepository::Administration::CannotActivate::_tao_any_destructor
+              );
+            
+            _tao_elem = tmp;
+            return 1;
+          }
+        else
+          {
+            delete tmp;
+          }
       }
-    }
   }
   ACE_CATCHANY
   {
   }
   ACE_ENDTRY;
+  
   return 0;
 }
 
-void operator<<= (CORBA::Any &_tao_any, const ImplementationRepository::Administration::NotFound &_tao_elem) // copying
+
+// TAO_IDL - Generated from 
+// be/be_visitor_exception/any_op_cs.cpp:60
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const ImplementationRepository::Administration::NotFound &_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
-      ImplementationRepository::Administration::_tc_NotFound,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
-    );
+  
+  if (stream << _tao_elem)
+    {
+      _tao_any._tao_replace (
+          ImplementationRepository::Administration::_tc_NotFound,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin ()
+        );
+    }
 }
 
-void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::Administration::NotFound *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    ImplementationRepository::Administration::NotFound *_tao_elem
+  )
 {
   TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      ImplementationRepository::Administration::_tc_NotFound,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      ImplementationRepository::Administration::NotFound::_tao_any_destructor
-    );
+  
+  if (stream << *_tao_elem)
+    {
+      _tao_any._tao_replace (
+          ImplementationRepository::Administration::_tc_NotFound,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          _tao_elem,
+          ImplementationRepository::Administration::NotFound::_tao_any_destructor
+        );
+    }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository::Administration::NotFound *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,ImplementationRepository::Administration::NotFound *&_tao_elem
+  )
 {
   return _tao_any >>= ACE_const_cast(
       const ImplementationRepository::Administration::NotFound*&,
@@ -7458,122 +7870,186 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepository::Administration::NotFound *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const ImplementationRepository::Administration::NotFound *&_tao_elem
+  )
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_NotFound ACE_ENV_ARG_PARAMETER);
+    CORBA::Boolean result =
+      type->equivalent (
+          ImplementationRepository::Administration::_tc_NotFound
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
     
-    if (!result)
-      return 0; // not equivalent
+    if (result == 0)
+      {
+        return 0; // not equivalent
+      }
     
     if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (ImplementationRepository::Administration::NotFound *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ImplementationRepository::Administration::NotFound *tmp;
-      ACE_NEW_RETURN (tmp, ImplementationRepository::Administration::NotFound, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      CORBA::String_var interface_repository_id;
-      if (!(stream >> interface_repository_id.out ()))
-        return 0;
-      if (ACE_OS::strcmp (
-          interface_repository_id.in (),
-          "IDL:ImplementationRepository/Administration/NotFound:1.0"))
-        return 0;
-      if (stream >> *tmp)
       {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            ImplementationRepository::Administration::_tc_NotFound,
-            1,
-            tmp,
-            ImplementationRepository::Administration::NotFound::_tao_any_destructor
-          );
-        _tao_elem = tmp;
+        _tao_elem = (ImplementationRepository::Administration::NotFound *)_tao_any.value ();
         return 1;
       }
-      else
+    else
       {
-        delete tmp;
+        ImplementationRepository::Administration::NotFound *tmp = 0;
+        ACE_NEW_RETURN (
+            tmp,
+            ImplementationRepository::Administration::NotFound,
+            0
+          );
+        
+        TAO_InputCDR stream (
+            _tao_any._tao_get_cdr (),
+            _tao_any._tao_byte_order ()
+          );
+        
+        CORBA::String_var interface_repository_id;
+        
+        if (!(stream >> interface_repository_id.out ()))
+          {
+            return 0;
+          }
+        
+        if (ACE_OS::strcmp (
+                interface_repository_id.in (),
+                "IDL:ImplementationRepository/Administration/NotFound:1.0")
+              )
+          {
+            return 0;
+          }
+        
+        if (stream >> *tmp)
+          {
+            ((CORBA::Any *)&_tao_any)->_tao_replace (
+                ImplementationRepository::Administration::_tc_NotFound,
+                1,
+                tmp,
+                ImplementationRepository::Administration::NotFound::_tao_any_destructor
+              );
+            
+            _tao_elem = tmp;
+            return 1;
+          }
+        else
+          {
+            delete tmp;
+          }
       }
-    }
   }
   ACE_CATCHANY
   {
   }
   ACE_ENDTRY;
+  
   return 0;
 }
 
-void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::ServerInformationIterator_ptr _tao_elem)
+
+// TAO_IDL - Generated from 
+// be/be_visitor_interface/any_op_cs.cpp:60
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    ImplementationRepository::ServerInformationIterator_ptr _tao_elem
+  )
 {
   TAO_OutputCDR stream;
+  
   if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        ImplementationRepository::_tc_ServerInformationIterator, 
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin (),
-        1,
-        ImplementationRepository::ServerInformationIterator::_duplicate (_tao_elem),
-        ImplementationRepository::ServerInformationIterator::_tao_any_destructor
-      );
-  }
+    {
+      _tao_any._tao_replace (
+          ImplementationRepository::_tc_ServerInformationIterator, 
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          ImplementationRepository::ServerInformationIterator::_duplicate (_tao_elem),
+          ImplementationRepository::ServerInformationIterator::_tao_any_destructor
+        );
+    }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository::ServerInformationIterator_ptr &_tao_elem)
+void operator<<= (
+    CORBA::Any &_tao_any,
+    ImplementationRepository::ServerInformationIterator_ptr *_tao_elem
+  )
+{
+  TAO_OutputCDR stream;
+  
+  if (stream << *_tao_elem)
+    {
+      _tao_any._tao_replace (
+          ImplementationRepository::_tc_ServerInformationIterator, 
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
+          1,
+          *_tao_elem,
+          ImplementationRepository::ServerInformationIterator::_tao_any_destructor
+        );
+    }
+}
+
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    ImplementationRepository::ServerInformationIterator_ptr &_tao_elem
+  )
 {
   ACE_TRY_NEW_ENV
   {
     _tao_elem = ImplementationRepository::ServerInformationIterator::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
     
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformationIterator ACE_ENV_ARG_PARAMETER);
+    CORBA::Boolean result =
+      type->equivalent (
+          ImplementationRepository::_tc_ServerInformationIterator
+          ACE_ENV_ARG_PARAMETER
+        );
     ACE_TRY_CHECK;
     
     if (!result)
-      return 0; // not equivalent
+      {
+        return 0; // not equivalent
+      }
     
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
       );
+    
     if (stream >> _tao_elem)
-    {
-      ((CORBA::Any *)&_tao_any)->_tao_replace (
-          ImplementationRepository::_tc_ServerInformationIterator,
-          1,
-          _tao_elem,
-          ImplementationRepository::ServerInformationIterator::_tao_any_destructor
-        );
-      return 1;
-    }
+      {
+        ((CORBA::Any *)&_tao_any)->_tao_replace (
+            ImplementationRepository::_tc_ServerInformationIterator,
+            1,
+            _tao_elem,
+            ImplementationRepository::ServerInformationIterator::_tao_any_destructor
+          );
+        
+        return 1;
+      }
   }
   ACE_CATCHANY
   {
-    _tao_elem = ImplementationRepository::ServerInformationIterator::_nil ();
-    return 0;
   }
   ACE_ENDTRY;
+  
   _tao_elem = ImplementationRepository::ServerInformationIterator::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<ImplementationRepository::ServerInformationIterator,ImplementationRepository::ServerInformationIterator_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<ImplementationRepository::ServerInformationIterator,ImplementationRepository::ServerInformationIterator_var>
+  template class TAO_Object_Manager<ImplementationRepository::ServerInformationIterator,ImplementationRepository::ServerInformationIterator_var>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#  pragma instantiate TAO_Object_Manager<ImplementationRepository::ServerInformationIterator,ImplementationRepository::ServerInformationIterator_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 CORBA::Boolean operator<< (
@@ -7638,16 +8114,16 @@ CORBA::Boolean operator>> (
   CORBA::ULong _tao_seq_len;
   if (strm >> _tao_seq_len)
   {
+    // Add a check to the length of the sequence
+    // to make sure it does not exceed the length
+    // of the stream. (See bug 1159.)
+    if (_tao_seq_len > strm.length())
+      return 0;
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // 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++)
@@ -7685,16 +8161,16 @@ CORBA::Boolean operator>> (
   CORBA::ULong _tao_seq_len;
   if (strm >> _tao_seq_len)
   {
+    // Add a check to the length of the sequence
+    // to make sure it does not exceed the length
+    // of the stream. (See bug 1159.)
+    if (_tao_seq_len > strm.length())
+      return 0;
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // 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/PortableServer/ImplRepoC.h b/TAO/tao/PortableServer/ImplRepoC.h
index d8ed0a2755c..cd9cf3b1002 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"
@@ -39,13 +39,13 @@
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
-#define TAO_EXPORT_MACRO TAO_PortableServer_Export
+#define TAO_EXPORT_MACRO TAO_Export
 
 #if defined (TAO_EXPORT_NESTED_CLASSES)
 #  if defined (TAO_EXPORT_NESTED_MACRO)
 #    undef TAO_EXPORT_NESTED_MACRO
 #  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
+#  define TAO_EXPORT_NESTED_MACRO TAO_Export
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
@@ -61,40 +61,40 @@
 
 TAO_NAMESPACE  ImplementationRepository
 {
-
+  
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___PTR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___PTR_CH_
-
+  
   class ServerObject;
   typedef ServerObject *ServerObject_ptr;
-
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___VAR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___VAR_CH_
-
-  class TAO_PortableServer_Export ServerObject_var : public TAO_Base_var
+  
+  class TAO_Export ServerObject_var : public TAO_Base_var
   {
   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 tao_duplicate (ServerObject_ptr);
@@ -105,7 +105,7 @@ TAO_NAMESPACE  ImplementationRepository
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ServerObject_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -115,12 +115,12 @@ TAO_NAMESPACE  ImplementationRepository
 
 
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___OUT_CH_
-
-  class TAO_PortableServer_Export ServerObject_out
+  
+  class TAO_Export ServerObject_out
   {
   public:
     ServerObject_out (ServerObject_ptr &);
@@ -132,25 +132,31 @@ TAO_NAMESPACE  ImplementationRepository
     operator ServerObject_ptr &();
     ServerObject_ptr &ptr (void);
     ServerObject_ptr operator-> (void);
-
+  
   private:
     ServerObject_ptr &ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  // *************************************************************
+  // ImplementationRepository::ServerObject
+  // TAO_IDL - Generated from
+  // be/be_visitor_interface/interface_ch.cpp:106
+  // *************************************************************
+  
+  
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_
-
+  
   // 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
+  
+  class TAO_Export ServerObject
     : public virtual CORBA_Object
   {
   public:
@@ -160,89 +166,89 @@ TAO_NAMESPACE  ImplementationRepository
   #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     static int _tao_class_id;
-
+    
     // The static operations.
     static ServerObject_ptr _duplicate (ServerObject_ptr obj);
-
+    
     static ServerObject_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerObject_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerObject_ptr _nil (void)
       {
         return (ServerObject_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void*);
-
+    
     virtual void ping (
-
+        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     virtual void shutdown (
-
+        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     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);
-
+    
     // These 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,
+        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;
-
+    
     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.
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-
-  class TAO_PortableServer_Export _TAO_ServerObject_Proxy_Impl
+  
+  class TAO_Export _TAO_ServerObject_Proxy_Impl
     : public virtual TAO_Object_Proxy_Impl
   {
   public:
@@ -254,7 +260,7 @@ TAO_NAMESPACE  ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     virtual void shutdown (
         CORBA_Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -262,28 +268,28 @@ TAO_NAMESPACE  ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
-
+    
+    
   protected:
     _TAO_ServerObject_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
-  class TAO_PortableServer_Export _TAO_ServerObject_Remote_Proxy_Impl
+  
+  class TAO_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_
@@ -292,7 +298,7 @@ TAO_NAMESPACE  ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     virtual void shutdown (
         CORBA_Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -300,25 +306,25 @@ TAO_NAMESPACE  ImplementationRepository
       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
+  // 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
+  //                 Base Proxy Broker Declaration 
   //
-
-    class TAO_PortableServer_Export _TAO_ServerObject_Proxy_Broker
+  
+    class TAO_Export _TAO_ServerObject_Proxy_Broker
   {
   public:
     virtual ~_TAO_ServerObject_Proxy_Broker (void);
@@ -326,101 +332,101 @@ TAO_NAMESPACE  ImplementationRepository
         ServerObject *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_ServerObject_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_ServerObject_Remote_Proxy_Broker
+  
+  class TAO_Export _TAO_ServerObject_Remote_Proxy_Broker
     : public virtual _TAO_ServerObject_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_ServerObject_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_ServerObject_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_ServerObject_Proxy_Impl &select_proxy (
         ServerObject *object
         ACE_ENV_ARG_DECL
       );
-
+    
   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
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
 #endif /* end #if !defined */
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerObject;
-
+  
   struct EnvironmentVariable;
   class EnvironmentVariable_var;
-
-  struct TAO_PortableServer_Export EnvironmentVariable
+  
+  struct TAO_Export EnvironmentVariable
   {
-
+    
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef EnvironmentVariable_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     static void _tao_any_destructor (void*);
-
+    
     TAO_String_Manager name;
     TAO_String_Manager value;
-
+    
   };
-
-  class TAO_PortableServer_Export EnvironmentVariable_var
+  
+  class TAO_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
+    
+    // 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
+  
+  class TAO_Export EnvironmentVariable_out
   {
   public:
     EnvironmentVariable_out (EnvironmentVariable *&);
@@ -431,33 +437,33 @@ TAO_NAMESPACE  ImplementationRepository
     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_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); 
     _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (
         CORBA::ULong maximum,
         CORBA::ULong length,
@@ -471,15 +477,15 @@ TAO_NAMESPACE  ImplementationRepository
         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);
@@ -492,99 +498,99 @@ TAO_NAMESPACE  ImplementationRepository
         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;
-
+  
   // *************************************************************
   // EnvironmentList
   // *************************************************************
-
-  class TAO_PortableServer_Export EnvironmentList : public
+  
+  class TAO_Export EnvironmentList : public 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<EnvironmentVariable>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#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::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;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-
-
+    
+    
   };
-
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST___VAR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST___VAR_CH_
-
+  
   // *************************************************************
   // class ImplementationRepository::EnvironmentList_var
   // *************************************************************
-
-  class TAO_PortableServer_Export EnvironmentList_var
+  
+  class TAO_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
+    
+    // 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 */
-
-
+  
+  
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST___OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST___OUT_CH_
-
-  class TAO_PortableServer_Export EnvironmentList_out
+  
+  class TAO_Export EnvironmentList_out
   {
   public:
     EnvironmentList_out (EnvironmentList *&);
@@ -596,18 +602,18 @@ TAO_NAMESPACE  ImplementationRepository
     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;
-
+  
   enum ActivationMode
   {
     NORMAL,
@@ -615,60 +621,60 @@ TAO_NAMESPACE  ImplementationRepository
     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
+  
+  struct TAO_Export StartupOptions
   {
-
+    
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef StartupOptions_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     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;
-
+    
   };
-
-  class TAO_PortableServer_Export StartupOptions_var
+  
+  class TAO_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
+    
+    // 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
+  
+  class TAO_Export StartupOptions_out
   {
   public:
     StartupOptions_out (StartupOptions *&);
@@ -679,65 +685,65 @@ TAO_NAMESPACE  ImplementationRepository
     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
+  
+  struct TAO_Export ServerInformation
   {
-
+    
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ServerInformation_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     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;
-
+    
   };
-
-  class TAO_PortableServer_Export ServerInformation_var
+  
+  class TAO_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
+    
+    // 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
+  
+  class TAO_Export ServerInformation_out
   {
   public:
     ServerInformation_out (ServerInformation *&);
@@ -748,28 +754,28 @@ TAO_NAMESPACE  ImplementationRepository
     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_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); 
     _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (
         CORBA::ULong maximum,
         CORBA::ULong length,
@@ -783,15 +789,15 @@ TAO_NAMESPACE  ImplementationRepository
         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);
@@ -804,99 +810,99 @@ TAO_NAMESPACE  ImplementationRepository
         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;
-
+  
   // *************************************************************
   // ServerInformationList
   // *************************************************************
-
-  class TAO_PortableServer_Export ServerInformationList : public
+  
+  class TAO_Export ServerInformationList : public 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<ServerInformation>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#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::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;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-
-
+    
+    
   };
-
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST___VAR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST___VAR_CH_
-
+  
   // *************************************************************
   // class ImplementationRepository::ServerInformationList_var
   // *************************************************************
-
-  class TAO_PortableServer_Export ServerInformationList_var
+  
+  class TAO_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
+    
+    // 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 */
-
-
+  
+  
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST___OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST___OUT_CH_
-
-  class TAO_PortableServer_Export ServerInformationList_out
+  
+  class TAO_Export ServerInformationList_out
   {
   public:
     ServerInformationList_out (ServerInformationList *&);
@@ -908,52 +914,52 @@ TAO_NAMESPACE  ImplementationRepository
     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;
-
+  
   class ServerInformationIterator;
-
+  
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___PTR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___PTR_CH_
-
+  
   typedef ServerInformationIterator *ServerInformationIterator_ptr;
-
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CH_
-
-  class TAO_PortableServer_Export ServerInformationIterator_var : public TAO_Base_var
+  
+  class TAO_Export ServerInformationIterator_var : public TAO_Base_var
   {
   public:
     ServerInformationIterator_var (void); // default constructor
-    ServerInformationIterator_var (ServerInformationIterator_ptr p) : ptr_ (p) {}
+    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
+    // 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 tao_duplicate (ServerInformationIterator_ptr);
@@ -964,7 +970,7 @@ TAO_NAMESPACE  ImplementationRepository
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ServerInformationIterator_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -974,12 +980,12 @@ TAO_NAMESPACE  ImplementationRepository
 
 
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CH_
-
-  class TAO_PortableServer_Export ServerInformationIterator_out
+  
+  class TAO_Export ServerInformationIterator_out
   {
   public:
     ServerInformationIterator_out (ServerInformationIterator_ptr &);
@@ -991,48 +997,48 @@ TAO_NAMESPACE  ImplementationRepository
     operator ServerInformationIterator_ptr &();
     ServerInformationIterator_ptr &ptr (void);
     ServerInformationIterator_ptr operator-> (void);
-
+  
   private:
     ServerInformationIterator_ptr &ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___PTR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___PTR_CH_
-
+  
   class Administration;
   typedef Administration *Administration_ptr;
-
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___VAR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___VAR_CH_
-
-  class TAO_PortableServer_Export Administration_var : public TAO_Base_var
+  
+  class TAO_Export Administration_var : public TAO_Base_var
   {
   public:
     Administration_var (void); // default constructor
-    Administration_var (Administration_ptr p) : ptr_ (p) {}
+    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
+    // 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 tao_duplicate (Administration_ptr);
@@ -1043,7 +1049,7 @@ TAO_NAMESPACE  ImplementationRepository
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     Administration_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1053,12 +1059,12 @@ TAO_NAMESPACE  ImplementationRepository
 
 
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___OUT_CH_
-
-  class TAO_PortableServer_Export Administration_out
+  
+  class TAO_Export Administration_out
   {
   public:
     Administration_out (Administration_ptr &);
@@ -1070,25 +1076,31 @@ TAO_NAMESPACE  ImplementationRepository
     operator Administration_ptr &();
     Administration_ptr &ptr (void);
     Administration_ptr operator-> (void);
-
+  
   private:
     Administration_ptr &ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  // *************************************************************
+  // ImplementationRepository::Administration
+  // TAO_IDL - Generated from
+  // be/be_visitor_interface/interface_ch.cpp:106
+  // *************************************************************
+  
+  
 #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
+  
+  class TAO_Export Administration
     : public virtual CORBA_Object
   {
   public:
@@ -1098,35 +1110,35 @@ TAO_NAMESPACE  ImplementationRepository
   #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     static int _tao_class_id;
-
+    
     // The static operations.
     static Administration_ptr _duplicate (Administration_ptr obj);
-
+    
     static Administration_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Administration_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     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
+    
+    class TAO_Export AlreadyRegistered : public CORBA::UserException
     {
     public:
-
+      
       AlreadyRegistered (void);
       AlreadyRegistered (const AlreadyRegistered &);
       ~AlreadyRegistered (void);
@@ -1146,30 +1158,30 @@ TAO_NAMESPACE  ImplementationRepository
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-
-
+      
+      
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
 
 static ::CORBA::TypeCode_ptr _tc_AlreadyRegistered;
-
-
+    
+    
 #endif /* end #if !defined */
-
-
+    
+    
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CANNOTACTIVATE_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CANNOTACTIVATE_CH_
-
-    class TAO_PortableServer_Export CannotActivate : public CORBA::UserException
+    
+    class TAO_Export CannotActivate : public CORBA::UserException
     {
     public:
       TAO_String_Manager reason;
-
+      
       CannotActivate (void);
       CannotActivate (const CannotActivate &);
       ~CannotActivate (void);
@@ -1189,32 +1201,32 @@ static ::CORBA::TypeCode_ptr _tc_AlreadyRegistered;
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-
+      
             CannotActivate (
           const char * _tao_reason
         );
-
+      
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
 
 static ::CORBA::TypeCode_ptr _tc_CannotActivate;
-
-
+    
+    
 #endif /* end #if !defined */
-
-
+    
+    
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_NOTFOUND_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_NOTFOUND_CH_
-
-    class TAO_PortableServer_Export NotFound : public CORBA::UserException
+    
+    class TAO_Export NotFound : public CORBA::UserException
     {
     public:
-
+      
       NotFound (void);
       NotFound (const NotFound &);
       ~NotFound (void);
@@ -1234,21 +1246,21 @@ static ::CORBA::TypeCode_ptr _tc_CannotActivate;
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-
-
+      
+      
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
 
 static ::CORBA::TypeCode_ptr _tc_NotFound;
-
-
+    
+    
 #endif /* end #if !defined */
-
+    
     virtual void activate_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1258,7 +1270,7 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
         , ImplementationRepository::Administration::NotFound
         , ImplementationRepository::Administration::CannotActivate
       ));
-
+    
     virtual void register_server (
         const char * server,
         const ImplementationRepository::StartupOptions & options
@@ -1268,7 +1280,7 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
         CORBA::SystemException
         , ImplementationRepository::Administration::AlreadyRegistered
       ));
-
+    
     virtual void reregister_server (
         const char * server,
         const ImplementationRepository::StartupOptions & options
@@ -1277,7 +1289,7 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     virtual void remove_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1286,7 +1298,7 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
         CORBA::SystemException
         , ImplementationRepository::Administration::NotFound
       ));
-
+    
     virtual void shutdown_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1295,7 +1307,7 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
         CORBA::SystemException
         , ImplementationRepository::Administration::NotFound
       ));
-
+    
     virtual char * server_is_running (
         const char * server,
         const char * addr,
@@ -1306,7 +1318,7 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
         CORBA::SystemException
         , ImplementationRepository::Administration::NotFound
       ));
-
+    
     virtual void server_is_shutting_down (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1315,7 +1327,7 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
         CORBA::SystemException
         , ImplementationRepository::Administration::NotFound
       ));
-
+    
     virtual void find (
         const char * server,
         ImplementationRepository::ServerInformation_out info
@@ -1325,7 +1337,7 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
         CORBA::SystemException
         , ImplementationRepository::Administration::NotFound
       ));
-
+    
     virtual void list (
         CORBA::ULong how_many,
         ImplementationRepository::ServerInformationList_out server_list,
@@ -1335,53 +1347,53 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     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);
-
+    
     // These 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,
+        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 &);
   };
-
+  
   // 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_Administration_Proxy_Impl
+  
+  class TAO_Export _TAO_Administration_Proxy_Impl
     : public virtual TAO_Object_Proxy_Impl
   {
   public:
@@ -1396,7 +1408,7 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
         , ImplementationRepository::Administration::NotFound
         , ImplementationRepository::Administration::CannotActivate
       )) = 0;
-
+    
     virtual void register_server (
         CORBA_Object *_collocated_tao_target_,
         const char * server,
@@ -1407,7 +1419,7 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
         CORBA::SystemException
         , ImplementationRepository::Administration::AlreadyRegistered
       )) = 0;
-
+    
     virtual void reregister_server (
         CORBA_Object *_collocated_tao_target_,
         const char * server,
@@ -1417,7 +1429,7 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     virtual void remove_server (
         CORBA_Object *_collocated_tao_target_,
         const char * server
@@ -1427,7 +1439,7 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
         CORBA::SystemException
         , ImplementationRepository::Administration::NotFound
       )) = 0;
-
+    
     virtual void shutdown_server (
         CORBA_Object *_collocated_tao_target_,
         const char * server
@@ -1437,7 +1449,7 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
         CORBA::SystemException
         , ImplementationRepository::Administration::NotFound
       )) = 0;
-
+    
     virtual char * server_is_running (
         CORBA_Object *_collocated_tao_target_,
         const char * server,
@@ -1449,7 +1461,7 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
         CORBA::SystemException
         , ImplementationRepository::Administration::NotFound
       )) = 0;
-
+    
     virtual void server_is_shutting_down (
         CORBA_Object *_collocated_tao_target_,
         const char * server
@@ -1459,7 +1471,7 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
         CORBA::SystemException
         , ImplementationRepository::Administration::NotFound
       )) = 0;
-
+    
     virtual void find (
         CORBA_Object *_collocated_tao_target_,
         const char * server,
@@ -1470,7 +1482,7 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
         CORBA::SystemException
         , ImplementationRepository::Administration::NotFound
       )) = 0;
-
+    
     virtual void list (
         CORBA_Object *_collocated_tao_target_,
         CORBA::ULong how_many,
@@ -1481,28 +1493,28 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
-
+    
+    
   protected:
     _TAO_Administration_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
-  class TAO_PortableServer_Export _TAO_Administration_Remote_Proxy_Impl
+  
+  class TAO_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_,
@@ -1514,7 +1526,7 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
         , ImplementationRepository::Administration::NotFound
         , ImplementationRepository::Administration::CannotActivate
       ));
-
+    
     virtual void register_server (
         CORBA_Object *_collocated_tao_target_,
         const char * server,
@@ -1525,7 +1537,7 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
         CORBA::SystemException
         , ImplementationRepository::Administration::AlreadyRegistered
       ));
-
+    
     virtual void reregister_server (
         CORBA_Object *_collocated_tao_target_,
         const char * server,
@@ -1535,7 +1547,7 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     virtual void remove_server (
         CORBA_Object *_collocated_tao_target_,
         const char * server
@@ -1545,7 +1557,7 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
         CORBA::SystemException
         , ImplementationRepository::Administration::NotFound
       ));
-
+    
     virtual void shutdown_server (
         CORBA_Object *_collocated_tao_target_,
         const char * server
@@ -1555,7 +1567,7 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
         CORBA::SystemException
         , ImplementationRepository::Administration::NotFound
       ));
-
+    
     virtual char * server_is_running (
         CORBA_Object *_collocated_tao_target_,
         const char * server,
@@ -1567,7 +1579,7 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
         CORBA::SystemException
         , ImplementationRepository::Administration::NotFound
       ));
-
+    
     virtual void server_is_shutting_down (
         CORBA_Object *_collocated_tao_target_,
         const char * server
@@ -1577,7 +1589,7 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
         CORBA::SystemException
         , ImplementationRepository::Administration::NotFound
       ));
-
+    
     virtual void find (
         CORBA_Object *_collocated_tao_target_,
         const char * server,
@@ -1588,7 +1600,7 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
         CORBA::SystemException
         , ImplementationRepository::Administration::NotFound
       ));
-
+    
     virtual void list (
         CORBA_Object *_collocated_tao_target_,
         CORBA::ULong how_many,
@@ -1599,25 +1611,25 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
       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
+  // 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
+  //                 Base Proxy Broker Declaration 
   //
-
-    class TAO_PortableServer_Export _TAO_Administration_Proxy_Broker
+  
+    class TAO_Export _TAO_Administration_Proxy_Broker
   {
   public:
     virtual ~_TAO_Administration_Proxy_Broker (void);
@@ -1625,87 +1637,87 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
         Administration *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_Administration_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_Administration_Remote_Proxy_Broker
+  
+  class TAO_Export _TAO_Administration_Remote_Proxy_Broker
     : public virtual _TAO_Administration_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_Administration_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_Administration_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_Administration_Proxy_Impl &select_proxy (
         Administration *object
         ACE_ENV_ARG_DECL
       );
-
+    
   private:
     _TAO_Administration_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_Administration_Remote_Proxy_Broker *the_TAO_Administration_Remote_Proxy_Broker (void);
   };
-
+  
   //
-  //              End Remote Proxy Broker Declaration
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
 #endif /* end #if !defined */
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Administration;
-
-
+  
+  
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___PTR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___PTR_CH_
-
+  
   class ServerInformationIterator;
   typedef ServerInformationIterator *ServerInformationIterator_ptr;
-
+  
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CH_
-
-  class TAO_PortableServer_Export ServerInformationIterator_var : public TAO_Base_var
+  
+  class TAO_Export ServerInformationIterator_var : public TAO_Base_var
   {
   public:
     ServerInformationIterator_var (void); // default constructor
-    ServerInformationIterator_var (ServerInformationIterator_ptr p) : ptr_ (p) {}
+    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
+    // 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 tao_duplicate (ServerInformationIterator_ptr);
@@ -1716,7 +1728,7 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ServerInformationIterator_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1726,12 +1738,12 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
 
 
 #endif /* end #if !defined */
-
-
+  
+  
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CH_
-
-  class TAO_PortableServer_Export ServerInformationIterator_out
+  
+  class TAO_Export ServerInformationIterator_out
   {
   public:
     ServerInformationIterator_out (ServerInformationIterator_ptr &);
@@ -1743,25 +1755,31 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
     operator ServerInformationIterator_ptr &();
     ServerInformationIterator_ptr &ptr (void);
     ServerInformationIterator_ptr operator-> (void);
-
+  
   private:
     ServerInformationIterator_ptr &ptr_;
   };
-
-
+  
+  
 #endif /* end #if !defined */
-
-
+  
+  // *************************************************************
+  // ImplementationRepository::ServerInformationIterator
+  // TAO_IDL - Generated from
+  // be/be_visitor_interface/interface_ch.cpp:106
+  // *************************************************************
+  
+  
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_
-
+  
   // 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
+  
+  class TAO_Export ServerInformationIterator
     : public virtual CORBA_Object
   {
   public:
@@ -1771,27 +1789,27 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
   #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     static int _tao_class_id;
-
+    
     // The static operations.
     static ServerInformationIterator_ptr _duplicate (ServerInformationIterator_ptr obj);
-
+    
     static ServerInformationIterator_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerInformationIterator_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     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
@@ -1800,61 +1818,61 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     virtual void destroy (
-
+        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     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);
-
+    
     // These 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,
+        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
+  
+  class TAO_Export _TAO_ServerInformationIterator_Proxy_Impl
     : public virtual TAO_Object_Proxy_Impl
   {
   public:
@@ -1868,7 +1886,7 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     virtual void destroy (
         CORBA_Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1876,28 +1894,28 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
       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
+  
+  class TAO_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_,
@@ -1908,7 +1926,7 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     virtual void destroy (
         CORBA_Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1916,25 +1934,25 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
       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
+  // 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
+  //                 Base Proxy Broker Declaration 
   //
-
-    class TAO_PortableServer_Export _TAO_ServerInformationIterator_Proxy_Broker
+  
+    class TAO_Export _TAO_ServerInformationIterator_Proxy_Broker
   {
   public:
     virtual ~_TAO_ServerInformationIterator_Proxy_Broker (void);
@@ -1942,176 +1960,179 @@ static ::CORBA::TypeCode_ptr _tc_NotFound;
         ServerInformationIterator *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 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
+  
+  class TAO_Export _TAO_ServerInformationIterator_Remote_Proxy_Broker
     : public virtual _TAO_ServerInformationIterator_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_ServerInformationIterator_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_ServerInformationIterator_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_ServerInformationIterator_Proxy_Impl &select_proxy (
         ServerInformationIterator *object
         ACE_ENV_ARG_DECL
       );
-
+    
   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
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
 #endif /* end #if !defined */
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerInformationIterator;
-
-
+  
+  
 }
 TAO_NAMESPACE_CLOSE // module ImplementationRepository
 
 // Proxy Broker Factory function pointer declarations.
 
-extern TAO_PortableServer_Export
+extern TAO_Export
 ImplementationRepository::_TAO_ServerObject_Proxy_Broker *
 (*ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_PortableServer_Export
+extern TAO_Export
 ImplementationRepository::_TAO_Administration_Proxy_Broker *
 (*ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_PortableServer_Export
+extern TAO_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 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 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 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 CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformationList *&);
+TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerObject_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerObject_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerObject_ptr &);
+TAO_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentVariable &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentVariable*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::EnvironmentVariable *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::EnvironmentVariable *&);
+TAO_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentList &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentList*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::EnvironmentList *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::EnvironmentList *&);
+TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::ActivationMode);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ActivationMode &);
+TAO_Export void operator<<= (CORBA::Any &, const ImplementationRepository::StartupOptions &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::StartupOptions*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::StartupOptions *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::StartupOptions *&);
+TAO_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformation &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformation*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformation *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformation *&);
+TAO_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformationList &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationList*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationList *&); // deprecated
+TAO_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
-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 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 CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::Administration::NotFound *&);
+TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration_ptr &);
+TAO_Export void operator<<= (CORBA::Any &, const ImplementationRepository::Administration::AlreadyRegistered &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration::AlreadyRegistered*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration::AlreadyRegistered *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::Administration::AlreadyRegistered *&);
+TAO_Export void operator<<= (CORBA::Any &, const ImplementationRepository::Administration::CannotActivate &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration::CannotActivate*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration::CannotActivate *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::Administration::CannotActivate *&);
+TAO_Export void operator<<= (CORBA::Any &, const ImplementationRepository::Administration::NotFound &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration::NotFound*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration::NotFound *&); // deprecated
+TAO_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 *&);
+TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr &);
 
 #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_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerObject_ptr );
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerObject_ptr &);
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::EnvironmentVariable &);
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::EnvironmentVariable &);
 
 #if !defined _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_
 #define _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (
+TAO_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const ImplementationRepository::EnvironmentList &
   );
-TAO_PortableServer_Export CORBA::Boolean operator>> (
+TAO_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_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ActivationMode &); // 
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ActivationMode &);
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::StartupOptions &);
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::StartupOptions &);
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformation &);
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformation &);
 
 #if !defined _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_
 #define _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (
+TAO_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const ImplementationRepository::ServerInformationList &
   );
-TAO_PortableServer_Export CORBA::Boolean operator>> (
+TAO_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_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration_ptr );
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration_ptr &);
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration::AlreadyRegistered &);
+TAO_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_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration::CannotActivate &);
+TAO_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_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration::NotFound &);
+TAO_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_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformationIterator_ptr );
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformationIterator_ptr &);
 
 #endif /* __ACE_INLINE__ */
 
diff --git a/TAO/tao/PortableServer/ImplRepoC.i b/TAO/tao/PortableServer/ImplRepoC.i
index 489341a9ec6..70d154ff502 100644
--- a/TAO/tao/PortableServer/ImplRepoC.i
+++ b/TAO/tao/PortableServer/ImplRepoC.i
@@ -1452,12 +1452,12 @@ ImplementationRepository::ServerInformationIterator::ServerInformationIterator (
 
 #endif /* end #if !defined */
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (
+TAO_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const ImplementationRepository::ServerObject_ptr
   );
 
-TAO_PortableServer_Export CORBA::Boolean operator>> (
+TAO_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
     ImplementationRepository::ServerObject_ptr &
   );
@@ -1490,11 +1490,11 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationReposito
 #if !defined _TAO_CDR_OP_ImplementationRepository_EnvironmentList_I_
 #define _TAO_CDR_OP_ImplementationRepository_EnvironmentList_I_
 
-CORBA::Boolean TAO_PortableServer_Export operator<< (
+CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const ImplementationRepository::EnvironmentList &
   );
-CORBA::Boolean TAO_PortableServer_Export operator>> (
+CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     ImplementationRepository::EnvironmentList &
   );
@@ -1580,33 +1580,33 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationReposito
 #if !defined _TAO_CDR_OP_ImplementationRepository_ServerInformationList_I_
 #define _TAO_CDR_OP_ImplementationRepository_ServerInformationList_I_
 
-CORBA::Boolean TAO_PortableServer_Export operator<< (
+CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const ImplementationRepository::ServerInformationList &
   );
-CORBA::Boolean TAO_PortableServer_Export operator>> (
+CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     ImplementationRepository::ServerInformationList &
   );
 
 #endif /* _TAO_CDR_OP_ImplementationRepository_ServerInformationList_I_ */
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (
+TAO_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const ImplementationRepository::ServerInformationIterator_ptr
   );
 
-TAO_PortableServer_Export CORBA::Boolean operator>> (
+TAO_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
     ImplementationRepository::ServerInformationIterator_ptr &
   );
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (
+TAO_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const ImplementationRepository::Administration_ptr
   );
 
-TAO_PortableServer_Export CORBA::Boolean operator>> (
+TAO_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
     ImplementationRepository::Administration_ptr &
   );
diff --git a/TAO/tao/PortableServer/ImplRepoS.cpp b/TAO/tao/PortableServer/ImplRepoS.cpp
index fcc1af898d5..4fce690b791 100644
--- a/TAO/tao/PortableServer/ImplRepoS.cpp
+++ b/TAO/tao/PortableServer/ImplRepoS.cpp
@@ -19,8 +19,8 @@
 // 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"
 
@@ -55,9 +55,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 10:26:32 */
+/* starting time is 18:22:12 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/sirion/coryan/amh/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: /project/beguine/bala/patches/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)
 {
@@ -151,7 +151,7 @@ TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::lookup (const ch
     }
   return 0;
 }
-/* ending time is 10:26:32 */
+/* ending time is 18:22:12 */
 static TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable tao_ImplementationRepository_ServerObject_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -946,9 +946,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 10:26:32 */
+/* starting time is 18:22:12 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/sirion/coryan/amh/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  */
+/* Command-line: /project/beguine/bala/patches/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)
 {
@@ -1051,7 +1051,7 @@ TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::lookup (const
     }
   return 0;
 }
-/* ending time is 10:26:32 */
+/* ending time is 18:22:12 */
 static TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable tao_ImplementationRepository_Administration_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -3940,9 +3940,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 10:26:32 */
+/* starting time is 18:22:12 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/sirion/coryan/amh/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  */
+/* Command-line: /project/beguine/bala/patches/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)
 {
@@ -4035,7 +4035,7 @@ TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::loo
     }
   return 0;
 }
-/* ending time is 10:26:32 */
+/* ending time is 18:22:12 */
 static TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable tao_ImplementationRepository_ServerInformationIterator_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
diff --git a/TAO/tao/PortableServer/ImplRepoS.h b/TAO/tao/PortableServer/ImplRepoS.h
index 52768582ec7..44e24ff20eb 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"
@@ -56,7 +56,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
   class _TAO_ServerObject_Direct_Proxy_Impl;
   class _TAO_ServerObject_Strategized_Proxy_Broker;
   
-  class TAO_PortableServer_Export ServerObject
+  class TAO_Export ServerObject
     : public virtual PortableServer::ServantBase
   {
   protected:
@@ -147,7 +147,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
   //               Strategized Proxy Broker Declaration 
   //
   
-  class TAO_PortableServer_Export _TAO_ServerObject_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_ServerObject_Proxy_Broker
+  class TAO_Export _TAO_ServerObject_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_ServerObject_Proxy_Broker
   {
   public: 
     _TAO_ServerObject_Strategized_Proxy_Broker (void);
@@ -192,7 +192,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
   //                    ThruPOA  Impl. Declaration
   //
   
-  class TAO_PortableServer_Export _TAO_ServerObject_ThruPOA_Proxy_Impl : 
+  class TAO_Export _TAO_ServerObject_ThruPOA_Proxy_Impl : 
     public virtual ::ImplementationRepository::_TAO_ServerObject_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl
   {
@@ -229,7 +229,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
 //                    Direct  Impl. Declaration
 //
 
-class TAO_PortableServer_Export _TAO_ServerObject_Direct_Proxy_Impl : 
+class TAO_Export _TAO_ServerObject_Direct_Proxy_Impl : 
   public virtual ImplementationRepository::_TAO_ServerObject_Proxy_Impl,
   public virtual TAO_Direct_Object_Proxy_Impl
 {
@@ -269,7 +269,7 @@ class _TAO_Administration_ThruPOA_Proxy_Impl;
 class _TAO_Administration_Direct_Proxy_Impl;
 class _TAO_Administration_Strategized_Proxy_Broker;
 
-class TAO_PortableServer_Export Administration
+class TAO_Export Administration
   : public virtual PortableServer::ServantBase
 {
 protected:
@@ -480,7 +480,7 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class TAO_PortableServer_Export _TAO_Administration_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_Administration_Proxy_Broker
+class TAO_Export _TAO_Administration_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_Administration_Proxy_Broker
 {
 public: 
   _TAO_Administration_Strategized_Proxy_Broker (void);
@@ -525,7 +525,7 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class TAO_PortableServer_Export _TAO_Administration_ThruPOA_Proxy_Impl : 
+class TAO_Export _TAO_Administration_ThruPOA_Proxy_Impl : 
   public virtual ::ImplementationRepository::_TAO_Administration_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl
 {
@@ -642,7 +642,7 @@ public:
 //                    Direct  Impl. Declaration
 //
 
-class TAO_PortableServer_Export _TAO_Administration_Direct_Proxy_Impl : 
+class TAO_Export _TAO_Administration_Direct_Proxy_Impl : 
   public virtual ImplementationRepository::_TAO_Administration_Proxy_Impl,
   public virtual TAO_Direct_Object_Proxy_Impl
 {
@@ -762,7 +762,7 @@ class _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl;
 class _TAO_ServerInformationIterator_Direct_Proxy_Impl;
 class _TAO_ServerInformationIterator_Strategized_Proxy_Broker;
 
-class TAO_PortableServer_Export ServerInformationIterator
+class TAO_Export ServerInformationIterator
   : public virtual PortableServer::ServantBase
 {
 protected:
@@ -854,7 +854,7 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class TAO_PortableServer_Export _TAO_ServerInformationIterator_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Broker
+class TAO_Export _TAO_ServerInformationIterator_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Broker
 {
 public: 
   _TAO_ServerInformationIterator_Strategized_Proxy_Broker (void);
@@ -899,7 +899,7 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class TAO_PortableServer_Export _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl : 
+class TAO_Export _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl : 
   public virtual ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl
 {
@@ -938,7 +938,7 @@ public:
 //                    Direct  Impl. Declaration
 //
 
-class TAO_PortableServer_Export _TAO_ServerInformationIterator_Direct_Proxy_Impl : 
+class TAO_Export _TAO_ServerInformationIterator_Direct_Proxy_Impl : 
   public virtual ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl,
   public virtual TAO_Direct_Object_Proxy_Impl
 {
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 be8154014e6..39b15e8fb68 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)
@@ -35,7 +35,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
 {
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
-  class ServerObject_tie : public ServerObject
+  class  ServerObject_tie : public ServerObject
   {
   public:
     ServerObject_tie (T &t);
@@ -48,7 +48,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
     // ctor with T*, ownership flag and a POA
     ~ServerObject_tie (void);
     // dtor
-
+    
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -60,32 +60,32 @@ TAO_NAMESPACE  POA_ImplementationRepository
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-
+    
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
     void ping (
-
+        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
         void shutdown (
-
+        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
       private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-
+    
     // copy and assignment are not allowed
     ServerObject_tie (const ServerObject_tie &);
     void operator= (const ServerObject_tie &);
@@ -93,7 +93,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
 
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
-  class Administration_tie : public Administration
+  class  Administration_tie : public Administration
   {
   public:
     Administration_tie (T &t);
@@ -106,7 +106,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
     // ctor with T*, ownership flag and a POA
     ~Administration_tie (void);
     // dtor
-
+    
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -118,7 +118,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-
+    
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -132,7 +132,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::Administration::NotFound
         , ImplementationRepository::Administration::CannotActivate
       ));
-
+    
         void register_server (
         const char * server,
         const ImplementationRepository::StartupOptions & options
@@ -142,7 +142,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::Administration::AlreadyRegistered
       ));
-
+    
         void reregister_server (
         const char * server,
         const ImplementationRepository::StartupOptions & options
@@ -151,7 +151,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
         void remove_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -160,7 +160,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::Administration::NotFound
       ));
-
+    
         void shutdown_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -169,7 +169,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::Administration::NotFound
       ));
-
+    
         char * server_is_running (
         const char * server,
         const char * addr,
@@ -180,7 +180,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::Administration::NotFound
       ));
-
+    
         void server_is_shutting_down (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -189,7 +189,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::Administration::NotFound
       ));
-
+    
         void find (
         const char * server,
         ImplementationRepository::ServerInformation_out info
@@ -199,7 +199,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::Administration::NotFound
       ));
-
+    
         void list (
         CORBA::ULong how_many,
         ImplementationRepository::ServerInformationList_out server_list,
@@ -209,12 +209,12 @@ TAO_NAMESPACE  POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
       private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-
+    
     // copy and assignment are not allowed
     Administration_tie (const Administration_tie &);
     void operator= (const Administration_tie &);
@@ -222,7 +222,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
 
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
-  class ServerInformationIterator_tie : public ServerInformationIterator
+  class  ServerInformationIterator_tie : public ServerInformationIterator
   {
   public:
     ServerInformationIterator_tie (T &t);
@@ -235,7 +235,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
     // ctor with T*, ownership flag and a POA
     ~ServerInformationIterator_tie (void);
     // dtor
-
+    
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -247,7 +247,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-
+    
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -260,20 +260,20 @@ TAO_NAMESPACE  POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
         void destroy (
-
+        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
       private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-
+    
     // copy and assignment are not allowed
     ServerInformationIterator_tie (const ServerInformationIterator_tie &);
     void operator= (const ServerInformationIterator_tie &);
diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp
index d857fa7566d..217364844c8 100644
--- a/TAO/tao/PortableServer/PortableServerC.cpp
+++ b/TAO/tao/PortableServer/PortableServerC.cpp
@@ -7247,16 +7247,16 @@ CORBA::Boolean operator>> (
   CORBA::ULong _tao_seq_len;
   if (strm >> _tao_seq_len)
   {
+    // Add a check to the length of the sequence
+    // to make sure it does not exceed the length
+    // of the stream. (See bug 1159.)
+    if (_tao_seq_len > strm.length())
+      return 0;
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // 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
 
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
@@ -7313,16 +7313,16 @@ CORBA::Boolean operator>> (
   CORBA::ULong _tao_seq_len;
   if (strm >> _tao_seq_len)
   {
+    // Add a check to the length of the sequence
+    // to make sure it does not exceed the length
+    // of the stream. (See bug 1159.)
+    if (_tao_seq_len > strm.length())
+      return 0;
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // 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/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp
index ee5cdb41c1b..982dac4f5d8 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.cpp
+++ b/TAO/tao/RTCORBA/RTCORBAC.cpp
@@ -5873,16 +5873,16 @@ CORBA::Boolean operator>> (
   CORBA::ULong _tao_seq_len;
   if (strm >> _tao_seq_len)
   {
+    // Add a check to the length of the sequence
+    // to make sure it does not exceed the length
+    // of the stream. (See bug 1159.)
+    if (_tao_seq_len > strm.length())
+      return 0;
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // 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++)
@@ -5920,16 +5920,16 @@ CORBA::Boolean operator>> (
   CORBA::ULong _tao_seq_len;
   if (strm >> _tao_seq_len)
   {
+    // Add a check to the length of the sequence
+    // to make sure it does not exceed the length
+    // of the stream. (See bug 1159.)
+    if (_tao_seq_len > strm.length())
+      return 0;
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // 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/diffs/IOP.diff b/TAO/tao/diffs/IOP.diff
index be76fec2597..8dd513110d6 100644
--- a/TAO/tao/diffs/IOP.diff
+++ b/TAO/tao/diffs/IOP.diff
@@ -1,7 +1,7 @@
---- orig/IOPC.h	Tue Feb  5 14:56:23 2002
-+++ IOPC.h	Tue Feb  5 14:57:05 2002
-@@ -23,13 +23,15 @@
- #define _TAO_IDL_ORIG_IOPC_H_
+--- orig/IOPC.h	Fri Apr  5 18:57:33 2002
++++ IOPC.h	Fri Apr  5 18:45:26 2002
+@@ -23,13 +23,16 @@
+ #define _TAO_IDL_IOPC_H_
  
  #include "ace/pre.h"
 -#include "tao/corba.h"
@@ -11,9 +11,10 @@
  # pragma once
  #endif /* ACE_LACKS_PRAGMA_ONCE */
  
- #include "TAO_Export.h"
+ #include "tao/TAO_Export.h"
 +#include "Exception.h"
 +#include "Object.h"
++#include "Any.h"
  
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
diff --git a/TAO/tao/diffs/Policy_Forward.diff b/TAO/tao/diffs/Policy_Forward.diff
index d2e029cf315..45dbdd0cf80 100644
--- a/TAO/tao/diffs/Policy_Forward.diff
+++ b/TAO/tao/diffs/Policy_Forward.diff
@@ -1,7 +1,7 @@
---- orig/Policy_ForwardC.h	Wed Feb  6 19:23:32 2002
-+++ Policy_ForwardC.h	Wed Feb  6 19:23:58 2002
-@@ -23,13 +23,14 @@
- #define _TAO_IDL_ORIG_POLICY_FORWARDC_H_
+--- orig/Policy_ForwardC.h	Fri Apr  5 18:57:34 2002
++++ Policy_ForwardC.h	Fri Apr  5 18:43:52 2002
+@@ -23,13 +23,15 @@
+ #define _TAO_IDL_POLICY_FORWARDC_H_
  
  #include "ace/pre.h"
 -#include "tao/corba.h"
@@ -11,8 +11,9 @@
  # pragma once
  #endif /* ACE_LACKS_PRAGMA_ONCE */
  
- #include "TAO_Export.h"
+ #include "tao/TAO_Export.h"
 +#include "Sequence.h"
++#include "CDR.h"
  
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO