ChangeLogTag:Mon Sep 25 11:09:20 2000 Ossama Othman <ossama@uci.edu>

1 files changed, 907 insertions, 598 deletions

diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp
index 55326405937..ce7089e44d5 100644
--- a/TAO/tao/IOPC.cpp
+++ b/TAO/tao/IOPC.cpp
@@ -1,31 +1,33 @@
+// -*- 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-group.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
 //
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   IOPC.cpp
-//
-// = DESCRIPTION
-//   Generated from IOP.pidl, that contains the OMG standarized IOP
-//   module.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "tao/IOPC.h"
-#include "tao/Any.h"
-#include "tao/Typecode.h"
+#include "IOPC.h"
 
 #if !defined (__ACE_INLINE__)
-#include "tao/IOPC.i"
+#include "IOPC.i"
 #endif /* !defined INLINE */
 
+#include "tao/Any.h"
+#include "tao/Typecode.h"
+
 static const CORBA::Long _oc_IOP_ProfileId[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -41,11 +43,11 @@ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ProfileId, &_tc_TAO_tc_IOP_Profil
 TAO_NAMESPACE_END
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_INTERNET_IOP, 0)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_INTERNET_IOP, 0U)
 TAO_NAMESPACE_END
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_MULTIPLE_COMPONENTS, 1)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_MULTIPLE_COMPONENTS, 1U)
 TAO_NAMESPACE_END
 static const CORBA::Long _oc_IOP_TaggedProfile[] =
 {
@@ -68,7 +70,7 @@ static const CORBA::Long _oc_IOP_TaggedProfile[] =
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_octet,
 
-    0,
+    0U,
 
 };
 static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedProfile (CORBA::tk_struct, sizeof (_oc_IOP_TaggedProfile), (char *) &_oc_IOP_TaggedProfile, 0, sizeof (IOP::TaggedProfile));
@@ -76,6 +78,15 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TaggedProfile, &_tc_TAO_tc_IOP_TaggedProfile)
 TAO_NAMESPACE_END
+void IOP::TaggedProfile::_tao_any_destructor (void *x)
+{
+  TaggedProfile *tmp = ACE_static_cast (TaggedProfile*,x);
+  delete tmp;
+}
+
+
+#if !defined (_IOP_TAGGEDPROFILE__TAO_SEQ_OCTET_CS_)
+#define _IOP_TAGGEDPROFILE__TAO_SEQ_OCTET_CS_
 
 // *************************************************************
 // IOP::TaggedProfile::_tao_seq_Octet
@@ -84,36 +95,42 @@ TAO_NAMESPACE_END
 IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (void)
 {}
 IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 IOP::TaggedProfile::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
 {}
+void IOP::TaggedProfile::_tao_seq_Octet::_tao_any_destructor (void *x)
+{
+  _tao_seq_Octet *tmp = ACE_static_cast (_tao_seq_Octet*,x);
+  delete tmp;
+}
+
 
-// ****************************************************************
+#endif /* end #if !defined */
 
 static const CORBA::Long _oc_IOP_IOR[] =
 {
@@ -122,8 +139,8 @@ static const CORBA::Long _oc_IOP_IOR[] =
   4, ACE_NTOHL (0x494f5200),  // name = IOR
   2, // member count
   8, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f696400),  // name = type_id
-  CORBA::tk_string,
-  0, // string length
+  CORBA::tk_string, 
+  0U, // string length
   9, ACE_NTOHL (0x70726f66), ACE_NTOHL (0x696c6573), ACE_NTOHL (0x0),  // name = profiles
   CORBA::tk_sequence, // typecode kind
   200, // encapsulation length
@@ -149,10 +166,10 @@ static const CORBA::Long _oc_IOP_IOR[] =
         TAO_ENCAP_BYTE_ORDER, // byte order
         CORBA::tk_octet,
 
-        0,
+        0U,
 
 
-    0,
+    0U,
 
 };
 static CORBA::TypeCode _tc_TAO_tc_IOP_IOR (CORBA::tk_struct, sizeof (_oc_IOP_IOR), (char *) &_oc_IOP_IOR, 0, sizeof (IOP::IOR));
@@ -160,6 +177,63 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IOR, &_tc_TAO_tc_IOP_IOR)
 TAO_NAMESPACE_END
+void IOP::IOR::_tao_any_destructor (void *x)
+{
+  IOR *tmp = ACE_static_cast (IOR*,x);
+  delete tmp;
+}
+
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CS_)
+#define __TAO_UNBOUNDED_SEQUENCE_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CS_
+
+  void
+  IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_allocate_buffer (CORBA::ULong length)
+  {
+    IOP::TaggedProfile* tmp = 0;
+    tmp = _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (length);
+    
+    if (this->buffer_ != 0)
+    {
+      IOP::TaggedProfile *old = ACE_reinterpret_cast (IOP::TaggedProfile *,this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        tmp[i] = old[i];
+      
+      if (this->release_)
+        _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::freebuf (old);
+      
+    }
+    this->buffer_ = tmp;
+  }
+  
+  void
+  IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_deallocate_buffer (void)
+  {
+    if (this->buffer_ == 0 || this->release_ == 0)
+      return;
+    
+    IOP::TaggedProfile *tmp = ACE_reinterpret_cast (IOP::TaggedProfile *,this->buffer_);
+    
+    _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::freebuf (tmp);
+    this->buffer_ = 0;
+  } 
+  
+  IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::~_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (void) // Dtor.
+  {
+    this->_deallocate_buffer ();
+  }
+  
+  
+#endif /* end #if !defined */
+
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CS_)
+#define _IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CS_
 
 // *************************************************************
 // IOP::IOR::_tao_seq_TaggedProfile
@@ -168,16 +242,42 @@ TAO_NAMESPACE_END
 IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (void)
 {}
 IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (CORBA::ULong max) // uses max size
-  : TAO_Unbounded_Sequence<IOP::TaggedProfile> (max)
+  : 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Sequence<IOP::TaggedProfile>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max)
 {}
 IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (CORBA::ULong max, CORBA::ULong length, IOP::TaggedProfile *buffer, CORBA::Boolean release)
-  : TAO_Unbounded_Sequence<IOP::TaggedProfile> (max, length, buffer, release)
+  : 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Sequence<IOP::TaggedProfile>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max, length, buffer, release)
 {}
 IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (const _tao_seq_TaggedProfile &seq) // copy ctor
-  : TAO_Unbounded_Sequence<IOP::TaggedProfile> (seq)
+  : 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Sequence<IOP::TaggedProfile>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (seq)
 {}
 IOP::IOR::_tao_seq_TaggedProfile::~_tao_seq_TaggedProfile (void) // dtor
 {}
