1 files changed, 11 insertions, 41 deletions
diff --git a/TAO/tao/WCharSeqC.cpp b/TAO/tao/WCharSeqC.cpp
index 7ea50940e52..7d9e6cff8ce 100644
--- a/TAO/tao/WCharSeqC.cpp
+++ b/TAO/tao/WCharSeqC.cpp
@@ -29,19 +29,21 @@
 // be\be_codegen.cpp:277
 
 
-#include "WCharSeqC.h"
+#include "tao/WCharSeqC.h"
 #include "tao/CDR.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Arg traits specializations.
 namespace TAO
 {
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_WCHARSEQ_CS_)
@@ -53,7 +55,7 @@ CORBA::WCharSeq::WCharSeq (void)
 CORBA::WCharSeq::WCharSeq (
     ::CORBA::ULong max
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::WChar
       >
     (max)
@@ -65,7 +67,7 @@ CORBA::WCharSeq::WCharSeq (
     ::CORBA::WChar * buffer,
     ::CORBA::Boolean release
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::WChar
       >
     (max, length, buffer, release)
@@ -74,7 +76,7 @@ CORBA::WCharSeq::WCharSeq (
 CORBA::WCharSeq::WCharSeq (
     const WCharSeq &seq
   )
-  : TAO_Unbounded_Sequence<
+  : TAO::unbounded_value_sequence<
         CORBA::WChar
       >
     (seq)
@@ -105,15 +107,7 @@ void CORBA::WCharSeq::_tao_any_destructor (
     const CORBA::WCharSeq &_tao_sequence
   )
 {
-  const ::CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      return strm.write_wchar_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 ::CORBA::Boolean operator>> (
@@ -121,33 +115,9 @@ void CORBA::WCharSeq::_tao_any_destructor (
     CORBA::WCharSeq &_tao_sequence
   )
 {
-  ::CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // 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 true;
-        }
-      
-      // Retrieve all the elements.
-      return strm.read_wchar_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-    }
-  
-  return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_WCharSeq_CPP_ */
+
+TAO_END_VERSIONED_NAMESPACE_DECL