ChangeLogTag:Fri Mar 02 23:54:41 2001 Ossama Othman <ossama@uci.edu>

3 files changed, 558 insertions, 721 deletions

diff --git a/TAO/tao/diffs/IOP.diff b/TAO/tao/diffs/IOP.diff
index ee716db57cb..f9924c9f401 100644
--- a/TAO/tao/diffs/IOP.diff
+++ b/TAO/tao/diffs/IOP.diff
@@ -1,71 +1,45 @@
---- IOPC.h.old	Sun Sep 24 17:32:44 2000
-+++ IOPC.h	Sun Sep 24 19:47:04 2000
-@@ -21,17 +21,18 @@
- 
- #ifndef _TAO_IDL_IOPC_H_
+--- IOPC.h.old	Fri Feb 23 15:57:27 2001
++++ IOPC.h	Fri Feb 23 18:22:02 2001
+@@ -23,13 +23,18 @@
  #define _TAO_IDL_IOPC_H_
  
  #include "ace/pre.h"
 -#include "tao/corba.h"
-+#include "tao/TAO_Export.h"
++
++#include "TAO_Export.h"
  
  #if !defined (ACE_LACKS_PRAGMA_ONCE)
  # pragma once
  #endif /* ACE_LACKS_PRAGMA_ONCE */
  
--#include "tao/TAO_Export.h"
-+#include "tao/CDR.h"
-+#include "tao/Sequence.h"
+-#include "TAO_Export.h"
++#include "Any.h"
++#include "Object.h"
++#include "Exception.h"
++#include "CDR.h"
++#include "Sequence.h"
  
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
- #endif
- #define TAO_EXPORT_MACRO TAO_Export
---- IOPS.h.old	Sun Sep 24 17:32:44 2000
-+++ IOPS.h	Sun Sep 24 19:47:08 2000
-@@ -28,14 +28,10 @@
+--- IOPC.cpp.old	Fri Feb 23 15:57:27 2001
++++ IOPC.cpp	Fri Feb 23 18:22:02 2001
+@@ -21,10 +21,6 @@
  
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
- #endif /* ACE_LACKS_PRAGMA_ONCE */
+ #include "IOPC.h"
  
--#include "tao/PortableServer/PortableServer.h"
--#include "tao/PortableServer/Servant_Base.h"
--#include "tao/PortableServer/Collocated_Object.h"
+-#if TAO_HAS_INTERCEPTORS == 1
+-#include "tao/RequestInfo_Util.h"
+-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
 -
- #if defined(_MSC_VER)
- #if (_MSC_VER >= 1200)
- #pragma warning(push)
- #endif /* _MSC_VER >= 1200 */
- #pragma warning(disable:4250)
---- IOPC.cpp.old	Sun Sep 24 17:32:44 2000
-+++ IOPC.cpp	Sun Sep 24 19:47:04 2000
-@@ -23,10 +23,13 @@
- 
+ #if defined (__BORLANDC__)
+ #pragma option -w-rvl -w-rch -w-ccc -w-aus
+ #endif /* __BORLANDC__ */
+@@ -32,6 +28,8 @@
  #if !defined (__ACE_INLINE__)
  #include "IOPC.i"
  #endif /* !defined INLINE */
- 
-+#include "tao/Any.h"
-+#include "tao/Typecode.h"
 +
++#include "Typecode.h"
+ 
  static const CORBA::Long _oc_IOP_ProfileId[] =
  {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
-   10, ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x64000000),  // name = ProfileId
---- IOPS.cpp.old	Sun Sep 24 17:32:44 2000
-+++ IOPS.cpp	Sun Sep 24 19:47:08 2000
-@@ -18,12 +18,10 @@
- //
- // Information about TAO is available at:
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
- 
- #include "IOPS.h"
--#include "tao/PortableServer/Object_Adapter.h"
--#include "tao/PortableServer/Operation_Table.h"
- 
- #if !defined (__ACE_INLINE__)
- #include "IOPS.i"
- #endif /* !defined INLINE */
- 
diff --git a/TAO/tao/diffs/OctetSeq.diff b/TAO/tao/diffs/OctetSeq.diff
index 88fd4f3df72..879efd75bd8 100644
--- a/TAO/tao/diffs/OctetSeq.diff
+++ b/TAO/tao/diffs/OctetSeq.diff
@@ -1,5 +1,5 @@
---- OctetSeqC.h.old	Fri Feb 23 22:46:34 2001
-+++ OctetSeqC.h	Fri Feb 23 22:50:56 2001
+--- OctetSeqC.h.old	Fri Mar  2 23:18:33 2001
++++ OctetSeqC.h	Fri Mar  2 23:45:11 2001
 @@ -19,17 +19,17 @@
  // Information about TAO is available at:
  //     http://www.cs.wustl.edu/~schmidt/TAO.html
@@ -209,8 +209,8 @@
    );
  
  #endif /* _TAO_CDR_OP_CORBA_OctetSeq_H_ */
---- OctetSeqC.i.old	Fri Feb 23 22:46:34 2001
-+++ OctetSeqC.i	Fri Feb 23 23:05:00 2001
+--- OctetSeqC.i.old	Fri Mar  2 23:18:33 2001
++++ OctetSeqC.i	Fri Mar  2 23:45:57 2001
 @@ -28,47 +28,47 @@
  // *************************************************************
  
@@ -492,8 +492,8 @@
    );
  
  #endif /* _TAO_CDR_OP_CORBA_OctetSeq_I_ */
---- OctetSeqC.cpp.old	Fri Feb 23 22:46:34 2001
-+++ OctetSeqC.cpp	Fri Feb 23 23:14:35 2001
+--- OctetSeqC.cpp.old	Fri Mar  2 23:18:33 2001
++++ OctetSeqC.cpp	Fri Mar  2 23:46:06 2001
 @@ -21,10 +21,6 @@
  
  #include "OctetSeqC.h"
@@ -560,17 +560,18 @@
    delete tmp;
  }
  
-@@ -94,56 +93,53 @@
+@@ -94,56 +93,55 @@
      0U,
  
  };
 -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)