+void IOP::IOR::_tao_seq_TaggedProfile::_tao_any_destructor (void *x)
+{
+  _tao_seq_TaggedProfile *tmp = ACE_static_cast (_tao_seq_TaggedProfile*,x);
+  delete tmp;
+}
+
+
+#endif /* end #if !defined */
 
 static const CORBA::Long _oc_IOP_ComponentId[] =
 {
@@ -213,7 +313,7 @@ static const CORBA::Long _oc_IOP_TaggedComponent[] =
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_octet,
 
-    0,
+    0U,
 
 };
 static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponent (CORBA::tk_struct, sizeof (_oc_IOP_TaggedComponent), (char *) &_oc_IOP_TaggedComponent, 0, sizeof (IOP::TaggedComponent));
@@ -221,6 +321,15 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TaggedComponent, &_tc_TAO_tc_IOP_TaggedComponent)
 TAO_NAMESPACE_END
+void IOP::TaggedComponent::_tao_any_destructor (void *x)
+{
+  TaggedComponent *tmp = ACE_static_cast (TaggedComponent*,x);
+  delete tmp;
+}
+
+
+#if !defined (_IOP_TAGGEDCOMPONENT__TAO_SEQ_OCTET_CS_)
+#define _IOP_TAGGEDCOMPONENT__TAO_SEQ_OCTET_CS_
 
 // *************************************************************
 // IOP::TaggedComponent::_tao_seq_Octet
@@ -229,16 +338,94 @@ TAO_NAMESPACE_END
 IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (void)
 {}
 IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size
-  : TAO_Unbounded_Sequence<CORBA::Octet> (max)
+  : 
+#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 */ 
+ (max)
 {}
 IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
-  : TAO_Unbounded_Sequence<CORBA::Octet> (max, length, buffer, release)
+  : 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  TAO_Unbounded_Sequence<CORBA::Octet>
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Sequence<CORBA::Octet>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max, length, buffer, release)
 {}
 IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor
-  : TAO_Unbounded_Sequence<CORBA::Octet> (seq)
+  : 
+#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 */ 
+ (seq)
 {}
 IOP::TaggedComponent::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
 {}
+void IOP::TaggedComponent::_tao_seq_Octet::_tao_any_destructor (void *x)
+{
+  _tao_seq_Octet *tmp = ACE_static_cast (_tao_seq_Octet*,x);
+  delete tmp;
+}
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_MULTIPLECOMPONENTPROFILE_CS_)
+#define __TAO_UNBOUNDED_SEQUENCE_IOP_MULTIPLECOMPONENTPROFILE_CS_
+
+  void
+  IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_allocate_buffer (CORBA::ULong length)
+  {
+    IOP::TaggedComponent* tmp = 0;
+    tmp = _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (length);
+    
+    if (this->buffer_ != 0)
+    {
+      IOP::TaggedComponent *old = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        tmp[i] = old[i];
+      
+      if (this->release_)
+        _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (old);
+      
+    }
+    this->buffer_ = tmp;
+  }
+  
+  void
+  IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_deallocate_buffer (void)
+  {
+    if (this->buffer_ == 0 || this->release_ == 0)
+      return;
+    
+    IOP::TaggedComponent *tmp = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_);
+    
+    _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (tmp);
+    this->buffer_ = 0;
+  } 
+  
+  IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::~_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (void) // Dtor.
+  {
+    this->_deallocate_buffer ();
+  }
+  
+  
+#endif /* end #if !defined */
+
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_IOP_MULTIPLECOMPONENTPROFILE_CS_)
+#define _IOP_MULTIPLECOMPONENTPROFILE_CS_
 
 // *************************************************************
 // IOP::MultipleComponentProfile
@@ -247,16 +434,42 @@ IOP::TaggedComponent::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
 IOP::MultipleComponentProfile::MultipleComponentProfile (void)
 {}
 IOP::MultipleComponentProfile::MultipleComponentProfile (CORBA::ULong max) // uses max size
-  : TAO_Unbounded_Sequence<IOP::TaggedComponent> (max)
+  : 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Sequence<IOP::TaggedComponent>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max)
 {}
 IOP::MultipleComponentProfile::MultipleComponentProfile (CORBA::ULong max, CORBA::ULong length, IOP::TaggedComponent *buffer, CORBA::Boolean release)
-  : TAO_Unbounded_Sequence<IOP::TaggedComponent> (max, length, buffer, release)
+  : 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Sequence<IOP::TaggedComponent>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max, length, buffer, release)
 {}
 IOP::MultipleComponentProfile::MultipleComponentProfile (const MultipleComponentProfile &seq) // copy ctor
-  : TAO_Unbounded_Sequence<IOP::TaggedComponent> (seq)
+  : 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Sequence<IOP::TaggedComponent>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (seq)
 {}
 IOP::MultipleComponentProfile::~MultipleComponentProfile (void) // dtor
 {}
+void IOP::MultipleComponentProfile::_tao_any_destructor (void *x)
+{
+  MultipleComponentProfile *tmp = ACE_static_cast (MultipleComponentProfile*,x);
+  delete tmp;
+}
+
+
+#endif /* end #if !defined */
 
 static const CORBA::Long _oc_IOP_MultipleComponentProfile[] =
 {
@@ -287,10 +500,10 @@ static const CORBA::Long _oc_IOP_MultipleComponentProfile[] =
         TAO_ENCAP_BYTE_ORDER, // byte order
         CORBA::tk_octet,
 
-        0,
+        0U,
 
 
-    0,
+    0U,
 
 };
 static CORBA::TypeCode _tc_TAO_tc_IOP_MultipleComponentProfile (CORBA::tk_alias, sizeof (_oc_IOP_MultipleComponentProfile), (char *) &_oc_IOP_MultipleComponentProfile, 0, sizeof (IOP::MultipleComponentProfile));
@@ -298,89 +511,181 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_MultipleComponentProfile, &_tc_TAO_tc_IOP_MultipleComponentProfile)
 TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_ORB_TYPE, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_CODE_SETS, 1)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_POLICIES, 2)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_ALTERNATE_IIOP_ADDRESS, 3)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_ASSOCIATION_OPTIONS, 13)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_SEC_NAME, 14)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_SPKM_1_SEC_MECH, 15)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_SPKM_2_SEC_MECH, 16)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_KerberosV5_SEC_MECH, 17)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_CSI_ECMA_Secret_SEC_MECH, 18)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTLIST_CS_)
