1 files changed, 11 insertions, 56 deletions
diff --git a/TAO/tao/WStringSeqC.cpp b/TAO/tao/WStringSeqC.cpp
index 1021460a5e3..8a6b8ad0bdd 100644
--- a/TAO/tao/WStringSeqC.cpp
+++ b/TAO/tao/WStringSeqC.cpp
@@ -29,19 +29,21 @@
 // be\be_codegen.cpp:277
 
 
-#include "WStringSeqC.h"
+#include "tao/WStringSeqC.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_WSTRINGSEQ_CS_)
@@ -53,7 +55,7 @@ CORBA::WStringSeq::WStringSeq (void)
 CORBA::WStringSeq::WStringSeq (
     ::CORBA::ULong max
   )
-  : TAO_Unbounded_WString_Sequence
+  : TAO::unbounded_wstring_sequence
     (max)
 {}
 
@@ -63,14 +65,14 @@ CORBA::WStringSeq::WStringSeq (
     ::CORBA::WChar * * buffer,
     ::CORBA::Boolean release
   )
-  : TAO_Unbounded_WString_Sequence
+  : TAO::unbounded_wstring_sequence
     (max, length, buffer, release)
 {}
 
 CORBA::WStringSeq::WStringSeq (
     const WStringSeq &seq
   )
-  : TAO_Unbounded_WString_Sequence
+  : TAO::unbounded_wstring_sequence
     (seq)
 {}
 
@@ -99,22 +101,7 @@ void CORBA::WStringSeq::_tao_any_destructor (
     const CORBA::WStringSeq &_tao_sequence
   )
 {
-  const ::CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      ::CORBA::Boolean _tao_marshal_flag = true;
-      
-      for ( ::CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
+  return TAO::marshal_sequence(strm, _tao_sequence);
 }
 
 ::CORBA::Boolean operator>> (
@@ -122,41 +109,9 @@ void CORBA::WStringSeq::_tao_any_destructor (
     CORBA::WStringSeq &_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.
-      ::CORBA::Boolean _tao_marshal_flag = true;
-      
-      for ( ::CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        
-      }
-    
-    return _tao_marshal_flag;
-  
-  }
-
-return false;
+  return TAO::demarshal_sequence(strm, _tao_sequence);
 }
 
 #endif /* _TAO_CDR_OP_CORBA_WStringSeq_CPP_ */
+
+TAO_END_VERSIONED_NAMESPACE_DECL