++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
-+static CORBA::TypeCode _tc_TAO_tc_CORBA_OctetSeq (CORBA::tk_alias, sizeof (_oc_CORBA_OctetSeq), (char *) &_oc_CORBA_OctetSeq, 0, sizeof (CORBA_OctetSeq));
-+CORBA::TypeCode_ptr _tc_CORBA_OctetSeq = &_tc_TAO_tc_CORBA_OctetSeq;
++TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_CORBA_OctetSeq, &_tc_TAO_tc_CORBA_OctetSeq)
++
  void operator<<= (
      CORBA::Any &_tao_any,
 -    const CORBA::OctetSeq &_tao_elem
@@ -628,7 +629,7 @@
        {
          return 0;
        }
-@@ -151,15 +147,15 @@
+@@ -151,15 +149,15 @@
      if (_tao_any.any_owns_data ())
      {
        _tao_elem = ACE_static_cast(
@@ -647,7 +648,7 @@
        TAO_InputCDR stream (
            _tao_any._tao_get_cdr (),
            _tao_any._tao_byte_order ()
-@@ -167,10 +163,10 @@
+@@ -167,10 +165,10 @@
        if (stream >> *tmp)
        {
          ((CORBA::Any *)&_tao_any)->_tao_replace (
@@ -660,7 +661,7 @@
            );
          _tao_elem = tmp;
          return 1;
-@@ -190,7 +186,7 @@
+@@ -190,7 +188,7 @@
  
  CORBA::Boolean operator<< (
      TAO_OutputCDR &strm,
@@ -669,7 +670,7 @@
    )
  {
    if (strm << _tao_sequence.length ())
-@@ -200,7 +196,7 @@
+@@ -200,7 +198,7 @@
  #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
      {
        TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
@@ -678,7 +679,7 @@
        if (oseq->mb ())
          return strm.write_octet_array_mb (oseq->mb ());
        else
-@@ -217,7 +213,7 @@
+@@ -217,7 +215,7 @@
  
  CORBA::Boolean operator>> (
      TAO_InputCDR &strm,
diff --git a/TAO/tao/diffs/StringSeq.diff b/TAO/tao/diffs/StringSeq.diff
index e6ac79964a3..262faba9b2a 100644
--- a/TAO/tao/diffs/StringSeq.diff
+++ b/TAO/tao/diffs/StringSeq.diff
@@ -1,383 +1,334 @@
---- StringSeqC.h.old	Tue Jan 16 17:48:05 2001
-+++ StringSeqC.h	Tue Jan 16 18:00:15 2001
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- StringSeqC.h.old	Fri Mar  2 23:51:36 2001
++++ StringSeqC.h	Fri Mar  2 23:51:58 2001
 @@ -19,17 +19,18 @@
  // Information about TAO is available at:
  //     http://www.cs.wustl.edu/~schmidt/TAO.html
  
 -#ifndef _TAO_IDL_STRINGSEQC_H_
 -#define _TAO_IDL_STRINGSEQC_H_
-+#ifndef TAO_IDL_STRINGSEQC_H
-+#define TAO_IDL_STRINGSEQC_H
++#ifndef _TAO_IDL_CORBA_STRINGSEQC_H_
++#define _TAO_IDL_CORBA_STRINGSEQC_H_
  
  #include "ace/pre.h"
 -#include "tao/corba.h"
 +
-+#include "tao/corbafwd.h"
++#include "corbafwd.h"
  
  #if !defined (ACE_LACKS_PRAGMA_ONCE)
  # pragma once
  #endif /* ACE_LACKS_PRAGMA_ONCE */
  
--#include "tao/corbafwd.h"
-+#include "tao/Sequence.h"
+-#include "corbafwd.h"
++#include "Sequence.h"
  
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
-@@ -55,38 +56,38 @@
+@@ -54,20 +55,17 @@
+ #pragma option push -w-rvl -w-rch -w-ccc -w-inl
  #endif /* __BORLANDC__ */
  
- 
--#if !defined (_STRINGSEQ_CH_)
--#define _STRINGSEQ_CH_
-+#if !defined (TAO_STRINGSEQ_CH)
-+#define TAO_STRINGSEQ_CH
- 
--class StringSeq;
--class StringSeq_var;
-+class CORBA_StringSeq;
-+class CORBA_StringSeq_var;
- 
- // *************************************************************
--// StringSeq
-+// CORBA_StringSeq
- // *************************************************************
- 
--class TAO_Export StringSeq : public 
-+class TAO_Export CORBA_StringSeq : public
+-TAO_NAMESPACE  CORBA
+-{
+-
+ #if !defined (_CORBA_STRINGSEQ_CH_)
+ #define _CORBA_STRINGSEQ_CH_
+ 
+-  class StringSeq;
+-  class StringSeq_var;
++  class CORBA_StringSeq;
++  class CORBA_StringSeq_var;
+   
+   // *************************************************************
+-  // StringSeq
++  // CORBA::StringSeq
+   // *************************************************************
+   
+-  class TAO_Export StringSeq : public 
++  class TAO_Export CORBA_StringSeq : public 
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   TAO_Unbounded_String_Sequence
+     TAO_Unbounded_String_Sequence
  #else /* TAO_USE_SEQUENCE_TEMPLATES */
-   TAO_Unbounded_String_Sequence
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- {
- public:
--  StringSeq (void); // default ctor
--  StringSeq (CORBA::ULong max); // uses max size
--  StringSeq (
--    CORBA::ULong max, 
--    CORBA::ULong length, 
--    char * *buffer, 
-+  CORBA_StringSeq (void); // default ctor
-+  CORBA_StringSeq (CORBA::ULong max); // uses max size
-+  CORBA_StringSeq (
-+    CORBA::ULong max,
-+    CORBA::ULong length,
-+    char * *buffer,
-     CORBA::Boolean release = 0
-   );
--  StringSeq (const StringSeq &); // copy ctor
--  ~StringSeq (void);
-+  CORBA_StringSeq (const CORBA_StringSeq &); // copy ctor
-+  ~CORBA_StringSeq (void);
-   static void _tao_any_destructor (void*);
+@@ -75,20 +73,20 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+   {
+   public:
+-    StringSeq (void); // default ctor
+-    StringSeq (CORBA::ULong max); // uses max size
+-    StringSeq (
++    CORBA_StringSeq (void); // default ctor
++    CORBA_StringSeq (CORBA::ULong max); // uses max size
++    CORBA_StringSeq (
+       CORBA::ULong max, 
+       CORBA::ULong length, 
+       char * *buffer, 
+       CORBA::Boolean release = 0
+     );
+-    StringSeq (const StringSeq &); // copy ctor
+-    ~StringSeq (void);
++    CORBA_StringSeq (const CORBA_StringSeq &); // copy ctor
++    ~CORBA_StringSeq (void);
+     static void _tao_any_destructor (void*);
  
  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef StringSeq_var _var_type;
-+  typedef CORBA_StringSeq_var _var_type;
+-    typedef StringSeq_var _var_type;
++    typedef CORBA_StringSeq_var _var_type;
  #endif /* ! __GNUC__ || g++ >= 2.8 */
  
- };
-@@ -94,108 +95,108 @@
- #endif /* end #if !defined */
- 
+   };
+@@ -103,35 +101,35 @@
+   // class CORBA::StringSeq_var
+   // *************************************************************
  
--#if !defined (_STRINGSEQ___VAR_CH_)
--#define _STRINGSEQ___VAR_CH_
-+#if !defined (TAO_STRINGSEQ___VAR_CH)
-+#define TAO_STRINGSEQ___VAR_CH
- 
- // *************************************************************
--// class StringSeq_var
-+// class CORBA_StringSeq_var
- // *************************************************************
- 
--class TAO_Export StringSeq_var
-+class TAO_Export CORBA_StringSeq_var
- {
- public:
--  StringSeq_var (void); // default constructor
--  StringSeq_var (StringSeq *);
--  StringSeq_var (const StringSeq_var &); // copy constructor
--  ~StringSeq_var (void); // destructor
--  
--  StringSeq_var &operator= (StringSeq *);
--  StringSeq_var &operator= (const StringSeq_var &);
--  StringSeq *operator-> (void);
--  const StringSeq *operator-> (void) const;
--  
--  operator const StringSeq &() const;
--  operator StringSeq &();
--  operator StringSeq &() const;
--  operator StringSeq *&(); // variable-size base types only
--  
-+  CORBA_StringSeq_var (void); // default constructor
-+  CORBA_StringSeq_var (CORBA_StringSeq *);
-+  CORBA_StringSeq_var (const CORBA_StringSeq_var &); // copy constructor
-+  ~CORBA_StringSeq_var (void); // destructor
-+
-+  CORBA_StringSeq_var &operator= (CORBA_StringSeq *);
-+  CORBA_StringSeq_var &operator= (const CORBA_StringSeq_var &);
-+  CORBA_StringSeq *operator-> (void);
-+  const CORBA_StringSeq *operator-> (void) const;
-+
-+  operator const CORBA_StringSeq &() const;
-+  operator CORBA_StringSeq &();
-+  operator CORBA_StringSeq &() const;
-+  operator CORBA_StringSeq *&(); // variable-size base types only
-+
-   TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
--  
--  // in, inout, out, _retn 
--  const StringSeq &in (void) const;
--  StringSeq &inout (void);
--  StringSeq *&out (void);
--  StringSeq *_retn (void);
--  StringSeq *ptr (void) const;
-+
-+  // in, inout, out, _retn
-+  const CORBA_StringSeq &in (void) const;
-+  CORBA_StringSeq &inout (void);
-+  CORBA_StringSeq *&out (void);
-+  CORBA_StringSeq *_retn (void);
-+  CORBA_StringSeq *ptr (void) const;
- 
- private:
--  StringSeq *ptr_;
-+  CORBA_StringSeq *ptr_;
- };
- 
- 
- #endif /* end #if !defined */
- 
- 
--#if !defined (_STRINGSEQ___OUT_CH_)
--#define _STRINGSEQ___OUT_CH_
-+#if !defined (TAO_STRINGSEQ___OUT_CH)
-+#define TAO_STRINGSEQ___OUT_CH
- 
--class TAO_Export StringSeq_out
-+class TAO_Export CORBA_StringSeq_out
- {
- public:
--  StringSeq_out (StringSeq *&);
--  StringSeq_out (StringSeq_var &);
--  StringSeq_out (const StringSeq_out &);
--  StringSeq_out &operator= (const StringSeq_out &);
--  StringSeq_out &operator= (StringSeq *);
--  operator StringSeq *&();
--  StringSeq *&ptr (void);
--  StringSeq *operator-> (void);
-+  CORBA_StringSeq_out (CORBA_StringSeq *&);
-+  CORBA_StringSeq_out (CORBA_StringSeq_var &);
-+  CORBA_StringSeq_out (const CORBA_StringSeq_out &);
-+  CORBA_StringSeq_out &operator= (const CORBA_StringSeq_out &);
-+  CORBA_StringSeq_out &operator= (CORBA_StringSeq *);
-+  operator CORBA_StringSeq *&();
-+  CORBA_StringSeq *&ptr (void);
-+  CORBA_StringSeq *operator-> (void);
-   TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
--  
-+
- private:
--  StringSeq *&ptr_;
-+  CORBA_StringSeq *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const StringSeq_var &);
-+  void operator= (const CORBA_StringSeq_var &);
- };
+-  class TAO_Export StringSeq_var
++  class TAO_Export CORBA_StringSeq_var
+   {
+   public:
+-    StringSeq_var (void); // default constructor
+-    StringSeq_var (StringSeq *);
+-    StringSeq_var (const StringSeq_var &); // copy constructor
+-    ~StringSeq_var (void); // destructor
++    CORBA_StringSeq_var (void); // default constructor
++    CORBA_StringSeq_var (CORBA_StringSeq *);
++    CORBA_StringSeq_var (const CORBA_StringSeq_var &); // copy constructor
++    ~CORBA_StringSeq_var (void); // destructor
+     
+-    StringSeq_var &operator= (StringSeq *);
+-    StringSeq_var &operator= (const StringSeq_var &);
+-    StringSeq *operator-> (void);
+-    const StringSeq *operator-> (void) const;
++    CORBA_StringSeq_var &operator= (CORBA_StringSeq *);
++    CORBA_StringSeq_var &operator= (const CORBA_StringSeq_var &);
++    CORBA_StringSeq *operator-> (void);
++    const CORBA_StringSeq *operator-> (void) const;
+     
+-    operator const StringSeq &() const;
+-    operator StringSeq &();
+-    operator StringSeq &() const;
+-    operator StringSeq *&(); // variable-size base types only
++    operator const CORBA_StringSeq &() const;
++    operator CORBA_StringSeq &();
++    operator CORBA_StringSeq &() const;
++    operator CORBA_StringSeq *&(); // variable-size base types only
+     
+     TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
+     
+     // in, inout, out, _retn 
+-    const StringSeq &in (void) const;
+-    StringSeq &inout (void);
+-    StringSeq *&out (void);
+-    StringSeq *_retn (void);
+-    StringSeq *ptr (void) const;
++    const CORBA_StringSeq &in (void) const;
++    CORBA_StringSeq &inout (void);
++    CORBA_StringSeq *&out (void);
++    CORBA_StringSeq *_retn (void);
++    CORBA_StringSeq *ptr (void) const;
+ 
+   private:
+-    StringSeq *ptr_;
++    CORBA_StringSeq *ptr_;
+   };
+ 
+ 
+@@ -141,42 +139,42 @@
+ #if !defined (_CORBA_STRINGSEQ___OUT_CH_)
+ #define _CORBA_STRINGSEQ___OUT_CH_
+ 
+-  class TAO_Export StringSeq_out
++  class TAO_Export CORBA_StringSeq_out
+   {
+   public:
+-    StringSeq_out (StringSeq *&);
+-    StringSeq_out (StringSeq_var &);
+-    StringSeq_out (const StringSeq_out &);
+-    StringSeq_out &operator= (const StringSeq_out &);
+-    StringSeq_out &operator= (StringSeq *);
+-    operator StringSeq *&();
+-    StringSeq *&ptr (void);
+-    StringSeq *operator-> (void);
++    CORBA_StringSeq_out (CORBA_StringSeq *&);
++    CORBA_StringSeq_out (CORBA_StringSeq_var &);
++    CORBA_StringSeq_out (const CORBA_StringSeq_out &);
++    CORBA_StringSeq_out &operator= (const CORBA_StringSeq_out &);
++    CORBA_StringSeq_out &operator= (CORBA_StringSeq *);
++    operator CORBA_StringSeq *&();
++    CORBA_StringSeq *&ptr (void);
++    CORBA_StringSeq *operator-> (void);
+     TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
+     
+   private:
+-    StringSeq *&ptr_;
++    CORBA_StringSeq *&ptr_;
+     // assignment from T_var not allowed
+-    void operator= (const StringSeq_var &);
++    void operator= (const CORBA_StringSeq_var &);
+   };
  
  
  #endif /* end #if !defined */
  
--extern TAO_Export CORBA::TypeCode_ptr  _tc_StringSeq;
-+extern TAO_Export CORBA::TypeCode_ptr  _tc_CORBA_StringSeq;
- 
- 
--#if !defined (_WSTRINGSEQ_CH_)
--#define _WSTRINGSEQ_CH_
-+#if !defined (TAO_WSTRINGSEQ_CH)
-+#define TAO_WSTRINGSEQ_CH
- 
--class WStringSeq;
--class WStringSeq_var;
-+class CORBA_WStringSeq;
-+class CORBA_WStringSeq_var;
- 
- // *************************************************************
--// WStringSeq
-+// CORBA_WStringSeq
- // *************************************************************
- 
--class TAO_Export WStringSeq : public 
-+class TAO_Export CORBA_WStringSeq : public
+-  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_
+ 
+-  class WStringSeq;
+-  class WStringSeq_var;
++  class CORBA_WStringSeq;
++  class CORBA_WStringSeq_var;
+   
+   // *************************************************************
+-  // WStringSeq
++  // CORBA::WStringSeq
+   // *************************************************************
+   
+-  class TAO_Export WStringSeq : public 
++  class TAO_Export CORBA_WStringSeq : public 
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   TAO_Unbounded_WString_Sequence
+     TAO_Unbounded_WString_Sequence
  #else /* TAO_USE_SEQUENCE_TEMPLATES */
-   TAO_Unbounded_WString_Sequence
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- {
- public:
--  WStringSeq (void); // default ctor
--  WStringSeq (CORBA::ULong max); // uses max size
--  WStringSeq (
--    CORBA::ULong max, 
--    CORBA::ULong length, 
--    CORBA::WChar * *buffer, 
-+  CORBA_WStringSeq (void); // default ctor
-+  CORBA_WStringSeq (CORBA::ULong max); // uses max size
-+  CORBA_WStringSeq (
-+    CORBA::ULong max,
-+    CORBA::ULong length,
-+    CORBA::WChar * *buffer,
-     CORBA::Boolean release = 0
-   );
--  WStringSeq (const WStringSeq &); // copy ctor
--  ~WStringSeq (void);
-+  CORBA_WStringSeq (const CORBA_WStringSeq &); // copy ctor
-+  ~CORBA_WStringSeq (void);
-   static void _tao_any_destructor (void*);
+@@ -184,20 +182,20 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+   {
+   public:
+-    WStringSeq (void); // default ctor
+-    WStringSeq (CORBA::ULong max); // uses max size
+-    WStringSeq (
++    CORBA_WStringSeq (void); // default ctor
++    CORBA_WStringSeq (CORBA::ULong max); // uses max size
++    CORBA_WStringSeq (
+       CORBA::ULong max, 
+       CORBA::ULong length, 
+       CORBA::WChar * *buffer, 
+       CORBA::Boolean release = 0
+     );
+-    WStringSeq (const WStringSeq &); // copy ctor
+-    ~WStringSeq (void);
++    CORBA_WStringSeq (const CORBA_WStringSeq &); // copy ctor
++    ~CORBA_WStringSeq (void);
+     static void _tao_any_destructor (void*);
  
  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef WStringSeq_var _var_type;
-+  typedef CORBA_WStringSeq_var _var_type;
+-    typedef WStringSeq_var _var_type;
++    typedef CORBA_WStringSeq_var _var_type;
  #endif /* ! __GNUC__ || g++ >= 2.8 */
  
- };
-@@ -203,117 +204,115 @@
- #endif /* end #if !defined */
+   };
+@@ -209,38 +207,38 @@
+ #define _CORBA_WSTRINGSEQ___VAR_CH_
  
+   // *************************************************************
+-  // class CORBA::WStringSeq_var
++  // class CORBA_WStringSeq_var
+   // *************************************************************
  
--#if !defined (_WSTRINGSEQ___VAR_CH_)
--#define _WSTRINGSEQ___VAR_CH_
-+#if !defined (TAO_WSTRINGSEQ___VAR_CH)
-+#define TAO_WSTRINGSEQ___VAR_CH
- 
- // *************************************************************
--// class WStringSeq_var
-+// class CORBA_WStringSeq_var
- // *************************************************************
- 
--class TAO_Export WStringSeq_var
-+class TAO_Export CORBA_WStringSeq_var
- {
- public:
--  WStringSeq_var (void); // default constructor
--  WStringSeq_var (WStringSeq *);
--  WStringSeq_var (const WStringSeq_var &); // copy constructor
--  ~WStringSeq_var (void); // destructor
--  
--  WStringSeq_var &operator= (WStringSeq *);
--  WStringSeq_var &operator= (const WStringSeq_var &);
--  WStringSeq *operator-> (void);
--  const WStringSeq *operator-> (void) const;
--  
--  operator const WStringSeq &() const;
--  operator WStringSeq &();
--  operator WStringSeq &() const;
--  operator WStringSeq *&(); // variable-size base types only
--  
-+  CORBA_WStringSeq_var (void); // default constructor
-+  CORBA_WStringSeq_var (CORBA_WStringSeq *);
-+  CORBA_WStringSeq_var (const CORBA_WStringSeq_var &); // copy constructor
-+  ~CORBA_WStringSeq_var (void); // destructor
-+
-+  CORBA_WStringSeq_var &operator= (CORBA_WStringSeq *);
-+  CORBA_WStringSeq_var &operator= (const CORBA_WStringSeq_var &);
-+  CORBA_WStringSeq *operator-> (void);
-+  const CORBA_WStringSeq *operator-> (void) const;
-+
-+  operator const CORBA_WStringSeq &() const;
-+  operator CORBA_WStringSeq &();
-+  operator CORBA_WStringSeq &() const;
-+  operator CORBA_WStringSeq *&(); // variable-size base types only
-+
-   TAO_SeqElem_WString_Manager operator[] (CORBA::ULong index);
--  
--  // in, inout, out, _retn 
--  const WStringSeq &in (void) const;
--  WStringSeq &inout (void);
--  WStringSeq *&out (void);
--  WStringSeq *_retn (void);
--  WStringSeq *ptr (void) const;
-+
-+  // in, inout, out, _retn
-+  const CORBA_WStringSeq &in (void) const;
-+  CORBA_WStringSeq &inout (void);
-+  CORBA_WStringSeq *&out (void);
-+  CORBA_WStringSeq *_retn (void);
-+  CORBA_WStringSeq *ptr (void) const;
- 
- private:
--  WStringSeq *ptr_;
-+  CORBA_WStringSeq *ptr_;
- };
+-  class TAO_Export WStringSeq_var
++  class TAO_Export CORBA_WStringSeq_var
+   {
+   public:
+-    WStringSeq_var (void); // default constructor
+-    WStringSeq_var (WStringSeq *);
+-    WStringSeq_var (const WStringSeq_var &); // copy constructor
+-    ~WStringSeq_var (void); // destructor
++    CORBA_WStringSeq_var (void); // default constructor
++    CORBA_WStringSeq_var (CORBA_WStringSeq *);
++    CORBA_WStringSeq_var (const CORBA_WStringSeq_var &); // copy constructor
++    ~CORBA_WStringSeq_var (void); // destructor
+     
+-    WStringSeq_var &operator= (WStringSeq *);
+-    WStringSeq_var &operator= (const WStringSeq_var &);
+-    WStringSeq *operator-> (void);
+-    const WStringSeq *operator-> (void) const;
++    CORBA_WStringSeq_var &operator= (CORBA_WStringSeq *);
++    CORBA_WStringSeq_var &operator= (const CORBA_WStringSeq_var &);
++    CORBA_WStringSeq *operator-> (void);
++    const CORBA_WStringSeq *operator-> (void) const;
+     
+-    operator const WStringSeq &() const;
+-    operator WStringSeq &();
+-    operator WStringSeq &() const;
+-    operator WStringSeq *&(); // variable-size base types only
++    operator const CORBA_WStringSeq &() const;
++    operator CORBA_WStringSeq &();
++    operator CORBA_WStringSeq &() const;
++    operator CORBA_WStringSeq *&(); // variable-size base types only
+     
+     TAO_SeqElem_WString_Manager operator[] (CORBA::ULong index);
+     
+     // in, inout, out, _retn 
+-    const WStringSeq &in (void) const;
+-    WStringSeq &inout (void);
+-    WStringSeq *&out (void);
+-    WStringSeq *_retn (void);
+-    WStringSeq *ptr (void) const;
++    const CORBA_WStringSeq &in (void) const;
++    CORBA_WStringSeq &inout (void);
++    CORBA_WStringSeq *&out (void);
++    CORBA_WStringSeq *_retn (void);
++    CORBA_WStringSeq *ptr (void) const;
+ 
+   private:
+-    WStringSeq *ptr_;
++    CORBA_WStringSeq *ptr_;
+   };
+ 
+ 
+@@ -250,44 +248,41 @@
+ #if !defined (_CORBA_WSTRINGSEQ___OUT_CH_)
+ #define _CORBA_WSTRINGSEQ___OUT_CH_
+ 
+-  class TAO_Export WStringSeq_out
++  class TAO_Export CORBA_WStringSeq_out
+   {
+   public:
+-    WStringSeq_out (WStringSeq *&);
+-    WStringSeq_out (WStringSeq_var &);
+-    WStringSeq_out (const WStringSeq_out &);
+-    WStringSeq_out &operator= (const WStringSeq_out &);
+-    WStringSeq_out &operator= (WStringSeq *);
+-    operator WStringSeq *&();
+-    WStringSeq *&ptr (void);
+-    WStringSeq *operator-> (void);
++    CORBA_WStringSeq_out (CORBA_WStringSeq *&);
++    CORBA_WStringSeq_out (CORBA_WStringSeq_var &);
++    CORBA_WStringSeq_out (const CORBA_WStringSeq_out &);
++    CORBA_WStringSeq_out &operator= (const CORBA_WStringSeq_out &);
++    CORBA_WStringSeq_out &operator= (CORBA_WStringSeq *);
++    operator CORBA_WStringSeq *&();
++    CORBA_WStringSeq *&ptr (void);
++    CORBA_WStringSeq *operator-> (void);
+     TAO_SeqElem_WString_Manager operator[] (CORBA::ULong index);
+     
+   private:
+-    WStringSeq *&ptr_;
++    CORBA_WStringSeq *&ptr_;
+     // assignment from T_var not allowed
+-    void operator= (const WStringSeq_var &);
++    void operator= (const CORBA_WStringSeq_var &);
+   };
  
  
  #endif /* end #if !defined */
  
+-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_WStringSeq;
+-
++  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_CORBA_WStringSeq;
  
--#if !defined (_WSTRINGSEQ___OUT_CH_)
--#define _WSTRINGSEQ___OUT_CH_
-+#if !defined (TAO_WSTRINGSEQ___OUT_CH)
-+#define TAO_WSTRINGSEQ___OUT_CH
- 
--class TAO_Export WStringSeq_out
-+class TAO_Export CORBA_WStringSeq_out
- {
- public:
--  WStringSeq_out (WStringSeq *&);
--  WStringSeq_out (WStringSeq_var &);
--  WStringSeq_out (const WStringSeq_out &);
--  WStringSeq_out &operator= (const WStringSeq_out &);
--  WStringSeq_out &operator= (WStringSeq *);
--  operator WStringSeq *&();
--  WStringSeq *&ptr (void);
--  WStringSeq *operator-> (void);
-+  CORBA_WStringSeq_out (CORBA_WStringSeq *&);
-+  CORBA_WStringSeq_out (CORBA_WStringSeq_var &);
-+  CORBA_WStringSeq_out (const CORBA_WStringSeq_out &);
-+  CORBA_WStringSeq_out &operator= (const CORBA_WStringSeq_out &);
-+  CORBA_WStringSeq_out &operator= (CORBA_WStringSeq *);
-+  operator CORBA_WStringSeq *&();
-+  CORBA_WStringSeq *&ptr (void);
-+  CORBA_WStringSeq *operator-> (void);
-   TAO_SeqElem_WString_Manager operator[] (CORBA::ULong index);
--  
-+
- private:
--  WStringSeq *&ptr_;
-+  CORBA_WStringSeq *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const WStringSeq_var &);
-+  void operator= (const CORBA_WStringSeq_var &);
- };
- 
+-}
+-TAO_NAMESPACE_CLOSE // module CORBA
  
- #endif /* end #if !defined */
+ // Proxy Broker Factory function pointer declarations.
  
--extern TAO_Export CORBA::TypeCode_ptr  _tc_WStringSeq;
--
--// Proxy Broker Factory function pointer declarations.
-+extern TAO_Export CORBA::TypeCode_ptr  _tc_CORBA_WStringSeq;
- 
--TAO_Export void operator<<= (CORBA::Any &, const StringSeq &); // copying version
--TAO_Export void operator<<= (CORBA::Any &, StringSeq*); // noncopying version
--TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, StringSeq *&); // deprecated
--TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const StringSeq *&);
--TAO_Export void operator<<= (CORBA::Any &, const WStringSeq &); // copying version
--TAO_Export void operator<<= (CORBA::Any &, WStringSeq*); // noncopying version
--TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, WStringSeq *&); // deprecated
--TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const WStringSeq *&);
+-TAO_Export void operator<<= (CORBA::Any &, const CORBA::StringSeq &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, CORBA::StringSeq*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::StringSeq *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::StringSeq *&);
+-TAO_Export void operator<<= (CORBA::Any &, const CORBA::WStringSeq &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, CORBA::WStringSeq*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WStringSeq *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WStringSeq *&);
 +TAO_Export void operator<<= (CORBA::Any &, const CORBA_StringSeq &); // copying version
 +TAO_Export void operator<<= (CORBA::Any &, CORBA_StringSeq*); // noncopying version
 +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_StringSeq *&); // deprecated
@@ -389,104 +340,71 @@
  
  #ifndef __ACE_INLINE__
  
- 
--#if !defined _TAO_CDR_OP_StringSeq_H_
--#define _TAO_CDR_OP_StringSeq_H_
-+#if !defined TAO_TAO_CDR_OP_CORBA_StringSeq_H
-+#define TAO_TAO_CDR_OP_CORBA_StringSeq_H
+@@ -297,11 +292,11 @@
  
  TAO_Export CORBA::Boolean operator<< (
      TAO_OutputCDR &,
--    const StringSeq &
+-    const CORBA::StringSeq &
 +    const CORBA_StringSeq &
    );
  TAO_Export CORBA::Boolean operator>> (
      TAO_InputCDR &,
--    StringSeq &
+-    CORBA::StringSeq &
 +    CORBA_StringSeq &
    );
  
--#endif /* _TAO_CDR_OP_StringSeq_H_ */
-+#endif /* TAO_TAO_CDR_OP_CORBA_StringSeq_H */
- 
- 
--#if !defined _TAO_CDR_OP_WStringSeq_H_
--#define _TAO_CDR_OP_WStringSeq_H_
-+#if !defined TAO_TAO_CDR_OP_CORBA_WStringSeq_H
-+#define TAO_TAO_CDR_OP_CORBA_WStringSeq_H
+ #endif /* _TAO_CDR_OP_CORBA_StringSeq_H_ */
+@@ -312,11 +307,11 @@
  
  TAO_Export CORBA::Boolean operator<< (
      TAO_OutputCDR &,
--    const WStringSeq &
+-    const CORBA::WStringSeq &
 +    const CORBA_WStringSeq &
    );
  TAO_Export CORBA::Boolean operator>> (
      TAO_InputCDR &,
--    WStringSeq &
+-    CORBA::WStringSeq &
 +    CORBA_WStringSeq &
    );
  
--#endif /* _TAO_CDR_OP_WStringSeq_H_ */
-+#endif /* TAO_TAO_CDR_OP_CORBA_WStringSeq_H */
- 
- 
- #endif /* __ACE_INLINE__ */
---- StringSeqC.i.old	Tue Jan 16 17:48:05 2001
-+++ StringSeqC.i	Tue Jan 16 17:03:27 2001
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -20,148 +20,148 @@
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
- 
- 
--#if !defined (_STRINGSEQ_CI_)
--#define _STRINGSEQ_CI_
-+#if !defined (TAO_STRINGSEQ_CI)
-+#define TAO_STRINGSEQ_CI
- 
- // *************************************************************
--// Inline operations for class StringSeq_var
-+// Inline operations for class CORBA_StringSeq_var
+ #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
+@@ -28,40 +28,40 @@
  // *************************************************************
  
  ACE_INLINE
--StringSeq_var::StringSeq_var (void) // default constructor
+-CORBA::StringSeq_var::StringSeq_var (void) // default constructor
 +CORBA_StringSeq_var::CORBA_StringSeq_var (void) // default constructor
    : ptr_ (0)
  {}
  
  ACE_INLINE
--StringSeq_var::StringSeq_var (StringSeq *p)
+-CORBA::StringSeq_var::StringSeq_var (StringSeq *p)
 +CORBA_StringSeq_var::CORBA_StringSeq_var (CORBA_StringSeq *p)
    : ptr_ (p)
  {}
  
  ACE_INLINE
--StringSeq_var::StringSeq_var (const ::StringSeq_var &p) // copy constructor
+-CORBA::StringSeq_var::StringSeq_var (const ::CORBA::StringSeq_var &p) // copy constructor
 +CORBA_StringSeq_var::CORBA_StringSeq_var (const ::CORBA_StringSeq_var &p) // copy constructor
  {
    if (p.ptr_)
--    ACE_NEW (this->ptr_, ::StringSeq (*p.ptr_));
+-    ACE_NEW (this->ptr_, ::CORBA::StringSeq (*p.ptr_));
 +    ACE_NEW (this->ptr_, ::CORBA_StringSeq (*p.ptr_));
    else
      this->ptr_ = 0;
  }
  
  ACE_INLINE
--StringSeq_var::~StringSeq_var (void) // destructor
+-CORBA::StringSeq_var::~StringSeq_var (void) // destructor
 +CORBA_StringSeq_var::~CORBA_StringSeq_var (void) // destructor
  {
    delete this->ptr_;
  }
  
--ACE_INLINE StringSeq_var &
--StringSeq_var::operator= (StringSeq *p)
+-ACE_INLINE CORBA::StringSeq_var &
+-CORBA::StringSeq_var::operator= (StringSeq *p)
 +ACE_INLINE CORBA_StringSeq_var &
 +CORBA_StringSeq_var::operator= (CORBA_StringSeq *p)
  {
@@ -495,30 +413,43 @@
    return *this;
  }
  
--ACE_INLINE StringSeq_var &
--StringSeq_var::operator= (const ::StringSeq_var &p) // deep copy
-+ACE_INLINE CORBA_StringSeq_var &
-+CORBA_StringSeq_var::operator= (const ::CORBA_StringSeq_var &p) // deep copy
+-ACE_INLINE ::CORBA::StringSeq_var &
+-CORBA::StringSeq_var::operator= (const ::CORBA::StringSeq_var &p)
++ACE_INLINE ::CORBA_StringSeq_var &
++CORBA_StringSeq_var::operator= (const ::CORBA_StringSeq_var &p)
  {
    if (this != &p)
-   {
-     delete this->ptr_;
--    ACE_NEW_RETURN (this->ptr_, ::StringSeq (*p.ptr_), *this);
-+    ACE_NEW_RETURN (this->ptr_, ::CORBA_StringSeq (*p.ptr_), *this);
-   }
+     {
+@@ -72,12 +72,12 @@
+         }
+       else
+         {
+-          StringSeq *deep_copy =
+-            new StringSeq (*p.ptr_);
++          CORBA_StringSeq *deep_copy =
++            new CORBA_StringSeq (*p.ptr_);
+           
+           if (deep_copy != 0)
+             {
+-              StringSeq *tmp = deep_copy;
++              CORBA_StringSeq *tmp = deep_copy;
+               deep_copy = this->ptr_;
+               this->ptr_ = tmp;
+               delete deep_copy;
+@@ -88,80 +88,80 @@
    return *this;
  }
  
--ACE_INLINE const ::StringSeq *
--StringSeq_var::operator-> (void) const
+-ACE_INLINE const ::CORBA::StringSeq *
+-CORBA::StringSeq_var::operator-> (void) const
 +ACE_INLINE const ::CORBA_StringSeq *
 +CORBA_StringSeq_var::operator-> (void) const
  {
    return this->ptr_;
  }
  
--ACE_INLINE ::StringSeq *
--StringSeq_var::operator-> (void)
+-ACE_INLINE ::CORBA::StringSeq *
+-CORBA::StringSeq_var::operator-> (void)
 +ACE_INLINE ::CORBA_StringSeq *
 +CORBA_StringSeq_var::operator-> (void)
  {
@@ -526,21 +457,21 @@
  }
  
  ACE_INLINE 
--StringSeq_var::operator const ::StringSeq &() const // cast
+-CORBA::StringSeq_var::operator const ::CORBA::StringSeq &() const // cast
 +CORBA_StringSeq_var::operator const ::CORBA_StringSeq &() const // cast
  {
    return *this->ptr_;
  }
  
  ACE_INLINE 
--StringSeq_var::operator ::StringSeq &() // cast 
+-CORBA::StringSeq_var::operator ::CORBA::StringSeq &() // cast 
 +CORBA_StringSeq_var::operator ::CORBA_StringSeq &() // cast 
  {
    return *this->ptr_;
  }
  
  ACE_INLINE 
--StringSeq_var::operator ::StringSeq &() const // cast 
+-CORBA::StringSeq_var::operator ::CORBA::StringSeq &() const // cast 
 +CORBA_StringSeq_var::operator ::CORBA_StringSeq &() const // cast 
  {
    return *this->ptr_;
@@ -548,29 +479,29 @@
  
  // variable-size types only
  ACE_INLINE
--StringSeq_var::operator ::StringSeq *&() // cast 
+-CORBA::StringSeq_var::operator ::CORBA::StringSeq *&() // cast 
 +CORBA_StringSeq_var::operator ::CORBA_StringSeq *&() // cast 
  {
    return this->ptr_;
  }
  
  ACE_INLINE TAO_SeqElem_String_Manager
--StringSeq_var::operator[] (CORBA::ULong index)
+-CORBA::StringSeq_var::operator[] (CORBA::ULong index)
 +CORBA_StringSeq_var::operator[] (CORBA::ULong index)
  {
    return this->ptr_->operator[] (index);
  }
  
--ACE_INLINE const ::StringSeq &
--StringSeq_var::in (void) const
+-ACE_INLINE const ::CORBA::StringSeq &
+-CORBA::StringSeq_var::in (void) const
 +ACE_INLINE const ::CORBA_StringSeq &
 +CORBA_StringSeq_var::in (void) const
  {
    return *this->ptr_;
  }
  
--ACE_INLINE ::StringSeq &
--StringSeq_var::inout (void)
+-ACE_INLINE ::CORBA::StringSeq &
+-CORBA::StringSeq_var::inout (void)
 +ACE_INLINE ::CORBA_StringSeq &
 +CORBA_StringSeq_var::inout (void)
  {
@@ -578,8 +509,8 @@
  }
  
  // mapping for variable size 
--ACE_INLINE ::StringSeq *&
--StringSeq_var::out (void)
+-ACE_INLINE ::CORBA::StringSeq *&
+-CORBA::StringSeq_var::out (void)
 +ACE_INLINE ::CORBA_StringSeq *&
 +CORBA_StringSeq_var::out (void)
  {
@@ -588,32 +519,29 @@
    return this->ptr_;
  }
  
--ACE_INLINE ::StringSeq *
--StringSeq_var::_retn (void)
+-ACE_INLINE ::CORBA::StringSeq *
+-CORBA::StringSeq_var::_retn (void)
 +ACE_INLINE ::CORBA_StringSeq *
 +CORBA_StringSeq_var::_retn (void)
  {
--  ::StringSeq *tmp = this->ptr_;
+-  ::CORBA::StringSeq *tmp = this->ptr_;
 +  ::CORBA_StringSeq *tmp = this->ptr_;
    this->ptr_ = 0;
    return tmp;
  }
  
--ACE_INLINE ::StringSeq *
--StringSeq_var::ptr (void) const
+-ACE_INLINE ::CORBA::StringSeq *
+-CORBA::StringSeq_var::ptr (void) const
 +ACE_INLINE ::CORBA_StringSeq *
 +CORBA_StringSeq_var::ptr (void) const
  {
    return this->ptr_;
  }
- 
- // *************************************************************
--// Inline operations for class StringSeq_out
-+// Inline operations for class CORBA_StringSeq_out
+@@ -171,14 +171,14 @@
  // *************************************************************
  
  ACE_INLINE
--StringSeq_out::StringSeq_out (StringSeq *&p)
+-CORBA::StringSeq_out::StringSeq_out (StringSeq *&p)
 +CORBA_StringSeq_out::CORBA_StringSeq_out (CORBA_StringSeq *&p)
    : ptr_ (p)
  {
@@ -621,23 +549,23 @@
  }
  
  ACE_INLINE
--StringSeq_out::StringSeq_out (StringSeq_var &p) // constructor from _var
+-CORBA::StringSeq_out::StringSeq_out (StringSeq_var &p) // constructor from _var
 +CORBA_StringSeq_out::CORBA_StringSeq_out (CORBA_StringSeq_var &p) // constructor from _var
    : ptr_ (p.out ())
  {
    delete this->ptr_;
-@@ -169,44 +169,44 @@
+@@ -186,44 +186,44 @@
  }
  
  ACE_INLINE
--StringSeq_out::StringSeq_out (const ::StringSeq_out &p) // copy constructor
+-CORBA::StringSeq_out::StringSeq_out (const ::CORBA::StringSeq_out &p) // copy constructor
 -  : ptr_ (ACE_const_cast (StringSeq_out&, p).ptr_)
 +CORBA_StringSeq_out::CORBA_StringSeq_out (const ::CORBA_StringSeq_out &p) // copy constructor
 +  : ptr_ (ACE_const_cast (CORBA_StringSeq_out&, p).ptr_)
  {}
  
--ACE_INLINE ::StringSeq_out &
--StringSeq_out::operator= (const ::StringSeq_out &p)
+-ACE_INLINE ::CORBA::StringSeq_out &
+-CORBA::StringSeq_out::operator= (const ::CORBA::StringSeq_out &p)
 +ACE_INLINE ::CORBA_StringSeq_out &
 +CORBA_StringSeq_out::operator= (const ::CORBA_StringSeq_out &p)
  {
@@ -646,8 +574,8 @@
    return *this;
  }
  
--ACE_INLINE ::StringSeq_out &
--StringSeq_out::operator= (StringSeq *p)
+-ACE_INLINE ::CORBA::StringSeq_out &
+-CORBA::StringSeq_out::operator= (StringSeq *p)
 +ACE_INLINE ::CORBA_StringSeq_out &
 +CORBA_StringSeq_out::operator= (CORBA_StringSeq *p)
  {
@@ -656,22 +584,22 @@
  }
  
  ACE_INLINE 
--StringSeq_out::operator ::StringSeq *&() // cast
+-CORBA::StringSeq_out::operator ::CORBA::StringSeq *&() // cast
 +CORBA_StringSeq_out::operator ::CORBA_StringSeq *&() // cast
  {
    return this->ptr_;
  }
  
--ACE_INLINE ::StringSeq *&
--StringSeq_out::ptr (void) // ptr
+-ACE_INLINE ::CORBA::StringSeq *&
+-CORBA::StringSeq_out::ptr (void) // ptr
 +ACE_INLINE ::CORBA_StringSeq *&
 +CORBA_StringSeq_out::ptr (void) // ptr
  {
    return this->ptr_;
  }
  
--ACE_INLINE ::StringSeq *
--StringSeq_out::operator-> (void)
+-ACE_INLINE ::CORBA::StringSeq *
+-CORBA::StringSeq_out::operator-> (void)
 +ACE_INLINE ::CORBA_StringSeq *
 +CORBA_StringSeq_out::operator-> (void)
  {
@@ -679,57 +607,46 @@
  }
  
  ACE_INLINE TAO_SeqElem_String_Manager
--StringSeq_out::operator[] (CORBA::ULong index)
+-CORBA::StringSeq_out::operator[] (CORBA::ULong index)
 +CORBA_StringSeq_out::operator[] (CORBA::ULong index)
  {
    return this->ptr_->operator[] (index);
  }
-@@ -215,148 +215,148 @@
- #endif /* end #if !defined */
- 
- 
--#if !defined (_WSTRINGSEQ_CI_)
--#define _WSTRINGSEQ_CI_
-+#if !defined (TAO_WSTRINGSEQ_CI)
-+#define TAO_WSTRINGSEQ_CI
- 
- // *************************************************************
--// Inline operations for class WStringSeq_var
-+// Inline operations for class CORBA_WStringSeq_var
+@@ -240,40 +240,40 @@
  // *************************************************************
  
  ACE_INLINE
--WStringSeq_var::WStringSeq_var (void) // default constructor
+-CORBA::WStringSeq_var::WStringSeq_var (void) // default constructor
 +CORBA_WStringSeq_var::CORBA_WStringSeq_var (void) // default constructor
    : ptr_ (0)
  {}
  
  ACE_INLINE
--WStringSeq_var::WStringSeq_var (WStringSeq *p)
+-CORBA::WStringSeq_var::WStringSeq_var (WStringSeq *p)
 +CORBA_WStringSeq_var::CORBA_WStringSeq_var (CORBA_WStringSeq *p)
    : ptr_ (p)
  {}
  
  ACE_INLINE
--WStringSeq_var::WStringSeq_var (const ::WStringSeq_var &p) // copy constructor
+-CORBA::WStringSeq_var::WStringSeq_var (const ::CORBA::WStringSeq_var &p) // copy constructor
 +CORBA_WStringSeq_var::CORBA_WStringSeq_var (const ::CORBA_WStringSeq_var &p) // copy constructor
  {
    if (p.ptr_)
--    ACE_NEW (this->ptr_, ::WStringSeq (*p.ptr_));
+-    ACE_NEW (this->ptr_, ::CORBA::WStringSeq (*p.ptr_));
 +    ACE_NEW (this->ptr_, ::CORBA_WStringSeq (*p.ptr_));
    else
      this->ptr_ = 0;
  }
  
  ACE_INLINE
--WStringSeq_var::~WStringSeq_var (void) // destructor
+-CORBA::WStringSeq_var::~WStringSeq_var (void) // destructor
 +CORBA_WStringSeq_var::~CORBA_WStringSeq_var (void) // destructor
  {
    delete this->ptr_;
  }
  
--ACE_INLINE WStringSeq_var &
--WStringSeq_var::operator= (WStringSeq *p)
+-ACE_INLINE CORBA::WStringSeq_var &
+-CORBA::WStringSeq_var::operator= (WStringSeq *p)
 +ACE_INLINE CORBA_WStringSeq_var &
 +CORBA_WStringSeq_var::operator= (CORBA_WStringSeq *p)
  {
@@ -738,30 +655,43 @@
    return *this;
  }
  
--ACE_INLINE WStringSeq_var &
--WStringSeq_var::operator= (const ::WStringSeq_var &p) // deep copy
-+ACE_INLINE CORBA_WStringSeq_var &
-+CORBA_WStringSeq_var::operator= (const ::CORBA_WStringSeq_var &p) // deep copy
+-ACE_INLINE ::CORBA::WStringSeq_var &
+-CORBA::WStringSeq_var::operator= (const ::CORBA::WStringSeq_var &p)
++ACE_INLINE ::CORBA_WStringSeq_var &
++CORBA_WStringSeq_var::operator= (const ::CORBA_WStringSeq_var &p)
  {
    if (this != &p)
-   {
-     delete this->ptr_;
--    ACE_NEW_RETURN (this->ptr_, ::WStringSeq (*p.ptr_), *this);
-+    ACE_NEW_RETURN (this->ptr_, ::CORBA_WStringSeq (*p.ptr_), *this);
-   }
+     {
+@@ -284,12 +284,12 @@
+         }
+       else
+         {
+-          WStringSeq *deep_copy =
+-            new WStringSeq (*p.ptr_);
++          CORBA_WStringSeq *deep_copy =
++            new CORBA_WStringSeq (*p.ptr_);
+           
+           if (deep_copy != 0)
+             {
+-              WStringSeq *tmp = deep_copy;
++              CORBA_WStringSeq *tmp = deep_copy;
+               deep_copy = this->ptr_;
+               this->ptr_ = tmp;
+               delete deep_copy;
+@@ -300,80 +300,80 @@
    return *this;
  }
  
--ACE_INLINE const ::WStringSeq *
--WStringSeq_var::operator-> (void) const
+-ACE_INLINE const ::CORBA::WStringSeq *
+-CORBA::WStringSeq_var::operator-> (void) const
 +ACE_INLINE const ::CORBA_WStringSeq *
 +CORBA_WStringSeq_var::operator-> (void) const
  {
    return this->ptr_;
  }
  
--ACE_INLINE ::WStringSeq *
--WStringSeq_var::operator-> (void)
+-ACE_INLINE ::CORBA::WStringSeq *
+-CORBA::WStringSeq_var::operator-> (void)
 +ACE_INLINE ::CORBA_WStringSeq *
 +CORBA_WStringSeq_var::operator-> (void)
  {
@@ -769,21 +699,21 @@
  }
  
  ACE_INLINE 
--WStringSeq_var::operator const ::WStringSeq &() const // cast
+-CORBA::WStringSeq_var::operator const ::CORBA::WStringSeq &() const // cast
 +CORBA_WStringSeq_var::operator const ::CORBA_WStringSeq &() const // cast
  {
    return *this->ptr_;
  }
  
  ACE_INLINE 
--WStringSeq_var::operator ::WStringSeq &() // cast 
+-CORBA::WStringSeq_var::operator ::CORBA::WStringSeq &() // cast 
 +CORBA_WStringSeq_var::operator ::CORBA_WStringSeq &() // cast 
  {
    return *this->ptr_;
  }
  
  ACE_INLINE 
--WStringSeq_var::operator ::WStringSeq &() const // cast 
+-CORBA::WStringSeq_var::operator ::CORBA::WStringSeq &() const // cast 
 +CORBA_WStringSeq_var::operator ::CORBA_WStringSeq &() const // cast 
  {
    return *this->ptr_;
@@ -791,29 +721,29 @@
  
  // variable-size types only
  ACE_INLINE
--WStringSeq_var::operator ::WStringSeq *&() // cast 
+-CORBA::WStringSeq_var::operator ::CORBA::WStringSeq *&() // cast 
 +CORBA_WStringSeq_var::operator ::CORBA_WStringSeq *&() // cast 
  {
    return this->ptr_;
  }
  
  ACE_INLINE TAO_SeqElem_WString_Manager
--WStringSeq_var::operator[] (CORBA::ULong index)
+-CORBA::WStringSeq_var::operator[] (CORBA::ULong index)
 +CORBA_WStringSeq_var::operator[] (CORBA::ULong index)
  {
    return this->ptr_->operator[] (index);
  }
  
--ACE_INLINE const ::WStringSeq &
--WStringSeq_var::in (void) const
+-ACE_INLINE const ::CORBA::WStringSeq &
+-CORBA::WStringSeq_var::in (void) const
 +ACE_INLINE const ::CORBA_WStringSeq &
 +CORBA_WStringSeq_var::in (void) const
  {
    return *this->ptr_;
  }
  
--ACE_INLINE ::WStringSeq &
--WStringSeq_var::inout (void)
+-ACE_INLINE ::CORBA::WStringSeq &
+-CORBA::WStringSeq_var::inout (void)
 +ACE_INLINE ::CORBA_WStringSeq &
 +CORBA_WStringSeq_var::inout (void)
  {
@@ -821,8 +751,8 @@
  }
  
  // mapping for variable size 
--ACE_INLINE ::WStringSeq *&
--WStringSeq_var::out (void)
+-ACE_INLINE ::CORBA::WStringSeq *&
+-CORBA::WStringSeq_var::out (void)
 +ACE_INLINE ::CORBA_WStringSeq *&
 +CORBA_WStringSeq_var::out (void)
  {
@@ -831,32 +761,29 @@
    return this->ptr_;
  }
  
--ACE_INLINE ::WStringSeq *
--WStringSeq_var::_retn (void)
+-ACE_INLINE ::CORBA::WStringSeq *
+-CORBA::WStringSeq_var::_retn (void)
 +ACE_INLINE ::CORBA_WStringSeq *
 +CORBA_WStringSeq_var::_retn (void)
  {
--  ::WStringSeq *tmp = this->ptr_;
+-  ::CORBA::WStringSeq *tmp = this->ptr_;
 +  ::CORBA_WStringSeq *tmp = this->ptr_;
    this->ptr_ = 0;
    return tmp;
  }
  
--ACE_INLINE ::WStringSeq *
--WStringSeq_var::ptr (void) const
+-ACE_INLINE ::CORBA::WStringSeq *
+-CORBA::WStringSeq_var::ptr (void) const
 +ACE_INLINE ::CORBA_WStringSeq *
 +CORBA_WStringSeq_var::ptr (void) const
  {
    return this->ptr_;
  }
- 
- // *************************************************************
--// Inline operations for class WStringSeq_out
-+// Inline operations for class CORBA_WStringSeq_out
+@@ -383,14 +383,14 @@
  // *************************************************************
  
  ACE_INLINE
--WStringSeq_out::WStringSeq_out (WStringSeq *&p)
+-CORBA::WStringSeq_out::WStringSeq_out (WStringSeq *&p)
 +CORBA_WStringSeq_out::CORBA_WStringSeq_out (CORBA_WStringSeq *&p)
    : ptr_ (p)
  {
@@ -864,23 +791,23 @@
  }
  
  ACE_INLINE
--WStringSeq_out::WStringSeq_out (WStringSeq_var &p) // constructor from _var
+-CORBA::WStringSeq_out::WStringSeq_out (WStringSeq_var &p) // constructor from _var
 +CORBA_WStringSeq_out::CORBA_WStringSeq_out (CORBA_WStringSeq_var &p) // constructor from _var
    : ptr_ (p.out ())
  {
    delete this->ptr_;
-@@ -364,44 +364,44 @@
+@@ -398,44 +398,44 @@
  }
  
  ACE_INLINE
--WStringSeq_out::WStringSeq_out (const ::WStringSeq_out &p) // copy constructor
+-CORBA::WStringSeq_out::WStringSeq_out (const ::CORBA::WStringSeq_out &p) // copy constructor
 -  : ptr_ (ACE_const_cast (WStringSeq_out&, p).ptr_)
 +CORBA_WStringSeq_out::CORBA_WStringSeq_out (const ::CORBA_WStringSeq_out &p) // copy constructor
 +  : ptr_ (ACE_const_cast (CORBA_WStringSeq_out&, p).ptr_)
  {}
  
--ACE_INLINE ::WStringSeq_out &
--WStringSeq_out::operator= (const ::WStringSeq_out &p)
+-ACE_INLINE ::CORBA::WStringSeq_out &
+-CORBA::WStringSeq_out::operator= (const ::CORBA::WStringSeq_out &p)
 +ACE_INLINE ::CORBA_WStringSeq_out &
 +CORBA_WStringSeq_out::operator= (const ::CORBA_WStringSeq_out &p)
  {
@@ -889,8 +816,8 @@
    return *this;
  }
  
--ACE_INLINE ::WStringSeq_out &
--WStringSeq_out::operator= (WStringSeq *p)
+-ACE_INLINE ::CORBA::WStringSeq_out &
+-CORBA::WStringSeq_out::operator= (WStringSeq *p)
 +ACE_INLINE ::CORBA_WStringSeq_out &
 +CORBA_WStringSeq_out::operator= (CORBA_WStringSeq *p)
  {
@@ -899,22 +826,22 @@
  }
  
  ACE_INLINE 
--WStringSeq_out::operator ::WStringSeq *&() // cast
+-CORBA::WStringSeq_out::operator ::CORBA::WStringSeq *&() // cast
 +CORBA_WStringSeq_out::operator ::CORBA_WStringSeq *&() // cast
  {
    return this->ptr_;
  }
  
--ACE_INLINE ::WStringSeq *&
--WStringSeq_out::ptr (void) // ptr
+-ACE_INLINE ::CORBA::WStringSeq *&
+-CORBA::WStringSeq_out::ptr (void) // ptr
 +ACE_INLINE ::CORBA_WStringSeq *&
 +CORBA_WStringSeq_out::ptr (void) // ptr
  {
    return this->ptr_;
  }
  
--ACE_INLINE ::WStringSeq *
--WStringSeq_out::operator-> (void)
+-ACE_INLINE ::CORBA::WStringSeq *
+-CORBA::WStringSeq_out::operator-> (void)
 +ACE_INLINE ::CORBA_WStringSeq *
 +CORBA_WStringSeq_out::operator-> (void)
  {
@@ -922,64 +849,27 @@
  }
  
  ACE_INLINE TAO_SeqElem_WString_Manager
--WStringSeq_out::operator[] (CORBA::ULong index)
+-CORBA::WStringSeq_out::operator[] (CORBA::ULong index)
 +CORBA_WStringSeq_out::operator[] (CORBA::ULong index)
  {
    return this->ptr_->operator[] (index);
  }
-@@ -410,32 +410,32 @@
- #endif /* end #if !defined */
- 
- 
--#if !defined _TAO_CDR_OP_StringSeq_I_
--#define _TAO_CDR_OP_StringSeq_I_
-+#if !defined TAO_TAO_CDR_OP_CORBA_StringSeq_I
-+#define TAO_TAO_CDR_OP_CORBA_StringSeq_I
+@@ -464,11 +464,11 @@
  
  CORBA::Boolean TAO_Export operator<< (
      TAO_OutputCDR &,
--    const StringSeq &
-+    const CORBA_StringSeq &
-   );
- CORBA::Boolean TAO_Export operator>> (
-     TAO_InputCDR &,
--    StringSeq &
-+    CORBA_StringSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_StringSeq_I_ */
-+#endif /* TAO_TAO_CDR_OP_CORBA_StringSeq_I */
- 
- 
--#if !defined _TAO_CDR_OP_WStringSeq_I_
--#define _TAO_CDR_OP_WStringSeq_I_
-+#if !defined TAO_TAO_CDR_OP_CORBA_WStringSeq_I
-+#define TAO_TAO_CDR_OP_CORBA_WStringSeq_I
- 
- CORBA::Boolean TAO_Export operator<< (
-     TAO_OutputCDR &,
--    const WStringSeq &
+-    const CORBA::WStringSeq &
 +    const CORBA_WStringSeq &
    );
  CORBA::Boolean TAO_Export operator>> (
      TAO_InputCDR &,
--    WStringSeq &
+-    CORBA::WStringSeq &
 +    CORBA_WStringSeq &
    );
  
--#endif /* _TAO_CDR_OP_WStringSeq_I_ */
-+#endif /* TAO_TAO_CDR_OP_CORBA_WStringSeq_I */
- 
---- StringSeqC.cpp.old	Tue Jan 16 17:48:05 2001
-+++ StringSeqC.cpp	Tue Jan 16 18:01:46 2001
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+ #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
 @@ -21,10 +21,6 @@
  
  #include "StringSeqC.h"
@@ -991,56 +881,54 @@
  #if defined (__BORLANDC__)
  #pragma option -w-rvl -w-rch -w-ccc -w-aus
  #endif /* __BORLANDC__ */
-@@ -33,17 +29,18 @@
+@@ -33,6 +29,9 @@
  #include "StringSeqC.i"
  #endif /* !defined INLINE */
  
-+#include "tao/Any.h"
++#include "Any.h"
++#include "CDR.h"
++#include "TypeCode.h"
  
--#if !defined (_STRINGSEQ_CS_)
--#define _STRINGSEQ_CS_
-+#if !defined (TAO_STRINGSEQ_CS)
-+#define TAO_STRINGSEQ_CS
- 
- // *************************************************************
--// StringSeq
-+// CORBA_StringSeq
+ #if !defined (_CORBA_STRINGSEQ_CS_)
+ #define _CORBA_STRINGSEQ_CS_
+@@ -41,9 +40,9 @@
+ // CORBA::StringSeq
  // *************************************************************
  
--StringSeq::StringSeq (void)
+-CORBA::StringSeq::StringSeq (void)
 +CORBA_StringSeq::CORBA_StringSeq (void)
  {}
--StringSeq::StringSeq (CORBA::ULong max) // uses max size
+-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 +49,7 @@
+@@ -52,7 +51,7 @@
  #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   (max)
  {}
--StringSeq::StringSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
+-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 +58,7 @@
+@@ -61,7 +60,7 @@
  #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   (max, length, buffer, release)
  {}
--StringSeq::StringSeq (const StringSeq &seq) // copy ctor
+-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,22 +67,22 @@
+@@ -70,11 +69,11 @@
  #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   (seq)
  {}
--StringSeq::~StringSeq (void) // dtor
+-CORBA::StringSeq::~StringSeq (void) // dtor
 +CORBA_StringSeq::~CORBA_StringSeq (void) // dtor
  {}
--void StringSeq::_tao_any_destructor (void *x)
+-void CORBA::StringSeq::_tao_any_destructor (void *x)
 +void CORBA_StringSeq::_tao_any_destructor (void *x)
  {
 -  StringSeq *tmp = ACE_static_cast (StringSeq*,x);
@@ -1048,74 +936,59 @@
    delete tmp;
  }
  
- 
- #endif /* end #if !defined */
- 
--static const CORBA::Long _oc_StringSeq[] =
-+static const CORBA::Long _oc_CORBA_StringSeq[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
--  18, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x53747269), ACE_NTOHL (0x6e675365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:StringSeq:1.0
--  10, ACE_NTOHL (0x53747269), ACE_NTOHL (0x6e675365), ACE_NTOHL (0x71000000),  // name = StringSeq
-+  18, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x53747269), ACE_NTOHL (0x6e675365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:CORBA_StringSeq:1.0
-+  10, ACE_NTOHL (0x53747269), ACE_NTOHL (0x6e675365), ACE_NTOHL (0x71000000),  // name = CORBA_StringSeq
-   CORBA::tk_sequence, // typecode kind
-   16, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -94,20 +91,20 @@
+@@ -94,11 +93,10 @@
      0U,
  
  };
--static CORBA::TypeCode _tc_TAO_tc_StringSeq (CORBA::tk_alias, sizeof (_oc_StringSeq), (char *) &_oc_StringSeq, 0, sizeof (StringSeq));
--CORBA::TypeCode_ptr _tc_StringSeq = &_tc_TAO_tc_StringSeq;
+-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));
-+CORBA::TypeCode_ptr _tc_CORBA_StringSeq = &_tc_TAO_tc_CORBA_StringSeq;
- 
- 
--#if !defined (_WSTRINGSEQ_CS_)
--#define _WSTRINGSEQ_CS_
-+#if !defined (TAO_WSTRINGSEQ_CS)
-+#define TAO_WSTRINGSEQ_CS
+ 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)
++
  
- // *************************************************************
--// WStringSeq
-+// CORBA_WStringSeq
+ #if !defined (_CORBA_WSTRINGSEQ_CS_)
+ #define _CORBA_WSTRINGSEQ_CS_
+@@ -107,9 +105,9 @@
+ // CORBA::WStringSeq
  // *************************************************************
  
--WStringSeq::WStringSeq (void)
+-CORBA::WStringSeq::WStringSeq (void)
 +CORBA_WStringSeq::CORBA_WStringSeq (void)
  {}
--WStringSeq::WStringSeq (CORBA::ULong max) // uses max size
+-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
-@@ -116,7 +113,7 @@
+@@ -118,7 +116,7 @@
  #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   (max)
  {}
--WStringSeq::WStringSeq (CORBA::ULong max, CORBA::ULong length, CORBA::WChar * *buffer, CORBA::Boolean release)
+-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
-@@ -125,7 +122,7 @@
+@@ -127,7 +125,7 @@
  #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   (max, length, buffer, release)
  {}
--WStringSeq::WStringSeq (const WStringSeq &seq) // copy ctor
+-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
-@@ -134,22 +131,22 @@
+@@ -136,11 +134,11 @@
  #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   (seq)
  {}
--WStringSeq::~WStringSeq (void) // dtor
+-CORBA::WStringSeq::~WStringSeq (void) // dtor
 +CORBA_WStringSeq::~CORBA_WStringSeq (void) // dtor
  {}
--void WStringSeq::_tao_any_destructor (void *x)
+-void CORBA::WStringSeq::_tao_any_destructor (void *x)
 +void CORBA_WStringSeq::_tao_any_destructor (void *x)
  {
 -  WStringSeq *tmp = ACE_static_cast (WStringSeq*,x);
@@ -1123,32 +996,21 @@
    delete tmp;
  }
  
- 
- #endif /* end #if !defined */
- 
--static const CORBA::Long _oc_WStringSeq[] =
-+static const CORBA::Long _oc_CORBA_WStringSeq[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
--  19, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x57537472), ACE_NTOHL (0x696e6753), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:WStringSeq:1.0
--  11, ACE_NTOHL (0x57537472), ACE_NTOHL (0x696e6753), ACE_NTOHL (0x65710000),  // name = WStringSeq
-+  19, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x57537472), ACE_NTOHL (0x696e6753), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:CORBA_WStringSeq:1.0
-+  11, ACE_NTOHL (0x57537472), ACE_NTOHL (0x696e6753), ACE_NTOHL (0x65710000),  // name = CORBA_WStringSeq
-   CORBA::tk_sequence, // typecode kind
-   16, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -158,54 +155,54 @@
+@@ -160,56 +158,55 @@
      0U,
  
  };
--static CORBA::TypeCode _tc_TAO_tc_WStringSeq (CORBA::tk_alias, sizeof (_oc_WStringSeq), (char *) &_oc_WStringSeq, 0, sizeof (WStringSeq));
--CORBA::TypeCode_ptr _tc_WStringSeq = &_tc_TAO_tc_WStringSeq;
+-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));
-+CORBA::TypeCode_ptr _tc_CORBA_WStringSeq = &_tc_TAO_tc_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)
++
  void operator<<= (
      CORBA::Any &_tao_any,
--    const StringSeq &_tao_elem
+-    const CORBA::StringSeq &_tao_elem
 +    const CORBA_StringSeq &_tao_elem
    ) // copying
  {
@@ -1156,7 +1018,7 @@
    if (stream << _tao_elem)
    {
      _tao_any._tao_replace (
--        _tc_StringSeq,
+-        CORBA::_tc_StringSeq,
 +        _tc_CORBA_StringSeq,
          TAO_ENCAP_BYTE_ORDER,
          stream.begin ()
@@ -1164,50 +1026,50 @@
    }
  }
  
--void operator<<= (CORBA::Any &_tao_any, StringSeq *_tao_elem) // non copying
+-void operator<<= (CORBA::Any &_tao_any, CORBA::StringSeq *_tao_elem) // non copying
 +void operator<<= (CORBA::Any &_tao_any, CORBA_StringSeq *_tao_elem) // non copying
  {
    TAO_OutputCDR stream;
    stream << *_tao_elem;
    _tao_any._tao_replace (
--      _tc_StringSeq,
+-      CORBA::_tc_StringSeq,
 +      _tc_CORBA_StringSeq,
        TAO_ENCAP_BYTE_ORDER,
        stream.begin (),
        1,
        _tao_elem,
--      StringSeq::_tao_any_destructor
+-      CORBA::StringSeq::_tao_any_destructor
 +      CORBA_StringSeq::_tao_any_destructor
      );
  }
  
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, StringSeq *&_tao_elem)
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::StringSeq *&_tao_elem)
 +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_StringSeq *&_tao_elem)
  {
    return _tao_any >>= ACE_const_cast(
--      const StringSeq*&,
+-      const CORBA::StringSeq*&,
 +      const CORBA_StringSeq*&,
        _tao_elem
      );
  }
  
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const StringSeq *&_tao_elem)
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::StringSeq *&_tao_elem)
 +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_StringSeq *&_tao_elem)
  {
    _tao_elem = 0;
    ACE_TRY_NEW_ENV
    {
      CORBA::TypeCode_var type = _tao_any.type ();
--    if (!type->equivalent (_tc_StringSeq, ACE_TRY_ENV)) // not equal
+-    if (!type->equivalent (CORBA::_tc_StringSeq, ACE_TRY_ENV)) // not equal
 +    if (!type->equivalent (_tc_CORBA_StringSeq, ACE_TRY_ENV)) // not equal
        {
          return 0;
        }
-@@ -213,15 +210,15 @@
+@@ -217,15 +214,15 @@
      if (_tao_any.any_owns_data ())
      {
        _tao_elem = ACE_static_cast(
--          const StringSeq*,
+-          const CORBA::StringSeq*,
 +          const CORBA_StringSeq*,
            _tao_any.value ()
          );
@@ -1215,31 +1077,31 @@
      }
      else
      {
--      StringSeq *tmp;
--      ACE_NEW_RETURN (tmp, StringSeq, 0);
+-      CORBA::StringSeq *tmp;
+-      ACE_NEW_RETURN (tmp, CORBA::StringSeq, 0);
 +      CORBA_StringSeq *tmp;
 +      ACE_NEW_RETURN (tmp, CORBA_StringSeq, 0);
        TAO_InputCDR stream (
            _tao_any._tao_get_cdr (),
            _tao_any._tao_byte_order ()
-@@ -229,10 +226,10 @@
+@@ -233,10 +230,10 @@
        if (stream >> *tmp)
        {
          ((CORBA::Any *)&_tao_any)->_tao_replace (
--            _tc_StringSeq,
+-            CORBA::_tc_StringSeq,
 +            _tc_CORBA_StringSeq,
              1,
              ACE_static_cast (void *, tmp),
--            StringSeq::_tao_any_destructor
+-            CORBA::StringSeq::_tao_any_destructor
 +            CORBA_StringSeq::_tao_any_destructor
            );
          _tao_elem = tmp;
          return 1;
-@@ -252,49 +249,49 @@
+@@ -256,49 +253,49 @@
  
  void operator<<= (
      CORBA::Any &_tao_any,
--    const WStringSeq &_tao_elem
+-    const CORBA::WStringSeq &_tao_elem
 +    const CORBA_WStringSeq &_tao_elem
    ) // copying
  {
@@ -1247,7 +1109,7 @@
    if (stream << _tao_elem)
    {
      _tao_any._tao_replace (
--        _tc_WStringSeq,
+-        CORBA::_tc_WStringSeq,
 +        _tc_CORBA_WStringSeq,
          TAO_ENCAP_BYTE_ORDER,
          stream.begin ()
@@ -1255,50 +1117,50 @@
    }
  }
  
--void operator<<= (CORBA::Any &_tao_any, WStringSeq *_tao_elem) // non copying
+-void operator<<= (CORBA::Any &_tao_any, CORBA::WStringSeq *_tao_elem) // non copying
 +void operator<<= (CORBA::Any &_tao_any, CORBA_WStringSeq *_tao_elem) // non copying
  {
    TAO_OutputCDR stream;
    stream << *_tao_elem;
    _tao_any._tao_replace (
--      _tc_WStringSeq,
+-      CORBA::_tc_WStringSeq,
 +      _tc_CORBA_WStringSeq,
        TAO_ENCAP_BYTE_ORDER,
        stream.begin (),
        1,
        _tao_elem,
--      WStringSeq::_tao_any_destructor
+-      CORBA::WStringSeq::_tao_any_destructor
 +      CORBA_WStringSeq::_tao_any_destructor
      );
  }
  
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, WStringSeq *&_tao_elem)
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::WStringSeq *&_tao_elem)
 +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_WStringSeq *&_tao_elem)
  {
    return _tao_any >>= ACE_const_cast(
--      const WStringSeq*&,
+-      const CORBA::WStringSeq*&,
 +      const CORBA_WStringSeq*&,
        _tao_elem
      );
  }
  
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const WStringSeq *&_tao_elem)
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::WStringSeq *&_tao_elem)
 +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_WStringSeq *&_tao_elem)
  {
    _tao_elem = 0;
    ACE_TRY_NEW_ENV
    {
      CORBA::TypeCode_var type = _tao_any.type ();
--    if (!type->equivalent (_tc_WStringSeq, ACE_TRY_ENV)) // not equal
+-    if (!type->equivalent (CORBA::_tc_WStringSeq, ACE_TRY_ENV)) // not equal
 +    if (!type->equivalent (_tc_CORBA_WStringSeq, ACE_TRY_ENV)) // not equal
        {
          return 0;
        }
-@@ -302,15 +299,15 @@
+@@ -306,15 +303,15 @@
      if (_tao_any.any_owns_data ())
      {
        _tao_elem = ACE_static_cast(
--          const WStringSeq*,
+-          const CORBA::WStringSeq*,
 +          const CORBA_WStringSeq*,
            _tao_any.value ()
          );
@@ -1306,58 +1168,58 @@
      }
      else
      {
--      WStringSeq *tmp;
--      ACE_NEW_RETURN (tmp, WStringSeq, 0);
+-      CORBA::WStringSeq *tmp;
+-      ACE_NEW_RETURN (tmp, CORBA::WStringSeq, 0);
 +      CORBA_WStringSeq *tmp;
 +      ACE_NEW_RETURN (tmp, CORBA_WStringSeq, 0);
        TAO_InputCDR stream (
            _tao_any._tao_get_cdr (),
            _tao_any._tao_byte_order ()
-@@ -318,10 +315,10 @@
+@@ -322,10 +319,10 @@
        if (stream >> *tmp)
        {
          ((CORBA::Any *)&_tao_any)->_tao_replace (
--            _tc_WStringSeq,
+-            CORBA::_tc_WStringSeq,
 +            _tc_CORBA_WStringSeq,
              1,
              ACE_static_cast (void *, tmp),
--            WStringSeq::_tao_any_destructor
+-            CORBA::WStringSeq::_tao_any_destructor
 +            CORBA_WStringSeq::_tao_any_destructor
            );
          _tao_elem = tmp;
          return 1;
-@@ -341,7 +338,7 @@
+@@ -345,7 +342,7 @@
  
  CORBA::Boolean operator<< (
      TAO_OutputCDR &strm,
--    const StringSeq &_tao_sequence
+-    const CORBA::StringSeq &_tao_sequence
 +    const CORBA_StringSeq &_tao_sequence
    )
  {
    if (strm << _tao_sequence.length ())
-@@ -359,7 +356,7 @@
+@@ -363,7 +360,7 @@
  
  CORBA::Boolean operator>> (
      TAO_InputCDR &strm,
--    StringSeq &_tao_sequence
+-    CORBA::StringSeq &_tao_sequence
 +    CORBA_StringSeq &_tao_sequence
    )
  {
    CORBA::ULong _tao_seq_len;
-@@ -383,7 +380,7 @@
+@@ -387,7 +384,7 @@
  
  CORBA::Boolean operator<< (
      TAO_OutputCDR &strm,
--    const WStringSeq &_tao_sequence
+-    const CORBA::WStringSeq &_tao_sequence
 +    const CORBA_WStringSeq &_tao_sequence
    )
  {
    if (strm << _tao_sequence.length ())
-@@ -401,7 +398,7 @@
+@@ -405,7 +402,7 @@
  
  CORBA::Boolean operator>> (
      TAO_InputCDR &strm,
--    WStringSeq &_tao_sequence
+-    CORBA::WStringSeq &_tao_sequence
 +    CORBA_WStringSeq &_tao_sequence
    )
  {