+#define __TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTLIST_CS_
+
+  void
+  IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_allocate_buffer (CORBA::ULong length)
+  {
+    IOP::TaggedComponent* tmp = 0;
+    tmp = _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (length);
+    
+    if (this->buffer_ != 0)
+    {
+      IOP::TaggedComponent *old = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        tmp[i] = old[i];
+      
+      if (this->release_)
+        _TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (old);
+      
+    }
+    this->buffer_ = tmp;
+  }
+  
+  void
+  IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_deallocate_buffer (void)
+  {
+    if (this->buffer_ == 0 || this->release_ == 0)
+      return;
+    
+    IOP::TaggedComponent *tmp = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_);
+    
+    _TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (tmp);
+    this->buffer_ = 0;
+  } 
+  
+  IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::~_TAO_Unbounded_Sequence_IOP_TaggedComponentList (void) // Dtor.
+  {
+    this->_deallocate_buffer ();
+  }
+  
+  
+#endif /* end #if !defined */
+
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_IOP_TAGGEDCOMPONENTLIST_CS_)
+#define _IOP_TAGGEDCOMPONENTLIST_CS_
+
+// *************************************************************
+// IOP::TaggedComponentList
+// *************************************************************
+
+IOP::TaggedComponentList::TaggedComponentList (void)
+{}
+IOP::TaggedComponentList::TaggedComponentList (CORBA::ULong max) // uses max size
+  : 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  _TAO_Unbounded_Sequence_IOP_TaggedComponentList
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Sequence<IOP::TaggedComponent>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max)
+{}
+IOP::TaggedComponentList::TaggedComponentList (CORBA::ULong max, CORBA::ULong length, IOP::TaggedComponent *buffer, CORBA::Boolean release)
+  : 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  _TAO_Unbounded_Sequence_IOP_TaggedComponentList
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Sequence<IOP::TaggedComponent>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max, length, buffer, release)
+{}
+IOP::TaggedComponentList::TaggedComponentList (const TaggedComponentList &seq) // copy ctor
+  : 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  _TAO_Unbounded_Sequence_IOP_TaggedComponentList
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Sequence<IOP::TaggedComponent>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (seq)
+{}
+IOP::TaggedComponentList::~TaggedComponentList (void) // dtor
+{}
+void IOP::TaggedComponentList::_tao_any_destructor (void *x)
+{
+  TaggedComponentList *tmp = ACE_static_cast (TaggedComponentList*,x);
+  delete tmp;
+}
+
+
+#endif /* end #if !defined */
+
+static const CORBA::Long _oc_IOP_TaggedComponentList[] =
+{
+  TAO_ENCAP_BYTE_ORDER, // byte order
+  40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54616767), ACE_NTOHL (0x6564436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e744c), ACE_NTOHL (0x6973743a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponentList:1.0
+  20, ACE_NTOHL (0x54616767), ACE_NTOHL (0x6564436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e744c), ACE_NTOHL (0x69737400),  // name = TaggedComponentList
+  CORBA::tk_sequence, // typecode kind
+  200, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_struct, // typecode kind
+    184, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54616767), ACE_NTOHL (0x6564436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
+      16, ACE_NTOHL (0x54616767), ACE_NTOHL (0x6564436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e7400),  // name = TaggedComponent
+      2, // member count
+      4, ACE_NTOHL (0x74616700),  // name = tag
+      CORBA::tk_alias, // typecode kind for typedefs
+      60, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x7449643a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
+        12, ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74496400),  // name = ComponentId
+        CORBA::tk_ulong,
+
+
+      15, ACE_NTOHL (0x636f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x745f6461), ACE_NTOHL (0x74610000),  // name = component_data
+      CORBA::tk_sequence, // typecode kind
+      12, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        CORBA::tk_octet,
+
+        0U,
+
+
+    0U,
+
+};
+static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponentList (CORBA::tk_alias, sizeof (_oc_IOP_TaggedComponentList), (char *) &_oc_IOP_TaggedComponentList, 0, sizeof (IOP::TaggedComponentList));
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_CSI_ECMA_Hybrid_SEC_MECH, 19)
+TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TaggedComponentList, &_tc_TAO_tc_IOP_TaggedComponentList)
 TAO_NAMESPACE_END
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_SSL_SEC_TRANS, 20)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_ORB_TYPE, 0U)
 TAO_NAMESPACE_END
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_CSI_ECMA_Public_SEC_MECH, 21)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_CODE_SETS, 1U)
 TAO_NAMESPACE_END
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_GENERIC_SEC_MECH, 22)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_POLICIES, 2U)
 TAO_NAMESPACE_END
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_COMPLETE_OBJECT_KEY, 5)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_ALTERNATE_IIOP_ADDRESS, 3U)
 TAO_NAMESPACE_END
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_ENDPOINT_ID_POSITION, 6)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_COMPLETE_OBJECT_KEY, 5U)
 TAO_NAMESPACE_END
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_LOCATION_POLICY, 12)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_ENDPOINT_ID_POSITION, 6U)
 TAO_NAMESPACE_END
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_DCE_STRING_BINDING, 100)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_LOCATION_POLICY, 12U)
 TAO_NAMESPACE_END
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_DCE_BINDING_NAME, 101)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_DCE_STRING_BINDING, 100U)
 TAO_NAMESPACE_END
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_DCE_NO_PIPES, 102)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_DCE_BINDING_NAME, 101U)
 TAO_NAMESPACE_END
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_DCE_SEC_MECH, 103)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_DCE_NO_PIPES, 102U)
 TAO_NAMESPACE_END
 static const CORBA::Long _oc_IOP_ServiceId[] =
 {
@@ -416,7 +721,7 @@ static const CORBA::Long _oc_IOP_ServiceContext[] =
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_octet,
 
-    0,
+    0U,
 
 };
 static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceContext (CORBA::tk_struct, sizeof (_oc_IOP_ServiceContext), (char *) &_oc_IOP_ServiceContext, 0, sizeof (IOP::ServiceContext));
@@ -424,6 +729,15 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServiceContext, &_tc_TAO_tc_IOP_ServiceContext)
 TAO_NAMESPACE_END
+void IOP::ServiceContext::_tao_any_destructor (void *x)
+{
+  ServiceContext *tmp = ACE_static_cast (ServiceContext*,x);
+  delete tmp;
+}
+
+
+#if !defined (_IOP_SERVICECONTEXT__TAO_SEQ_OCTET_CS_)
+#define _IOP_SERVICECONTEXT__TAO_SEQ_OCTET_CS_
 
 // *************************************************************
 // IOP::ServiceContext::_tao_seq_Octet
@@ -432,16 +746,94 @@ TAO_NAMESPACE_END
 IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (void)
 {}
 IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size
