ChangeLogTag:Sat Mar 03 11:14:57 2001 Ossama Othman <ossama@uci.edu>

8 files changed, 266 insertions, 201 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 46f955ed995..5aa01d8db2c 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,35 @@
+Sat Mar 03 11:14:57 2001  Ossama Othman  <ossama@uci.edu>
+
+	* tao/corbafwd.h:
+
+	  Added the CORBA::_tc_{OctetSeq,StringSeq,WStringSeq} TypeCode
+	  declarations.  They were previously renamed to get around
+	  problems with compilers that lack support for namespaces.  The
+	  proper workaround is to actually put them in the CORBA namespace
+	  by using the forward declaration / typedef trick used in this
+	  file.  This also fixes a problem with these TypeCodes not being
+	  available due to the renaming.
+
+	* tao/OctetSeqC.h:
+	* tao/StringSeqC.h:
+
+	  Removed the _tc_CORBA_{OctetSeq,StringSeq,WStringSeq}
+	  declarations.  They were hacks to get around compilers that do
+	  not support namespaces.  The proper TypeCodes are now declared
+	  in the CORBA namespace in `corbafwd.h'.
+
+	* tao/OctetSeqC.cpp:
+	* tao/StringSeqC.cpp:
+
+	  Use the proper CORBA::_tc_{OctetSeq,StringSeq,WStringSeq}
+	  TypeCodes rather than broken renamed ones described above.  This
+	  addresses CORBA compliance and interoperability problems.
+
+	* tao/diffs/OctetSeq.diff:
+	* tao/diffs/StringSeq.diff:
+
+	  Regenerated these diffs to include the above changes.
+
 Sat Mar  3 10:42:01 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp (forward_references): 
diff --git a/TAO/tao/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp
index 983f69df28c..bd19401dada 100644
--- a/TAO/tao/OctetSeqC.cpp
+++ b/TAO/tao/OctetSeqC.cpp
@@ -95,7 +95,9 @@ static const CORBA::Long _oc_CORBA_OctetSeq[] =
 };
 static CORBA::TypeCode _tc_TAO_tc_CORBA_OctetSeq (CORBA::tk_alias, sizeof (_oc_CORBA_OctetSeq), (char *) &_oc_CORBA_OctetSeq, 0, sizeof (CORBA_OctetSeq));
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_CORBA_OctetSeq, &_tc_TAO_tc_CORBA_OctetSeq)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_OctetSeq, &_tc_TAO_tc_CORBA_OctetSeq)
+TAO_NAMESPACE_END
 
 void operator<<= (
     CORBA::Any &_tao_any,
@@ -106,7 +108,7 @@ void operator<<= (
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        _tc_CORBA_OctetSeq,
+        CORBA::_tc_OctetSeq,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin ()
       );
@@ -118,7 +120,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_OctetSeq *_tao_elem) // non copyin
   TAO_OutputCDR stream;
   stream << *_tao_elem;
   _tao_any._tao_replace (
-      _tc_CORBA_OctetSeq,
+      CORBA::_tc_OctetSeq,
       TAO_ENCAP_BYTE_ORDER,
       stream.begin (),
       1,
@@ -141,7 +143,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_OctetSeq *&_
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equivalent (_tc_CORBA_OctetSeq, ACE_TRY_ENV)) // not equal
+    if (!type->equivalent (CORBA::_tc_OctetSeq, ACE_TRY_ENV)) // not equal
       {
         return 0;
       }
@@ -165,7 +167,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_OctetSeq *&_
       if (stream >> *tmp)
       {
         ((CORBA::Any *)&_tao_any)->_tao_replace (
-            _tc_CORBA_OctetSeq,
+            CORBA::_tc_OctetSeq,
             1,
             ACE_static_cast (void *, tmp),
             CORBA_OctetSeq::_tao_any_destructor
diff --git a/TAO/tao/OctetSeqC.h b/TAO/tao/OctetSeqC.h
index 9fd9bb78107..1faaeb8ee23 100644
--- a/TAO/tao/OctetSeqC.h
+++ b/TAO/tao/OctetSeqC.h
@@ -171,9 +171,6 @@
 
 #endif /* end #if !defined */
 
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_CORBA_OctetSeq;
-
-
 // Proxy Broker Factory function pointer declarations.
 
 TAO_Export void operator<<= (CORBA::Any &, const CORBA_OctetSeq &); // copying version
diff --git a/TAO/tao/StringSeqC.cpp b/TAO/tao/StringSeqC.cpp
index 36977922243..6411e8067cf 100644
--- a/TAO/tao/StringSeqC.cpp
+++ b/TAO/tao/StringSeqC.cpp
@@ -95,8 +95,9 @@ static const CORBA::Long _oc_CORBA_StringSeq[] =
 };
 static CORBA::TypeCode _tc_TAO_tc_CORBA_StringSeq (CORBA::tk_alias, sizeof (_oc_CORBA_StringSeq), (char *) &_oc_CORBA_StringSeq, 0, sizeof (CORBA_StringSeq));
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_CORBA_StringSeq, &_tc_TAO_tc_CORBA_StringSeq)
-
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StringSeq, &_tc_TAO_tc_CORBA_StringSeq)
+TAO_NAMESPACE_END
 
 #if !defined (_CORBA_WSTRINGSEQ_CS_)
 #define _CORBA_WSTRINGSEQ_CS_
@@ -160,7 +161,9 @@ static const CORBA::Long _oc_CORBA_WStringSeq[] =
 };
 static CORBA::TypeCode _tc_TAO_tc_CORBA_WStringSeq (CORBA::tk_alias, sizeof (_oc_CORBA_WStringSeq), (char *) &_oc_CORBA_WStringSeq, 0, sizeof (CORBA_WStringSeq));
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_CORBA_WStringSeq, &_tc_TAO_tc_CORBA_WStringSeq)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_WStringSeq, &_tc_TAO_tc_CORBA_WStringSeq)
+TAO_NAMESPACE_END
 
 void operator<<= (
     CORBA::Any &_tao_any,
@@ -171,7 +174,7 @@ void operator<<= (
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        _tc_CORBA_StringSeq,
+        CORBA::_tc_StringSeq,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin ()
       );
@@ -183,7 +186,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_StringSeq *_tao_elem) // non copyi
   TAO_OutputCDR stream;
   stream << *_tao_elem;
   _tao_any._tao_replace (
-      _tc_CORBA_StringSeq,
+      CORBA::_tc_StringSeq,
       TAO_ENCAP_BYTE_ORDER,
       stream.begin (),
       1,
@@ -206,7 +209,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_StringSeq *&
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equivalent (_tc_CORBA_StringSeq, ACE_TRY_ENV)) // not equal
+    if (!type->equivalent (CORBA::_tc_StringSeq, ACE_TRY_ENV)) // not equal
       {
         return 0;
       }
@@ -230,7 +233,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_StringSeq *&
       if (stream >> *tmp)
       {
         ((CORBA::Any *)&_tao_any)->_tao_replace (
-            _tc_CORBA_StringSeq,
+            CORBA::_tc_StringSeq,
             1,
             ACE_static_cast (void *, tmp),
             CORBA_StringSeq::_tao_any_destructor
@@ -260,7 +263,7 @@ void operator<<= (
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        _tc_CORBA_WStringSeq,
+        CORBA::_tc_WStringSeq,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin ()
       );
@@ -272,7 +275,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_WStringSeq *_tao_elem) // non copy
   TAO_OutputCDR stream;
   stream << *_tao_elem;
   _tao_any._tao_replace (
-      _tc_CORBA_WStringSeq,
+      CORBA::_tc_WStringSeq,
       TAO_ENCAP_BYTE_ORDER,
       stream.begin (),
       1,
@@ -295,7 +298,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_WStringSeq *
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equivalent (_tc_CORBA_WStringSeq, ACE_TRY_ENV)) // not equal
+    if (!type->equivalent (CORBA::_tc_WStringSeq, ACE_TRY_ENV)) // not equal
       {
         return 0;
       }
@@ -319,7 +322,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_WStringSeq *
       if (stream >> *tmp)
       {
         ((CORBA::Any *)&_tao_any)->_tao_replace (
-            _tc_CORBA_WStringSeq,
+            CORBA::_tc_WStringSeq,
             1,
             ACE_static_cast (void *, tmp),
             CORBA_WStringSeq::_tao_any_destructor
diff --git a/TAO/tao/StringSeqC.h b/TAO/tao/StringSeqC.h
index 7526afa8523..64f43fb52dd 100644
--- a/TAO/tao/StringSeqC.h
+++ b/TAO/tao/StringSeqC.h
@@ -161,9 +161,6 @@
 
 #endif /* end #if !defined */
 
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_CORBA_StringSeq;
-
-
 #if !defined (_CORBA_WSTRINGSEQ_CH_)
 #define _CORBA_WSTRINGSEQ_CH_
 
@@ -270,9 +267,6 @@
 
 #endif /* end #if !defined */
 
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_CORBA_WStringSeq;
-
-
 // Proxy Broker Factory function pointer declarations.
 
 TAO_Export void operator<<= (CORBA::Any &, const CORBA_StringSeq &); // copying version
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index 15db17f4a60..4a4396bbc57 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -479,10 +479,15 @@ TAO_NAMESPACE CORBA
   typedef ACE_CDR::LongDouble LongDouble;
   typedef LongDouble &LongDouble_out;
 
-
   typedef ACE_CDR::Char Char;
   typedef Char &Char_out;
 
+  // CORBA::TypeCode typedefs.
+  typedef CORBA_TypeCode TypeCode;
+  typedef CORBA_TypeCode *TypeCode_ptr;
+  typedef CORBA_TypeCode_var TypeCode_var;
+  typedef CORBA_TypeCode_out TypeCode_out;
+
   // = String memory management.
   TAO_NAMESPACE_INLINE_FUNCTION char *string_alloc (ULong len);
   TAO_NAMESPACE_STORAGE_CLASS  char *string_dup (const char *);
@@ -505,19 +510,21 @@ TAO_NAMESPACE CORBA
   typedef CORBA_WString_out WString_out;
 
   /// String sequence typedefs
-
   typedef CORBA_StringSeq StringSeq;
   typedef CORBA_StringSeq_var StringSeq_var;
   typedef CORBA_StringSeq_out StringSeq_out;
+  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_StringSeq;
 
   typedef CORBA_WStringSeq WStringSeq;
   typedef CORBA_WStringSeq_var WStringSeq_var;
   typedef CORBA_WStringSeq_out WStringSeq_out;
+  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_WStringSeq;
 
   /// Octet sequence typedef
   typedef CORBA_OctetSeq OctetSeq;
   typedef CORBA_OctetSeq_var OctetSeq_var;
   typedef CORBA_OctetSeq_out OctetSeq_out;
+  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_OctetSeq;
 
 //   typedef TAO_Unbounded_Sequence<Octet> OctetSeq;
 //   typedef TAO_Unbounded_Sequence<Octet> OctetSeq_var;
@@ -586,11 +593,6 @@ TAO_NAMESPACE CORBA
   typedef CORBA_ServerRequest ServerRequest;
   typedef ServerRequest *ServerRequest_ptr;
 
-  typedef CORBA_TypeCode TypeCode;
-  typedef CORBA_TypeCode *TypeCode_ptr;
-  typedef CORBA_TypeCode_var TypeCode_var;
-  typedef CORBA_TypeCode_out TypeCode_out;
-
   typedef CORBA_ExceptionList ExceptionList;
   typedef CORBA_ExceptionList_var ExceptionList_var;
   typedef CORBA_ExceptionList *ExceptionList_ptr;
diff --git a/TAO/tao/diffs/OctetSeq.diff b/TAO/tao/diffs/OctetSeq.diff
index 879efd75bd8..3841ebd382f 100644
--- a/TAO/tao/diffs/OctetSeq.diff
+++ b/TAO/tao/diffs/OctetSeq.diff
@@ -1,6 +1,6 @@
---- OctetSeqC.h.old	Fri Mar  2 23:18:33 2001
-+++ OctetSeqC.h	Fri Mar  2 23:45:11 2001
-@@ -19,17 +19,17 @@
+--- OctetSeqC.h.old	Sat Mar  3 11:32:55 2001
++++ OctetSeqC.h	Sat Mar  3 11:33:44 2001
+@@ -19,16 +19,17 @@
  // Information about TAO is available at:
  //     http://www.cs.wustl.edu/~schmidt/TAO.html
  
@@ -17,12 +17,11 @@
  # pragma once
  #endif /* ACE_LACKS_PRAGMA_ONCE */
  
--#include "corbafwd.h"
 +#include "Sequence.h"
  
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
-@@ -54,20 +54,17 @@
+@@ -53,20 +54,17 @@
  #pragma option push -w-rvl -w-rch -w-ccc -w-inl
  #endif /* __BORLANDC__ */
  
@@ -47,7 +46,7 @@
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
      TAO_Unbounded_Sequence<CORBA::Octet>
  #else /* TAO_USE_SEQUENCE_TEMPLATES */
-@@ -75,25 +72,25 @@
+@@ -74,25 +72,25 @@
  #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
    {
    public:
@@ -80,7 +79,7 @@
          CORBA::ULong length,
          const ACE_Message_Block* mb
        )
-@@ -112,37 +109,37 @@
+@@ -111,37 +109,37 @@
    // class CORBA::OctetSeq_var
    // *************************************************************
  
@@ -138,7 +137,7 @@
    };
  
  
-@@ -152,40 +149,37 @@
+@@ -151,40 +149,34 @@
  #if !defined (_CORBA_OCTETSEQ___OUT_CH_)
  #define _CORBA_OCTETSEQ___OUT_CH_
  
@@ -177,11 +176,10 @@
  
 -  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_OctetSeq;
 -
-+  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_CORBA_OctetSeq;
- 
+-
 -}
 -TAO_NAMESPACE_CLOSE // module CORBA
- 
+-
  // Proxy Broker Factory function pointer declarations.
  
 -TAO_Export void operator<<= (CORBA::Any &, const CORBA::OctetSeq &); // copying version
@@ -195,7 +193,7 @@
  
  #ifndef __ACE_INLINE__
  
-@@ -195,11 +189,11 @@
+@@ -194,11 +186,11 @@
  
  TAO_Export CORBA::Boolean operator<< (
      TAO_OutputCDR &,
@@ -209,8 +207,8 @@
    );
  
  #endif /* _TAO_CDR_OP_CORBA_OctetSeq_H_ */
---- OctetSeqC.i.old	Fri Mar  2 23:18:33 2001
-+++ OctetSeqC.i	Fri Mar  2 23:45:57 2001
+--- OctetSeqC.i.old	Sat Mar  3 11:32:55 2001
++++ OctetSeqC.i	Sat Mar  3 11:33:52 2001
 @@ -28,47 +28,47 @@
  // *************************************************************
  
@@ -492,8 +490,8 @@
    );
  
  #endif /* _TAO_CDR_OP_CORBA_OctetSeq_I_ */
---- OctetSeqC.cpp.old	Fri Mar  2 23:18:33 2001
-+++ OctetSeqC.cpp	Fri Mar  2 23:46:06 2001
+--- OctetSeqC.cpp.old	Sat Mar  3 11:32:55 2001
++++ OctetSeqC.cpp	Sat Mar  3 11:34:02 2001
 @@ -21,10 +21,6 @@
  
  #include "OctetSeqC.h"
@@ -511,11 +509,11 @@
  
 +#include "Any.h"
 +#include "CDR.h"
-+#include "TypeCode.h"
++#include "Typecode.h"
  
  #if !defined (_CORBA_OCTETSEQ_CS_)
  #define _CORBA_OCTETSEQ_CS_
-@@ -41,9 +40,9 @@
+@@ -41,40 +40,40 @@
  // CORBA::OctetSeq
  // *************************************************************
  
@@ -523,30 +521,39 @@
 +CORBA_OctetSeq::CORBA_OctetSeq (void)
  {}
 -CORBA::OctetSeq::OctetSeq (CORBA::ULong max) // uses max size
+-  : 
 +CORBA_OctetSeq::CORBA_OctetSeq (CORBA::ULong max) // uses max size
-   : 
++  :
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    TAO_Unbounded_Sequence<CORBA::Octet>
-@@ -52,7 +51,7 @@
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+   TAO_Unbounded_Sequence<CORBA::Octet>
+-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   (max)
  {}
 -CORBA::OctetSeq::OctetSeq (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
+-  : 
 +CORBA_OctetSeq::CORBA_OctetSeq (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
-   : 
++  :
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    TAO_Unbounded_Sequence<CORBA::Octet>
-@@ -61,7 +60,7 @@
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+   TAO_Unbounded_Sequence<CORBA::Octet>
+-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   (max, length, buffer, release)
  {}
 -CORBA::OctetSeq::OctetSeq (const OctetSeq &seq) // copy ctor
+-  : 
 +CORBA_OctetSeq::CORBA_OctetSeq (const CORBA_OctetSeq &seq) // copy ctor
-   : 
++  :
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    TAO_Unbounded_Sequence<CORBA::Octet>
-@@ -70,11 +69,11 @@
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+   TAO_Unbounded_Sequence<CORBA::Octet>
+-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   (seq)
  {}
 -CORBA::OctetSeq::~OctetSeq (void) // dtor
@@ -560,17 +567,16 @@
    delete tmp;
  }
  
-@@ -94,56 +93,55 @@
+@@ -94,14 +93,15 @@
      0U,
  
  };
 -static CORBA::TypeCode _tc_TAO_tc_CORBA_OctetSeq (CORBA::tk_alias, sizeof (_oc_CORBA_OctetSeq), (char *) &_oc_CORBA_OctetSeq, 0, sizeof (CORBA::OctetSeq));
 +static CORBA::TypeCode _tc_TAO_tc_CORBA_OctetSeq (CORBA::tk_alias, sizeof (_oc_CORBA_OctetSeq), (char *) &_oc_CORBA_OctetSeq, 0, sizeof (CORBA_OctetSeq));
  TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
--TAO_NAMESPACE_BEGIN (CORBA)
--TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_OctetSeq, &_tc_TAO_tc_CORBA_OctetSeq)
--TAO_NAMESPACE_END
-+TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_CORBA_OctetSeq, &_tc_TAO_tc_CORBA_OctetSeq)
+ TAO_NAMESPACE_BEGIN (CORBA)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_OctetSeq, &_tc_TAO_tc_CORBA_OctetSeq)
+ TAO_NAMESPACE_END
 +
  void operator<<= (
      CORBA::Any &_tao_any,
@@ -579,14 +585,7 @@
    ) // copying
  {
    TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-   {
-     _tao_any._tao_replace (
--        CORBA::_tc_OctetSeq,
-+        _tc_CORBA_OctetSeq,
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin ()
-       );
+@@ -115,7 +115,7 @@
    }
  }
  
@@ -595,10 +594,7 @@
  {
    TAO_OutputCDR stream;
    stream << *_tao_elem;
-   _tao_any._tao_replace (
--      CORBA::_tc_OctetSeq,
-+      _tc_CORBA_OctetSeq,
-       TAO_ENCAP_BYTE_ORDER,
+@@ -125,19 +125,19 @@
        stream.begin (),
        1,
        _tao_elem,
@@ -622,14 +618,7 @@
  {
    _tao_elem = 0;
    ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    if (!type->equivalent (CORBA::_tc_OctetSeq, ACE_TRY_ENV)) // not equal
-+    if (!type->equivalent (_tc_CORBA_OctetSeq, ACE_TRY_ENV)) // not equal
-       {
-         return 0;
-       }
-@@ -151,15 +149,15 @@
+@@ -151,15 +151,15 @@
      if (_tao_any.any_owns_data ())
      {
        _tao_elem = ACE_static_cast(
@@ -648,12 +637,8 @@
        TAO_InputCDR stream (
            _tao_any._tao_get_cdr (),
            _tao_any._tao_byte_order ()
-@@ -167,10 +165,10 @@
-       if (stream >> *tmp)
-       {
-         ((CORBA::Any *)&_tao_any)->_tao_replace (
--            CORBA::_tc_OctetSeq,
-+            _tc_CORBA_OctetSeq,
+@@ -170,7 +170,7 @@
+             CORBA::_tc_OctetSeq,
              1,
              ACE_static_cast (void *, tmp),
 -            CORBA::OctetSeq::_tao_any_destructor
@@ -661,7 +646,7 @@
            );
          _tao_elem = tmp;
          return 1;
-@@ -190,7 +188,7 @@
+@@ -190,26 +190,26 @@
  
  CORBA::Boolean operator<< (
      TAO_OutputCDR &strm,
@@ -670,16 +655,31 @@
    )
  {
    if (strm << _tao_sequence.length ())
-@@ -200,7 +198,7 @@
+   {
+     // encode all elements
+-    
++
  #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
      {
-       TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
 -        ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (CORBA::OctetSeq *)&_tao_sequence);
++      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
 +        ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (CORBA_OctetSeq *)&_tao_sequence);
        if (oseq->mb ())
          return strm.write_octet_array_mb (oseq->mb ());
        else
-@@ -217,7 +215,7 @@
+         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
+@@ -217,7 +217,7 @@
  
  CORBA::Boolean operator>> (
      TAO_InputCDR &strm,
@@ -688,3 +688,36 @@
    )
  {
    CORBA::ULong _tao_seq_len;
+@@ -226,14 +226,14 @@
+     // set the length of the sequence
+     _tao_sequence.length (_tao_seq_len);
+     // If length is 0 we return true.
+-    if (0 >= _tao_seq_len) 
++    if (0 >= _tao_seq_len)
+       return 1;
+     // retrieve all the elements
+-    
++
+ #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+     if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE))
+     {
+-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
++      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
+         ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
+       oseq->replace (_tao_seq_len, strm.start ());
+       oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
+@@ -242,12 +242,11 @@
+     }
+     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
+ }
+-
diff --git a/TAO/tao/diffs/StringSeq.diff b/TAO/tao/diffs/StringSeq.diff
index 262faba9b2a..b1a11be744e 100644
--- a/TAO/tao/diffs/StringSeq.diff
+++ b/TAO/tao/diffs/StringSeq.diff
@@ -1,5 +1,5 @@
 --- StringSeqC.h.old	Fri Mar  2 23:51:36 2001
-+++ StringSeqC.h	Fri Mar  2 23:51:58 2001
++++ StringSeqC.h	Sat Mar  3 11:28:11 2001
 @@ -19,17 +19,18 @@
  // Information about TAO is available at:
  //     http://www.cs.wustl.edu/~schmidt/TAO.html
@@ -130,7 +130,7 @@
    };
  
  
-@@ -141,42 +139,42 @@
+@@ -141,42 +139,39 @@
  #if !defined (_CORBA_STRINGSEQ___OUT_CH_)
  #define _CORBA_STRINGSEQ___OUT_CH_
  
@@ -168,9 +168,8 @@
  #endif /* end #if !defined */
  
 -  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_StringSeq;
-+  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_CORBA_StringSeq;
- 
- 
+-
+-
  #if !defined (_CORBA_WSTRINGSEQ_CH_)
  #define _CORBA_WSTRINGSEQ_CH_
  
@@ -189,7 +188,7 @@
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
      TAO_Unbounded_WString_Sequence
  #else /* TAO_USE_SEQUENCE_TEMPLATES */
-@@ -184,20 +182,20 @@
+@@ -184,20 +179,20 @@
  #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
    {
    public:
@@ -216,7 +215,7 @@
  #endif /* ! __GNUC__ || g++ >= 2.8 */
  
    };
-@@ -209,38 +207,38 @@
+@@ -209,38 +204,38 @@
  #define _CORBA_WSTRINGSEQ___VAR_CH_
  
    // *************************************************************
@@ -275,7 +274,7 @@
    };
  
  
-@@ -250,44 +248,41 @@
+@@ -250,44 +245,38 @@
  #if !defined (_CORBA_WSTRINGSEQ___OUT_CH_)
  #define _CORBA_WSTRINGSEQ___OUT_CH_
  
@@ -314,11 +313,10 @@
  
 -  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_WStringSeq;
 -
-+  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_CORBA_WStringSeq;
- 
+-
 -}
 -TAO_NAMESPACE_CLOSE // module CORBA
- 
+-
  // Proxy Broker Factory function pointer declarations.
  
 -TAO_Export void operator<<= (CORBA::Any &, const CORBA::StringSeq &); // copying version
@@ -340,7 +338,7 @@
  
  #ifndef __ACE_INLINE__
  
-@@ -297,11 +292,11 @@
+@@ -297,11 +286,11 @@
  
  TAO_Export CORBA::Boolean operator<< (
      TAO_OutputCDR &,
@@ -354,7 +352,7 @@
    );
  
  #endif /* _TAO_CDR_OP_CORBA_StringSeq_H_ */
-@@ -312,11 +307,11 @@
+@@ -312,11 +301,11 @@
  
  TAO_Export CORBA::Boolean operator<< (
      TAO_OutputCDR &,
@@ -369,7 +367,7 @@
  
  #endif /* _TAO_CDR_OP_CORBA_WStringSeq_H_ */
 --- StringSeqC.i.old	Fri Mar  2 23:51:36 2001
-+++ StringSeqC.i	Fri Mar  2 23:52:06 2001
++++ StringSeqC.i	Sat Mar  3 11:28:19 2001
 @@ -28,40 +28,40 @@
  // *************************************************************
  
@@ -869,7 +867,7 @@
  
  #endif /* _TAO_CDR_OP_CORBA_WStringSeq_I_ */
 --- StringSeqC.cpp.old	Fri Mar  2 23:51:36 2001
-+++ StringSeqC.cpp	Fri Mar  2 23:52:13 2001
++++ StringSeqC.cpp	Sat Mar  3 11:28:29 2001
 @@ -21,10 +21,6 @@
  
  #include "StringSeqC.h"
@@ -887,11 +885,11 @@
  
 +#include "Any.h"
 +#include "CDR.h"
-+#include "TypeCode.h"
++#include "Typecode.h"
  
  #if !defined (_CORBA_STRINGSEQ_CS_)
  #define _CORBA_STRINGSEQ_CS_
-@@ -41,9 +40,9 @@
+@@ -41,40 +40,40 @@
  // CORBA::StringSeq
  // *************************************************************
  
@@ -899,30 +897,39 @@
 +CORBA_StringSeq::CORBA_StringSeq (void)
  {}
 -CORBA::StringSeq::StringSeq (CORBA::ULong max) // uses max size
+-  : 
 +CORBA_StringSeq::CORBA_StringSeq (CORBA::ULong max) // uses max size
-   : 
++  :
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    TAO_Unbounded_String_Sequence
-@@ -52,7 +51,7 @@
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+   TAO_Unbounded_String_Sequence
+-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   (max)
  {}
 -CORBA::StringSeq::StringSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
+-  : 
 +CORBA_StringSeq::CORBA_StringSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
-   : 
++  :
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    TAO_Unbounded_String_Sequence
-@@ -61,7 +60,7 @@
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+   TAO_Unbounded_String_Sequence
+-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   (max, length, buffer, release)
  {}
 -CORBA::StringSeq::StringSeq (const StringSeq &seq) // copy ctor
+-  : 
 +CORBA_StringSeq::CORBA_StringSeq (const CORBA_StringSeq &seq) // copy ctor
-   : 
++  :
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    TAO_Unbounded_String_Sequence
-@@ -70,11 +69,11 @@
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+   TAO_Unbounded_String_Sequence
+-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   (seq)
  {}
 -CORBA::StringSeq::~StringSeq (void) // dtor
@@ -936,22 +943,22 @@
    delete tmp;
  }
  
-@@ -94,11 +93,10 @@
+@@ -89,12 +88,12 @@
+   CORBA::tk_sequence, // typecode kind
+   16, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+-    CORBA::tk_string, 
++    CORBA::tk_string,
+     0U, // string length
      0U,
  
  };
 -static CORBA::TypeCode _tc_TAO_tc_CORBA_StringSeq (CORBA::tk_alias, sizeof (_oc_CORBA_StringSeq), (char *) &_oc_CORBA_StringSeq, 0, sizeof (CORBA::StringSeq));
 +static CORBA::TypeCode _tc_TAO_tc_CORBA_StringSeq (CORBA::tk_alias, sizeof (_oc_CORBA_StringSeq), (char *) &_oc_CORBA_StringSeq, 0, sizeof (CORBA_StringSeq));
  TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
--TAO_NAMESPACE_BEGIN (CORBA)
--TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StringSeq, &_tc_TAO_tc_CORBA_StringSeq)
--TAO_NAMESPACE_END
-+TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_CORBA_StringSeq, &_tc_TAO_tc_CORBA_StringSeq)
-+
- 
- #if !defined (_CORBA_WSTRINGSEQ_CS_)
- #define _CORBA_WSTRINGSEQ_CS_
-@@ -107,9 +105,9 @@
+ TAO_NAMESPACE_BEGIN (CORBA)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StringSeq, &_tc_TAO_tc_CORBA_StringSeq)
+@@ -107,40 +106,40 @@
  // CORBA::WStringSeq
  // *************************************************************
  
@@ -959,30 +966,39 @@
 +CORBA_WStringSeq::CORBA_WStringSeq (void)
  {}
 -CORBA::WStringSeq::WStringSeq (CORBA::ULong max) // uses max size
+-  : 
 +CORBA_WStringSeq::CORBA_WStringSeq (CORBA::ULong max) // uses max size
-   : 
++  :
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    TAO_Unbounded_WString_Sequence
-@@ -118,7 +116,7 @@
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+   TAO_Unbounded_WString_Sequence
+-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   (max)
  {}
 -CORBA::WStringSeq::WStringSeq (CORBA::ULong max, CORBA::ULong length, CORBA::WChar * *buffer, CORBA::Boolean release)
+-  : 
 +CORBA_WStringSeq::CORBA_WStringSeq (CORBA::ULong max, CORBA::ULong length, CORBA::WChar * *buffer, CORBA::Boolean release)
-   : 
++  :
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    TAO_Unbounded_WString_Sequence
-@@ -127,7 +125,7 @@
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+   TAO_Unbounded_WString_Sequence
+-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   (max, length, buffer, release)
  {}
 -CORBA::WStringSeq::WStringSeq (const WStringSeq &seq) // copy ctor
+-  : 
 +CORBA_WStringSeq::CORBA_WStringSeq (const CORBA_WStringSeq &seq) // copy ctor
-   : 
++  :
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    TAO_Unbounded_WString_Sequence
-@@ -136,11 +134,11 @@
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+   TAO_Unbounded_WString_Sequence
+-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   (seq)
  {}
 -CORBA::WStringSeq::~WStringSeq (void) // dtor
@@ -996,17 +1012,22 @@
    delete tmp;
  }
  
-@@ -160,56 +158,55 @@
+@@ -155,19 +154,20 @@
+   CORBA::tk_sequence, // typecode kind
+   16, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+-    CORBA::tk_wstring, 
++    CORBA::tk_wstring,
+     0U, // string length
      0U,
  
  };
 -static CORBA::TypeCode _tc_TAO_tc_CORBA_WStringSeq (CORBA::tk_alias, sizeof (_oc_CORBA_WStringSeq), (char *) &_oc_CORBA_WStringSeq, 0, sizeof (CORBA::WStringSeq));
 +static CORBA::TypeCode _tc_TAO_tc_CORBA_WStringSeq (CORBA::tk_alias, sizeof (_oc_CORBA_WStringSeq), (char *) &_oc_CORBA_WStringSeq, 0, sizeof (CORBA_WStringSeq));
  TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
--TAO_NAMESPACE_BEGIN (CORBA)
--TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_WStringSeq, &_tc_TAO_tc_CORBA_WStringSeq)
--TAO_NAMESPACE_END
-+TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_CORBA_WStringSeq, &_tc_TAO_tc_CORBA_WStringSeq)
+ TAO_NAMESPACE_BEGIN (CORBA)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_WStringSeq, &_tc_TAO_tc_CORBA_WStringSeq)
+ TAO_NAMESPACE_END
 +
  void operator<<= (
      CORBA::Any &_tao_any,
@@ -1015,14 +1036,7 @@
    ) // copying
  {
    TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-   {
-     _tao_any._tao_replace (
--        CORBA::_tc_StringSeq,
-+        _tc_CORBA_StringSeq,
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin ()
-       );
+@@ -181,7 +181,7 @@
    }
  }
  
@@ -1031,10 +1045,7 @@
  {
    TAO_OutputCDR stream;
    stream << *_tao_elem;
-   _tao_any._tao_replace (
--      CORBA::_tc_StringSeq,
-+      _tc_CORBA_StringSeq,
-       TAO_ENCAP_BYTE_ORDER,
+@@ -191,19 +191,19 @@
        stream.begin (),
        1,
        _tao_elem,
@@ -1058,14 +1069,7 @@
  {
    _tao_elem = 0;
    ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    if (!type->equivalent (CORBA::_tc_StringSeq, ACE_TRY_ENV)) // not equal
-+    if (!type->equivalent (_tc_CORBA_StringSeq, ACE_TRY_ENV)) // not equal
-       {
-         return 0;
-       }
-@@ -217,15 +214,15 @@
+@@ -217,15 +217,15 @@
      if (_tao_any.any_owns_data ())
      {
        _tao_elem = ACE_static_cast(
@@ -1084,12 +1088,8 @@
        TAO_InputCDR stream (
            _tao_any._tao_get_cdr (),
            _tao_any._tao_byte_order ()
-@@ -233,10 +230,10 @@
-       if (stream >> *tmp)
-       {
-         ((CORBA::Any *)&_tao_any)->_tao_replace (
--            CORBA::_tc_StringSeq,
-+            _tc_CORBA_StringSeq,
+@@ -236,7 +236,7 @@
+             CORBA::_tc_StringSeq,
              1,
              ACE_static_cast (void *, tmp),
 -            CORBA::StringSeq::_tao_any_destructor
@@ -1097,7 +1097,7 @@
            );
          _tao_elem = tmp;
          return 1;
-@@ -256,49 +253,49 @@
+@@ -256,7 +256,7 @@
  
  void operator<<= (
      CORBA::Any &_tao_any,
@@ -1106,14 +1106,7 @@
    ) // copying
  {
    TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-   {
-     _tao_any._tao_replace (
--        CORBA::_tc_WStringSeq,
-+        _tc_CORBA_WStringSeq,
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin ()
-       );
+@@ -270,7 +270,7 @@
    }
  }
  
@@ -1122,10 +1115,7 @@
  {
    TAO_OutputCDR stream;
    stream << *_tao_elem;
-   _tao_any._tao_replace (
--      CORBA::_tc_WStringSeq,
-+      _tc_CORBA_WStringSeq,
-       TAO_ENCAP_BYTE_ORDER,
+@@ -280,19 +280,19 @@
        stream.begin (),
        1,
        _tao_elem,
@@ -1149,14 +1139,7 @@
  {
    _tao_elem = 0;
    ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    if (!type->equivalent (CORBA::_tc_WStringSeq, ACE_TRY_ENV)) // not equal
-+    if (!type->equivalent (_tc_CORBA_WStringSeq, ACE_TRY_ENV)) // not equal
-       {
-         return 0;
-       }
-@@ -306,15 +303,15 @@
+@@ -306,15 +306,15 @@
      if (_tao_any.any_owns_data ())
      {
        _tao_elem = ACE_static_cast(
@@ -1175,12 +1158,8 @@
        TAO_InputCDR stream (
            _tao_any._tao_get_cdr (),
            _tao_any._tao_byte_order ()
-@@ -322,10 +319,10 @@
-       if (stream >> *tmp)
-       {
-         ((CORBA::Any *)&_tao_any)->_tao_replace (
--            CORBA::_tc_WStringSeq,
-+            _tc_CORBA_WStringSeq,
+@@ -325,7 +325,7 @@
+             CORBA::_tc_WStringSeq,
              1,
              ACE_static_cast (void *, tmp),
 -            CORBA::WStringSeq::_tao_any_destructor
@@ -1188,7 +1167,7 @@
            );
          _tao_elem = tmp;
          return 1;
-@@ -345,7 +342,7 @@
+@@ -345,7 +345,7 @@
  
  CORBA::Boolean operator<< (
      TAO_OutputCDR &strm,
@@ -1197,7 +1176,7 @@
    )
  {
    if (strm << _tao_sequence.length ())
-@@ -363,7 +360,7 @@
+@@ -363,7 +363,7 @@
  
  CORBA::Boolean operator>> (
      TAO_InputCDR &strm,
@@ -1206,7 +1185,16 @@
    )
  {
    CORBA::ULong _tao_seq_len;
-@@ -387,7 +384,7 @@
+@@ -372,7 +372,7 @@
+     // set the length of the sequence
+     _tao_sequence.length (_tao_seq_len);
+     // If length is 0 we return true.
+-    if (0 >= _tao_seq_len) 
++    if (0 >= _tao_seq_len)
+       return 1;
+     // retrieve all the elements
+     CORBA::Boolean _tao_marshal_flag = 1;
+@@ -387,7 +387,7 @@
  
  CORBA::Boolean operator<< (
      TAO_OutputCDR &strm,
@@ -1215,7 +1203,7 @@
    )
  {
    if (strm << _tao_sequence.length ())
-@@ -405,7 +402,7 @@
+@@ -405,7 +405,7 @@
  
  CORBA::Boolean operator>> (
      TAO_InputCDR &strm,
@@ -1224,3 +1212,17 @@
    )
  {
    CORBA::ULong _tao_seq_len;
+@@ -414,7 +414,7 @@
+     // set the length of the sequence
+     _tao_sequence.length (_tao_seq_len);
+     // If length is 0 we return true.
+-    if (0 >= _tao_seq_len) 
++    if (0 >= _tao_seq_len)
+       return 1;
+     // retrieve all the elements
+     CORBA::Boolean _tao_marshal_flag = 1;
+@@ -426,4 +426,3 @@
+   }
+   return 0; // error
+ }
+-