-  : TAO_Unbounded_Sequence<CORBA::Octet> (max)
+  : 
+#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 */ 
+ (max)
 {}
 IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
-  : TAO_Unbounded_Sequence<CORBA::Octet> (max, length, buffer, release)
+  : 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  TAO_Unbounded_Sequence<CORBA::Octet>
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Sequence<CORBA::Octet>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max, length, buffer, release)
 {}
 IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor
-  : TAO_Unbounded_Sequence<CORBA::Octet> (seq)
+  : 
+#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 */ 
+ (seq)
 {}
 IOP::ServiceContext::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
 {}
+void IOP::ServiceContext::_tao_seq_Octet::_tao_any_destructor (void *x)
+{
+  _tao_seq_Octet *tmp = ACE_static_cast (_tao_seq_Octet*,x);
+  delete tmp;
+}
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_SERVICECONTEXTLIST_CS_)
+#define __TAO_UNBOUNDED_SEQUENCE_IOP_SERVICECONTEXTLIST_CS_
+
+  void
+  IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_allocate_buffer (CORBA::ULong length)
+  {
+    IOP::ServiceContext* tmp = 0;
+    tmp = _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (length);
+    
+    if (this->buffer_ != 0)
+    {
+      IOP::ServiceContext *old = ACE_reinterpret_cast (IOP::ServiceContext *,this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        tmp[i] = old[i];
+      
+      if (this->release_)
+        _TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (old);
+      
+    }
+    this->buffer_ = tmp;
+  }
+  
+  void
+  IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_deallocate_buffer (void)
+  {
+    if (this->buffer_ == 0 || this->release_ == 0)
+      return;
+    
+    IOP::ServiceContext *tmp = ACE_reinterpret_cast (IOP::ServiceContext *,this->buffer_);
+    
+    _TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (tmp);
+    this->buffer_ = 0;
+  } 
+  
+  IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::~_TAO_Unbounded_Sequence_IOP_ServiceContextList (void) // Dtor.
+  {
+    this->_deallocate_buffer ();
+  }
+  
+  
+#endif /* end #if !defined */
+
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_IOP_SERVICECONTEXTLIST_CS_)
+#define _IOP_SERVICECONTEXTLIST_CS_
 
 // *************************************************************
 // IOP::ServiceContextList
@@ -450,16 +842,42 @@ IOP::ServiceContext::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
 IOP::ServiceContextList::ServiceContextList (void)
 {}
 IOP::ServiceContextList::ServiceContextList (CORBA::ULong max) // uses max size
-  : TAO_Unbounded_Sequence<IOP::ServiceContext> (max)
+  : 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  _TAO_Unbounded_Sequence_IOP_ServiceContextList
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Sequence<IOP::ServiceContext>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max)
 {}
 IOP::ServiceContextList::ServiceContextList (CORBA::ULong max, CORBA::ULong length, IOP::ServiceContext *buffer, CORBA::Boolean release)
-  : TAO_Unbounded_Sequence<IOP::ServiceContext> (max, length, buffer, release)
+  : 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  _TAO_Unbounded_Sequence_IOP_ServiceContextList
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Sequence<IOP::ServiceContext>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max, length, buffer, release)
 {}
 IOP::ServiceContextList::ServiceContextList (const ServiceContextList &seq) // copy ctor
-  : TAO_Unbounded_Sequence<IOP::ServiceContext> (seq)
+  : 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  _TAO_Unbounded_Sequence_IOP_ServiceContextList
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Sequence<IOP::ServiceContext>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (seq)
 {}
 IOP::ServiceContextList::~ServiceContextList (void) // dtor
 {}
+void IOP::ServiceContextList::_tao_any_destructor (void *x)
+{
+  ServiceContextList *tmp = ACE_static_cast (ServiceContextList*,x);
+  delete tmp;
+}
+
+
+#endif /* end #if !defined */
 
 static const CORBA::Long _oc_IOP_ServiceContextList[] =
 {
@@ -490,10 +908,10 @@ static const CORBA::Long _oc_IOP_ServiceContextList[] =
         TAO_ENCAP_BYTE_ORDER, // byte order
         CORBA::tk_octet,
 
-        0,
+        0U,
 
 
-    0,
+    0U,
 
 };
 static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceContextList (CORBA::tk_alias, sizeof (_oc_IOP_ServiceContextList), (char *) &_oc_IOP_ServiceContextList, 0, sizeof (IOP::ServiceContextList));
@@ -503,195 +921,144 @@ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServiceContextList, &_tc_TAO_tc_I
 TAO_NAMESPACE_END
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TransactionService, 0)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, TransactionService, 0U)
 TAO_NAMESPACE_END
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, CodeSets, 1)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, CodeSets, 1U)
 TAO_NAMESPACE_END
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, ChainBypassCheck, 2)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, ChainBypassCheck, 2U)
 TAO_NAMESPACE_END
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, ChainBypassInfo, 3)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, ChainBypassInfo, 3U)
 TAO_NAMESPACE_END
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, LogicalThreadId, 4)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, LogicalThreadId, 4U)
 TAO_NAMESPACE_END
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, BI_DIR_IIOP, 5)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, BI_DIR_IIOP, 5U)
 TAO_NAMESPACE_END
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, SendingContextRunTime, 6)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, SendingContextRunTime, 6U)
 TAO_NAMESPACE_END
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, INVOCATION_POLICIES, 7)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, INVOCATION_POLICIES, 7U)
 TAO_NAMESPACE_END
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, UnknownExceptionInfo, 9)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, UnknownExceptionInfo, 9U)
 TAO_NAMESPACE_END
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, RTCorbaPriority, 10)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, RTCorbaPriority, 10U)
 TAO_NAMESPACE_END
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, RTCorbaPriorityRange, 11)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, RTCorbaPriorityRange, 11U)
 TAO_NAMESPACE_END
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_FT_GROUP, 27)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_FT_GROUP, 27U)
 TAO_NAMESPACE_END
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_FT_PRIMARY, 28)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_FT_PRIMARY, 28U)
 TAO_NAMESPACE_END
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_FT_HEARTBEAT_ENABLED, 29)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_FT_HEARTBEAT_ENABLED, 29U)
 TAO_NAMESPACE_END
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, FT_GROUP_VERSION, 12)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, FT_GROUP_VERSION, 12U)
 TAO_NAMESPACE_END
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, FT_REQUEST, 13)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, FT_REQUEST, 13U)
 TAO_NAMESPACE_END
-
 void operator<<= (CORBA::Any &_tao_any, const IOP::TaggedProfile &_tao_elem) // copying
 {
-    TAO_OutputCDR stream;
-    stream << _tao_elem;
-    _tao_any._tao_replace (
-        IOP::_tc_TaggedProfile,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-}
-
-void IOP::TaggedProfile::_tao_any_destructor (void *x)
-{
-  IOP::TaggedProfile *tmp = ACE_static_cast(IOP::TaggedProfile*,x);
-  delete tmp;
+  TAO_OutputCDR stream;
+  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
 {
-    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
-      );
+  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
+    );
 }
 
 CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::TaggedProfile *&_tao_elem)
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equivalent (IOP::_tc_TaggedProfile, ACE_TRY_ENV)) // not equal
-      {
-        _tao_elem = 0;
-        return 0;
-      }
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (IOP::TaggedProfile *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, IOP::TaggedProfile, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *_tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IOP::_tc_TaggedProfile,
-            1,
-            ACE_reinterpret_cast (void *, _tao_elem),
-            IOP::TaggedProfile::_tao_any_destructor
-          );
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-        _tao_elem = 0;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    _tao_elem = 0;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
+  return _tao_any >>= ACE_const_cast(const IOP::TaggedProfile*&,_tao_elem);
 }
 
 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 ();
     if (!type->equivalent (IOP::_tc_TaggedProfile, ACE_TRY_ENV)) // not equal
       {
-        _tao_elem = 0;
         return 0;
       }
     ACE_TRY_CHECK;
     if (_tao_any.any_owns_data ())
     {
-      _tao_elem = (IOP::TaggedProfile *)_tao_any.value ();
+      _tao_elem = ACE_static_cast(
+          const IOP::TaggedProfile*,
+          _tao_any.value ()
+        );
       return 1;
-      }
+    }
     else
     {
-      ACE_NEW_RETURN (_tao_elem, IOP::TaggedProfile, 0);
+      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 >> *(IOP::TaggedProfile *)_tao_elem)
+      if (stream >> *tmp)
       {
         ((CORBA::Any *)&_tao_any)->_tao_replace (
             IOP::_tc_TaggedProfile,
             1,
-            ACE_reinterpret_cast (void *, ACE_const_cast (IOP::TaggedProfile *&, _tao_elem)),
+            ACE_static_cast (void *, tmp),
             IOP::TaggedProfile::_tao_any_destructor
           );
+        _tao_elem = tmp;
         return 1;
       }
       else
       {
-        delete ACE_const_cast (IOP::TaggedProfile *&, _tao_elem);
-        _tao_elem = 0;
+        delete tmp;
       }
     }
   }
   ACE_CATCHANY
   {
-    delete ACE_const_cast (IOP::TaggedProfile *&, _tao_elem);
-    _tao_elem = 0;
-    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -699,130 +1066,80 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedProfile
 
 void operator<<= (CORBA::Any &_tao_any, const IOP::IOR &_tao_elem) // copying
 {
-    TAO_OutputCDR stream;
-    stream << _tao_elem;
-    _tao_any._tao_replace (
-        IOP::_tc_IOR,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-}
-
-void IOP::IOR::_tao_any_destructor (void *x)
-{
-  IOP::IOR *tmp = ACE_static_cast(IOP::IOR*,x);
-  delete tmp;
+  TAO_OutputCDR stream;
+  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
 {
-    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
-      );
+  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
+    );
 }
 
 CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::IOR *&_tao_elem)
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equivalent (IOP::_tc_IOR, ACE_TRY_ENV)) // not equal
-      {
-        _tao_elem = 0;
-        return 0;
-      }
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (IOP::IOR *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, IOP::IOR, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *_tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IOP::_tc_IOR,
-            1,
-            ACE_reinterpret_cast (void *, _tao_elem),
-            IOP::IOR::_tao_any_destructor
-          );
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-        _tao_elem = 0;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    _tao_elem = 0;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
+  return _tao_any >>= ACE_const_cast(const IOP::IOR*&,_tao_elem);
 }
 
 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 ();
     if (!type->equivalent (IOP::_tc_IOR, ACE_TRY_ENV)) // not equal
       {
-        _tao_elem = 0;
         return 0;
       }
     ACE_TRY_CHECK;
     if (_tao_any.any_owns_data ())
     {
-      _tao_elem = (IOP::IOR *)_tao_any.value ();
+      _tao_elem = ACE_static_cast(
+          const IOP::IOR*,
+          _tao_any.value ()
+        );
       return 1;
-      }
+    }
     else
     {
-      ACE_NEW_RETURN (_tao_elem, IOP::IOR, 0);
+      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 >> *(IOP::IOR *)_tao_elem)
+      if (stream >> *tmp)
       {
         ((CORBA::Any *)&_tao_any)->_tao_replace (
             IOP::_tc_IOR,
             1,
-            ACE_reinterpret_cast (void *, ACE_const_cast (IOP::IOR *&, _tao_elem)),
+            ACE_static_cast (void *, tmp),
             IOP::IOR::_tao_any_destructor
           );
+        _tao_elem = tmp;
         return 1;
       }
       else
       {
-        delete ACE_const_cast (IOP::IOR *&, _tao_elem);
-        _tao_elem = 0;
+        delete tmp;
       }
     }
   }
   ACE_CATCHANY
   {
-    delete ACE_const_cast (IOP::IOR *&, _tao_elem);
-    _tao_elem = 0;
-    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -830,130 +1147,80 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::IOR *&_tao_el
 
 void operator<<= (CORBA::Any &_tao_any, const IOP::TaggedComponent &_tao_elem) // copying
 {
-    TAO_OutputCDR stream;
-    stream << _tao_elem;
-    _tao_any._tao_replace (
-        IOP::_tc_TaggedComponent,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-}
-
-void IOP::TaggedComponent::_tao_any_destructor (void *x)
-{
-  IOP::TaggedComponent *tmp = ACE_static_cast(IOP::TaggedComponent*,x);
-  delete tmp;
+  TAO_OutputCDR stream;
+  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
 {
-    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
-      );
+  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
+    );
 }
 
 CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::TaggedComponent *&_tao_elem)
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equivalent (IOP::_tc_TaggedComponent, ACE_TRY_ENV)) // not equal
-      {
-        _tao_elem = 0;
-        return 0;
-      }
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (IOP::TaggedComponent *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, IOP::TaggedComponent, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *_tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IOP::_tc_TaggedComponent,
-            1,
-            ACE_reinterpret_cast (void *, _tao_elem),
-            IOP::TaggedComponent::_tao_any_destructor
-          );
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-        _tao_elem = 0;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    _tao_elem = 0;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
+  return _tao_any >>= ACE_const_cast(const IOP::TaggedComponent*&,_tao_elem);
 }
 
 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 ();
     if (!type->equivalent (IOP::_tc_TaggedComponent, ACE_TRY_ENV)) // not equal
       {
-        _tao_elem = 0;
         return 0;
       }
     ACE_TRY_CHECK;
     if (_tao_any.any_owns_data ())
     {
-      _tao_elem = (IOP::TaggedComponent *)_tao_any.value ();
+      _tao_elem = ACE_static_cast(
+          const IOP::TaggedComponent*,
+          _tao_any.value ()
+        );
       return 1;
-      }
+    }
     else
     {
-      ACE_NEW_RETURN (_tao_elem, IOP::TaggedComponent, 0);
+      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 >> *(IOP::TaggedComponent *)_tao_elem)
+      if (stream >> *tmp)
       {
         ((CORBA::Any *)&_tao_any)->_tao_replace (
             IOP::_tc_TaggedComponent,
             1,
-            ACE_reinterpret_cast (void *, ACE_const_cast (IOP::TaggedComponent *&, _tao_elem)),
+            ACE_static_cast (void *, tmp),
             IOP::TaggedComponent::_tao_any_destructor
           );
+        _tao_elem = tmp;
         return 1;
       }
       else
       {
-        delete ACE_const_cast (IOP::TaggedComponent *&, _tao_elem);
-        _tao_elem = 0;
+        delete tmp;
       }
     }
   }
   ACE_CATCHANY
   {
-    delete ACE_const_cast (IOP::TaggedComponent *&, _tao_elem);
-    _tao_elem = 0;
-    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -964,263 +1231,255 @@ void operator<<= (
     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 ()
-        );
-    }
-}
-
-void IOP::MultipleComponentProfile::_tao_any_destructor (void *x)
-{
-  IOP::MultipleComponentProfile *tmp = ACE_static_cast(IOP::MultipleComponentProfile*,x);
-  delete tmp;
-}
-
-void operator<<= (CORBA::Any &_tao_any, IOP::MultipleComponentProfile *_tao_elem) // non copying
-{
-    TAO_OutputCDR stream;
-    stream << *_tao_elem;
+  TAO_OutputCDR stream;
+  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
+        stream.begin ()
       );
+  }
+}
+
+void operator<<= (CORBA::Any &_tao_any, IOP::MultipleComponentProfile *_tao_elem) // non copying
+{
+  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
+    );
 }
 
 CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::MultipleComponentProfile *&_tao_elem)
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equivalent (IOP::_tc_MultipleComponentProfile, ACE_TRY_ENV)) // not equal
-      {
-        _tao_elem = 0;
-        return 0;
-      }
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (IOP::MultipleComponentProfile *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, IOP::MultipleComponentProfile, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *_tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IOP::_tc_MultipleComponentProfile,
-            1,
-            ACE_reinterpret_cast (void *, _tao_elem),
-            IOP::MultipleComponentProfile::_tao_any_destructor
-          );
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-        _tao_elem = 0;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    _tao_elem = 0;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
+  return _tao_any >>= ACE_const_cast(
+      const IOP::MultipleComponentProfile*&,
+      _tao_elem
+    );
 }
 
 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 ();
     if (!type->equivalent (IOP::_tc_MultipleComponentProfile, ACE_TRY_ENV)) // not equal
       {
-        _tao_elem = 0;
         return 0;
       }
     ACE_TRY_CHECK;
     if (_tao_any.any_owns_data ())
     {
-      _tao_elem = (IOP::MultipleComponentProfile *)_tao_any.value ();
+      _tao_elem = ACE_static_cast(
+          const IOP::MultipleComponentProfile*,
+          _tao_any.value ()
+        );
       return 1;
     }
     else
     {
-      ACE_NEW_RETURN (_tao_elem, IOP::MultipleComponentProfile, 0);
+      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 >> *(IOP::MultipleComponentProfile *)_tao_elem)
+      if (stream >> *tmp)
       {
         ((CORBA::Any *)&_tao_any)->_tao_replace (
             IOP::_tc_MultipleComponentProfile,
             1,
-            ACE_reinterpret_cast (void *, ACE_const_cast (IOP::MultipleComponentProfile *&, _tao_elem)),
+            ACE_static_cast (void *, tmp),
             IOP::MultipleComponentProfile::_tao_any_destructor
           );
+        _tao_elem = tmp;
         return 1;
       }
       else
       {
-        delete ACE_const_cast (IOP::MultipleComponentProfile *&, _tao_elem);
-        _tao_elem = 0;
+        delete tmp;
       }
     }
   }
   ACE_CATCHANY
   {
-    delete ACE_const_cast (IOP::MultipleComponentProfile *&, _tao_elem);
-    _tao_elem = 0;
-    return 0;
   }
   ACE_ENDTRY;
   return 0;
 }
 
-void operator<<= (CORBA::Any &_tao_any, const IOP::ServiceContext &_tao_elem) // copying
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const IOP::TaggedComponentList &_tao_elem
+  ) // copying
 {
-    TAO_OutputCDR stream;
-    stream << _tao_elem;
+  TAO_OutputCDR stream;
+  if (stream << _tao_elem)
+  {
     _tao_any._tao_replace (
-        IOP::_tc_ServiceContext,
+        IOP::_tc_TaggedComponentList,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin ()
       );
+  }
 }
 
-void IOP::ServiceContext::_tao_any_destructor (void *x)
+void operator<<= (CORBA::Any &_tao_any, IOP::TaggedComponentList *_tao_elem) // non copying
 {
-  IOP::ServiceContext *tmp = ACE_static_cast(IOP::ServiceContext*,x);
-  delete tmp;
+  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
+    );
 }
 
-void operator<<= (CORBA::Any &_tao_any, IOP::ServiceContext *_tao_elem) // non copying
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::TaggedComponentList *&_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
-      );
+  return _tao_any >>= ACE_const_cast(
+      const IOP::TaggedComponentList*&,
+      _tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::ServiceContext *&_tao_elem)
+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 ();
-    if (!type->equivalent (IOP::_tc_ServiceContext, ACE_TRY_ENV)) // not equal
+    if (!type->equivalent (IOP::_tc_TaggedComponentList, ACE_TRY_ENV)) // not equal
       {
-        _tao_elem = 0;
         return 0;
       }
     ACE_TRY_CHECK;
     if (_tao_any.any_owns_data ())
     {
-      _tao_elem = (IOP::ServiceContext *)_tao_any.value ();
+      _tao_elem = ACE_static_cast(
+          const IOP::TaggedComponentList*,
+          _tao_any.value ()
+        );
       return 1;
     }
     else
     {
-      ACE_NEW_RETURN (_tao_elem, IOP::ServiceContext, 0);
+      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 >> *_tao_elem)
+      if (stream >> *tmp)
       {
         ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IOP::_tc_ServiceContext,
+            IOP::_tc_TaggedComponentList,
             1,
-            ACE_reinterpret_cast (void *, _tao_elem),
-            IOP::ServiceContext::_tao_any_destructor
+            ACE_static_cast (void *, tmp),
+            IOP::TaggedComponentList::_tao_any_destructor
           );
+        _tao_elem = tmp;
         return 1;
       }
       else
       {
-        delete _tao_elem;
-        _tao_elem = 0;
+        delete tmp;
       }
     }
   }
   ACE_CATCHANY
   {
-    delete _tao_elem;
-    _tao_elem = 0;
-    return 0;
   }
   ACE_ENDTRY;
   return 0;
 }
 
+void operator<<= (CORBA::Any &_tao_any, const IOP::ServiceContext &_tao_elem) // copying
+{
+  TAO_OutputCDR stream;
+  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
+{
+  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
+    );
+}
+
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, 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)
 {
+  _tao_elem = 0;
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equivalent (IOP::_tc_ServiceContext, ACE_TRY_ENV)) // not equal
       {
-        _tao_elem = 0;
         return 0;
       }
     ACE_TRY_CHECK;
     if (_tao_any.any_owns_data ())
     {
-      _tao_elem = (IOP::ServiceContext *)_tao_any.value ();
+      _tao_elem = ACE_static_cast(
+          const IOP::ServiceContext*,
+          _tao_any.value ()
+        );
       return 1;
-      }
+    }
     else
     {
-      ACE_NEW_RETURN (_tao_elem, IOP::ServiceContext, 0);
+      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 >> *(IOP::ServiceContext *)_tao_elem)
+      if (stream >> *tmp)
       {
         ((CORBA::Any *)&_tao_any)->_tao_replace (
             IOP::_tc_ServiceContext,
             1,
-            ACE_reinterpret_cast (void *, ACE_const_cast (IOP::ServiceContext *&, _tao_elem)),
+            ACE_static_cast (void *, tmp),
             IOP::ServiceContext::_tao_any_destructor
           );
+        _tao_elem = tmp;
         return 1;
       }
       else
       {
-        delete ACE_const_cast (IOP::ServiceContext *&, _tao_elem);
-        _tao_elem = 0;
+        delete tmp;
       }
     }
   }
   ACE_CATCHANY
   {
-    delete ACE_const_cast (IOP::ServiceContext *&, _tao_elem);
-    _tao_elem = 0;
-    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -1231,137 +1490,94 @@ void operator<<= (
     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 ()
-        );
-    }
-}
-
-void IOP::ServiceContextList::_tao_any_destructor (void *x)
-{
-  IOP::ServiceContextList *tmp = ACE_static_cast(IOP::ServiceContextList*,x);
-  delete tmp;
-}
-
-void operator<<= (CORBA::Any &_tao_any, IOP::ServiceContextList *_tao_elem) // non copying
-{
-    TAO_OutputCDR stream;
-    stream << *_tao_elem;
+  TAO_OutputCDR stream;
+  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
+        stream.begin ()
       );
+  }
+}
+
+void operator<<= (CORBA::Any &_tao_any, IOP::ServiceContextList *_tao_elem) // non copying
+{
+  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
+    );
 }
 
 CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::ServiceContextList *&_tao_elem)
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equivalent (IOP::_tc_ServiceContextList, ACE_TRY_ENV)) // not equal
-      {
-        _tao_elem = 0;
-        return 0;
-      }
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (IOP::ServiceContextList *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, IOP::ServiceContextList, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *_tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IOP::_tc_ServiceContextList,
-            1,
-            ACE_reinterpret_cast (void *, _tao_elem),
-            IOP::ServiceContextList::_tao_any_destructor
-          );
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-        _tao_elem = 0;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    _tao_elem = 0;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
+  return _tao_any >>= ACE_const_cast(
+      const IOP::ServiceContextList*&,
+      _tao_elem
+    );
 }
 
 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 ();
     if (!type->equivalent (IOP::_tc_ServiceContextList, ACE_TRY_ENV)) // not equal
       {
-        _tao_elem = 0;
         return 0;
       }
     ACE_TRY_CHECK;
     if (_tao_any.any_owns_data ())
     {
-      _tao_elem = (IOP::ServiceContextList *)_tao_any.value ();
+      _tao_elem = ACE_static_cast(
+          const IOP::ServiceContextList*,
+          _tao_any.value ()
+        );
       return 1;
     }
     else
     {
-      ACE_NEW_RETURN (_tao_elem, IOP::ServiceContextList, 0);
+      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 >> *(IOP::ServiceContextList *)_tao_elem)
+      if (stream >> *tmp)
       {
         ((CORBA::Any *)&_tao_any)->_tao_replace (
             IOP::_tc_ServiceContextList,
             1,
-            ACE_reinterpret_cast (void *, ACE_const_cast (IOP::ServiceContextList *&, _tao_elem)),
+            ACE_static_cast (void *, tmp),
             IOP::ServiceContextList::_tao_any_destructor
           );
+        _tao_elem = tmp;
         return 1;
       }
       else
       {
-        delete ACE_const_cast (IOP::ServiceContextList *&, _tao_elem);
-        _tao_elem = 0;
+        delete tmp;
       }
     }
   }
   ACE_CATCHANY
   {
-    delete ACE_const_cast (IOP::ServiceContextList *&, _tao_elem);
-    _tao_elem = 0;
-    return 0;
   }
   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_
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const IOP::TaggedProfile::_tao_seq_Octet &_tao_sequence
@@ -1370,20 +1586,20 @@ CORBA::Boolean operator<< (
   if (strm << _tao_sequence.length ())
   {
     // encode all elements
-
+    
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-        ACE_dynamic_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::TaggedProfile::_tao_seq_Octet *)&_tao_sequence);
+      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+        ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::TaggedProfile::_tao_seq_Octet *)&_tao_sequence);
       if (oseq->mb ())
         return strm.write_octet_array_mb (oseq->mb ());
       else
         return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
     }
-
+    
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+  
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
   }
   return 0; // error
@@ -1399,13 +1615,16 @@ CORBA::Boolean operator>> (
   {
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
+    // If length is 0 we return true.
+    if (0 >= _tao_seq_len) 
+      return 1;
     // retrieve all the elements
-
+    
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
     if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE))
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-        ACE_dynamic_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
+      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+        ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
       oseq->replace (_tao_seq_len, strm.start ());
       oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
       strm.skip_bytes (_tao_seq_len);
@@ -1413,15 +1632,21 @@ CORBA::Boolean operator>> (
     }
     else
       return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-
+    
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+  
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
   }
   return 0; // error
 }
 
+#endif /* _TAO_CDR_OP_IOP_TaggedProfile__tao_seq_Octet_CPP_ */
+
+
+#if !defined _TAO_CDR_OP_IOP_IOR__tao_seq_TaggedProfile_CPP_
+#define _TAO_CDR_OP_IOP_IOR__tao_seq_TaggedProfile_CPP_
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const IOP::IOR::_tao_seq_TaggedProfile &_tao_sequence
@@ -1432,7 +1657,9 @@ CORBA::Boolean operator<< (
     // encode all elements
     CORBA::Boolean _tao_marshal_flag = 1;
     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+    {
       _tao_marshal_flag = (strm << _tao_sequence[i]);
+    }
     return _tao_marshal_flag;
   }
   return 0; // error
@@ -1448,15 +1675,26 @@ CORBA::Boolean operator>> (
   {
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
+    // If length is 0 we return true.
+    if (0 >= _tao_seq_len) 
+      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++)
+    {
       _tao_marshal_flag = (strm >> _tao_sequence[i]);
+    }
     return _tao_marshal_flag;
   }
   return 0; // error
 }
 
+#endif /* _TAO_CDR_OP_IOP_IOR__tao_seq_TaggedProfile_CPP_ */
+
+
+#if !defined _TAO_CDR_OP_IOP_TaggedComponent__tao_seq_Octet_CPP_
+#define _TAO_CDR_OP_IOP_TaggedComponent__tao_seq_Octet_CPP_
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const IOP::TaggedComponent::_tao_seq_Octet &_tao_sequence
@@ -1465,20 +1703,20 @@ CORBA::Boolean operator<< (
   if (strm << _tao_sequence.length ())
   {
     // encode all elements
-
+    
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-        ACE_dynamic_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::TaggedComponent::_tao_seq_Octet *)&_tao_sequence);
+      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+        ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::TaggedComponent::_tao_seq_Octet *)&_tao_sequence);
       if (oseq->mb ())
         return strm.write_octet_array_mb (oseq->mb ());
       else
         return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
     }
-
+    
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+  
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
   }
   return 0; // error
@@ -1494,13 +1732,16 @@ CORBA::Boolean operator>> (
   {
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
+    // If length is 0 we return true.
+    if (0 >= _tao_seq_len) 
+      return 1;
     // retrieve all the elements
-
+    
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
     if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE))
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-        ACE_dynamic_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
+      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+        ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
       oseq->replace (_tao_seq_len, strm.start ());
       oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
       strm.skip_bytes (_tao_seq_len);
@@ -1508,15 +1749,17 @@ CORBA::Boolean operator>> (
     }
     else
       return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-
+    
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+  
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
   }
   return 0; // error
 }
 
+#endif /* _TAO_CDR_OP_IOP_TaggedComponent__tao_seq_Octet_CPP_ */
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const IOP::MultipleComponentProfile &_tao_sequence
@@ -1527,7 +1770,9 @@ CORBA::Boolean operator<< (
     // encode all elements
     CORBA::Boolean _tao_marshal_flag = 1;
     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+    {
       _tao_marshal_flag = (strm << _tao_sequence[i]);
+    }
     return _tao_marshal_flag;
   }
   return 0; // error
@@ -1543,10 +1788,15 @@ CORBA::Boolean operator>> (
   {
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
+    // If length is 0 we return true.
+    if (0 >= _tao_seq_len) 
+      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++)
+    {
       _tao_marshal_flag = (strm >> _tao_sequence[i]);
+    }
     return _tao_marshal_flag;
   }
   return 0; // error
@@ -1554,26 +1804,72 @@ CORBA::Boolean operator>> (
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const IOP::ServiceContext::_tao_seq_Octet &_tao_sequence
+    const IOP::TaggedComponentList &_tao_sequence
   )
 {
   if (strm << _tao_sequence.length ())
   {
     // encode all elements
+    CORBA::Boolean _tao_marshal_flag = 1;
+    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+    {
+      _tao_marshal_flag = (strm << _tao_sequence[i]);
+    }
+    return _tao_marshal_flag;
+  }
+  return 0; // error
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    IOP::TaggedComponentList &_tao_sequence
+  )
+{
+  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;
+    // retrieve all the elements
+    CORBA::Boolean _tao_marshal_flag = 1;
+    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+    {
+      _tao_marshal_flag = (strm >> _tao_sequence[i]);
+    }
+    return _tao_marshal_flag;
+  }
+  return 0; // error
+}
+
 
+#if !defined _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_CPP_
+#define _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_CPP_
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const IOP::ServiceContext::_tao_seq_Octet &_tao_sequence
+  )
+{
+  if (strm << _tao_sequence.length ())
+  {
+    // encode all elements
+    
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-        ACE_dynamic_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::ServiceContext::_tao_seq_Octet *)&_tao_sequence);
+      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+        ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::ServiceContext::_tao_seq_Octet *)&_tao_sequence);
       if (oseq->mb ())
         return strm.write_octet_array_mb (oseq->mb ());
       else
         return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
     }
-
+    
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+  
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
   }
   return 0; // error
@@ -1589,13 +1885,16 @@ CORBA::Boolean operator>> (
   {
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
+    // If length is 0 we return true.
+    if (0 >= _tao_seq_len) 
+      return 1;
     // retrieve all the elements
-
+    
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
     if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE))
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-        ACE_dynamic_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
+      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+        ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
       oseq->replace (_tao_seq_len, strm.start ());
       oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
       strm.skip_bytes (_tao_seq_len);
@@ -1603,15 +1902,17 @@ CORBA::Boolean operator>> (
     }
     else
       return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-
+    
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+  
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
   }
   return 0; // error
 }
 
+#endif /* _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_CPP_ */
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const IOP::ServiceContextList &_tao_sequence
@@ -1622,7 +1923,9 @@ CORBA::Boolean operator<< (
     // encode all elements
     CORBA::Boolean _tao_marshal_flag = 1;
     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+    {
       _tao_marshal_flag = (strm << _tao_sequence[i]);
+    }
     return _tao_marshal_flag;
   }
   return 0; // error
@@ -1638,11 +1941,17 @@ CORBA::Boolean operator>> (
   {
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
+    // If length is 0 we return true.
+    if (0 >= _tao_seq_len) 
+      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++)
+    {
       _tao_marshal_flag = (strm >> _tao_sequence[i]);
+    }
     return _tao_marshal_flag;
   }
   return 0; // error
 }
+