diff options
Diffstat (limited to 'TAO/tao/diffs/StringSeq.diff')
| -rw-r--r-- | TAO/tao/diffs/StringSeq.diff | 1274 |
1 files changed, 705 insertions, 569 deletions
diff --git a/TAO/tao/diffs/StringSeq.diff b/TAO/tao/diffs/StringSeq.diff index b1a11be744e..e6ac79964a3 100644 --- a/TAO/tao/diffs/StringSeq.diff +++ b/TAO/tao/diffs/StringSeq.diff @@ -1,332 +1,383 @@ ---- StringSeqC.h.old Fri Mar 2 23:51:36 2001 -+++ StringSeqC.h Sat Mar 3 11:28:11 2001 +--- 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: @@ -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_CORBA_STRINGSEQC_H_ -+#define _TAO_IDL_CORBA_STRINGSEQC_H_ ++#ifndef TAO_IDL_STRINGSEQC_H ++#define TAO_IDL_STRINGSEQC_H #include "ace/pre.h" -#include "tao/corba.h" + -+#include "corbafwd.h" ++#include "tao/corbafwd.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ --#include "corbafwd.h" -+#include "Sequence.h" +-#include "tao/corbafwd.h" ++#include "tao/Sequence.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO -@@ -54,20 +55,17 @@ - #pragma option push -w-rvl -w-rch -w-ccc -w-inl +@@ -55,38 +56,38 @@ #endif /* __BORLANDC__ */ --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 (_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 #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - TAO_Unbounded_String_Sequence + TAO_Unbounded_String_Sequence #else /* TAO_USE_SEQUENCE_TEMPLATES */ -@@ -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*); + 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*); #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 */ - }; -@@ -103,35 +101,35 @@ - // class CORBA::StringSeq_var - // ************************************************************* + }; +@@ -94,108 +95,108 @@ + #endif /* end #if !defined */ -- 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,39 @@ - #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 &); - }; + +-#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 */ -- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_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 (_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 &); + }; + + + #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 #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - TAO_Unbounded_WString_Sequence + TAO_Unbounded_WString_Sequence #else /* TAO_USE_SEQUENCE_TEMPLATES */ -@@ -184,20 +179,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*); + 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*); #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 */ - }; -@@ -209,38 +204,38 @@ - #define _CORBA_WSTRINGSEQ___VAR_CH_ + }; +@@ -203,117 +204,115 @@ + #endif /* end #if !defined */ - // ************************************************************* -- // class CORBA::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 -+ 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 +245,38 @@ - #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 &); - }; +-#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_; + }; #endif /* end #if !defined */ -- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_WStringSeq; -- -- --} --TAO_NAMESPACE_CLOSE // module CORBA + +-#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 &); + }; + + + #endif /* end #if !defined */ + +-extern TAO_Export CORBA::TypeCode_ptr _tc_WStringSeq; - - // Proxy Broker Factory function pointer declarations. - --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 *&); +-// 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 @@ -338,71 +389,104 @@ #ifndef __ACE_INLINE__ -@@ -297,11 +286,11 @@ + +-#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 TAO_Export CORBA::Boolean operator<< ( TAO_OutputCDR &, -- const CORBA::StringSeq & +- const StringSeq & + const CORBA_StringSeq & ); TAO_Export CORBA::Boolean operator>> ( TAO_InputCDR &, -- CORBA::StringSeq & +- StringSeq & + CORBA_StringSeq & ); - #endif /* _TAO_CDR_OP_CORBA_StringSeq_H_ */ -@@ -312,11 +301,11 @@ +-#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 TAO_Export CORBA::Boolean operator<< ( TAO_OutputCDR &, -- const CORBA::WStringSeq & +- const WStringSeq & + const CORBA_WStringSeq & ); TAO_Export CORBA::Boolean operator>> ( TAO_InputCDR &, -- CORBA::WStringSeq & +- WStringSeq & + CORBA_WStringSeq & ); - #endif /* _TAO_CDR_OP_CORBA_WStringSeq_H_ */ ---- StringSeqC.i.old Fri Mar 2 23:51:36 2001 -+++ StringSeqC.i Sat Mar 3 11:28:19 2001 -@@ -28,40 +28,40 @@ +-#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 // ************************************************************* ACE_INLINE --CORBA::StringSeq_var::StringSeq_var (void) // default constructor +-StringSeq_var::StringSeq_var (void) // default constructor +CORBA_StringSeq_var::CORBA_StringSeq_var (void) // default constructor : ptr_ (0) {} ACE_INLINE --CORBA::StringSeq_var::StringSeq_var (StringSeq *p) +-StringSeq_var::StringSeq_var (StringSeq *p) +CORBA_StringSeq_var::CORBA_StringSeq_var (CORBA_StringSeq *p) : ptr_ (p) {} ACE_INLINE --CORBA::StringSeq_var::StringSeq_var (const ::CORBA::StringSeq_var &p) // copy constructor +-StringSeq_var::StringSeq_var (const ::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_, ::CORBA::StringSeq (*p.ptr_)); +- ACE_NEW (this->ptr_, ::StringSeq (*p.ptr_)); + ACE_NEW (this->ptr_, ::CORBA_StringSeq (*p.ptr_)); else this->ptr_ = 0; } ACE_INLINE --CORBA::StringSeq_var::~StringSeq_var (void) // destructor +-StringSeq_var::~StringSeq_var (void) // destructor +CORBA_StringSeq_var::~CORBA_StringSeq_var (void) // destructor { delete this->ptr_; } --ACE_INLINE CORBA::StringSeq_var & --CORBA::StringSeq_var::operator= (StringSeq *p) +-ACE_INLINE StringSeq_var & +-StringSeq_var::operator= (StringSeq *p) +ACE_INLINE CORBA_StringSeq_var & +CORBA_StringSeq_var::operator= (CORBA_StringSeq *p) { @@ -411,43 +495,30 @@ return *this; } --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) +-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 { if (this != &p) - { -@@ -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 @@ + { + delete this->ptr_; +- ACE_NEW_RETURN (this->ptr_, ::StringSeq (*p.ptr_), *this); ++ ACE_NEW_RETURN (this->ptr_, ::CORBA_StringSeq (*p.ptr_), *this); + } return *this; } --ACE_INLINE const ::CORBA::StringSeq * --CORBA::StringSeq_var::operator-> (void) const +-ACE_INLINE const ::StringSeq * +-StringSeq_var::operator-> (void) const +ACE_INLINE const ::CORBA_StringSeq * +CORBA_StringSeq_var::operator-> (void) const { return this->ptr_; } --ACE_INLINE ::CORBA::StringSeq * --CORBA::StringSeq_var::operator-> (void) +-ACE_INLINE ::StringSeq * +-StringSeq_var::operator-> (void) +ACE_INLINE ::CORBA_StringSeq * +CORBA_StringSeq_var::operator-> (void) { @@ -455,21 +526,21 @@ } ACE_INLINE --CORBA::StringSeq_var::operator const ::CORBA::StringSeq &() const // cast +-StringSeq_var::operator const ::StringSeq &() const // cast +CORBA_StringSeq_var::operator const ::CORBA_StringSeq &() const // cast { return *this->ptr_; } ACE_INLINE --CORBA::StringSeq_var::operator ::CORBA::StringSeq &() // cast +-StringSeq_var::operator ::StringSeq &() // cast +CORBA_StringSeq_var::operator ::CORBA_StringSeq &() // cast { return *this->ptr_; } ACE_INLINE --CORBA::StringSeq_var::operator ::CORBA::StringSeq &() const // cast +-StringSeq_var::operator ::StringSeq &() const // cast +CORBA_StringSeq_var::operator ::CORBA_StringSeq &() const // cast { return *this->ptr_; @@ -477,29 +548,29 @@ // variable-size types only ACE_INLINE --CORBA::StringSeq_var::operator ::CORBA::StringSeq *&() // cast +-StringSeq_var::operator ::StringSeq *&() // cast +CORBA_StringSeq_var::operator ::CORBA_StringSeq *&() // cast { return this->ptr_; } ACE_INLINE TAO_SeqElem_String_Manager --CORBA::StringSeq_var::operator[] (CORBA::ULong index) +-StringSeq_var::operator[] (CORBA::ULong index) +CORBA_StringSeq_var::operator[] (CORBA::ULong index) { return this->ptr_->operator[] (index); } --ACE_INLINE const ::CORBA::StringSeq & --CORBA::StringSeq_var::in (void) const +-ACE_INLINE const ::StringSeq & +-StringSeq_var::in (void) const +ACE_INLINE const ::CORBA_StringSeq & +CORBA_StringSeq_var::in (void) const { return *this->ptr_; } --ACE_INLINE ::CORBA::StringSeq & --CORBA::StringSeq_var::inout (void) +-ACE_INLINE ::StringSeq & +-StringSeq_var::inout (void) +ACE_INLINE ::CORBA_StringSeq & +CORBA_StringSeq_var::inout (void) { @@ -507,8 +578,8 @@ } // mapping for variable size --ACE_INLINE ::CORBA::StringSeq *& --CORBA::StringSeq_var::out (void) +-ACE_INLINE ::StringSeq *& +-StringSeq_var::out (void) +ACE_INLINE ::CORBA_StringSeq *& +CORBA_StringSeq_var::out (void) { @@ -517,29 +588,32 @@ return this->ptr_; } --ACE_INLINE ::CORBA::StringSeq * --CORBA::StringSeq_var::_retn (void) +-ACE_INLINE ::StringSeq * +-StringSeq_var::_retn (void) +ACE_INLINE ::CORBA_StringSeq * +CORBA_StringSeq_var::_retn (void) { -- ::CORBA::StringSeq *tmp = this->ptr_; +- ::StringSeq *tmp = this->ptr_; + ::CORBA_StringSeq *tmp = this->ptr_; this->ptr_ = 0; return tmp; } --ACE_INLINE ::CORBA::StringSeq * --CORBA::StringSeq_var::ptr (void) const +-ACE_INLINE ::StringSeq * +-StringSeq_var::ptr (void) const +ACE_INLINE ::CORBA_StringSeq * +CORBA_StringSeq_var::ptr (void) const { return this->ptr_; } -@@ -171,14 +171,14 @@ + + // ************************************************************* +-// Inline operations for class StringSeq_out ++// Inline operations for class CORBA_StringSeq_out // ************************************************************* ACE_INLINE --CORBA::StringSeq_out::StringSeq_out (StringSeq *&p) +-StringSeq_out::StringSeq_out (StringSeq *&p) +CORBA_StringSeq_out::CORBA_StringSeq_out (CORBA_StringSeq *&p) : ptr_ (p) { @@ -547,23 +621,23 @@ } ACE_INLINE --CORBA::StringSeq_out::StringSeq_out (StringSeq_var &p) // constructor from _var +-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_; -@@ -186,44 +186,44 @@ +@@ -169,44 +169,44 @@ } ACE_INLINE --CORBA::StringSeq_out::StringSeq_out (const ::CORBA::StringSeq_out &p) // copy constructor +-StringSeq_out::StringSeq_out (const ::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 ::CORBA::StringSeq_out & --CORBA::StringSeq_out::operator= (const ::CORBA::StringSeq_out &p) +-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) { @@ -572,8 +646,8 @@ return *this; } --ACE_INLINE ::CORBA::StringSeq_out & --CORBA::StringSeq_out::operator= (StringSeq *p) +-ACE_INLINE ::StringSeq_out & +-StringSeq_out::operator= (StringSeq *p) +ACE_INLINE ::CORBA_StringSeq_out & +CORBA_StringSeq_out::operator= (CORBA_StringSeq *p) { @@ -582,22 +656,22 @@ } ACE_INLINE --CORBA::StringSeq_out::operator ::CORBA::StringSeq *&() // cast +-StringSeq_out::operator ::StringSeq *&() // cast +CORBA_StringSeq_out::operator ::CORBA_StringSeq *&() // cast { return this->ptr_; } --ACE_INLINE ::CORBA::StringSeq *& --CORBA::StringSeq_out::ptr (void) // ptr +-ACE_INLINE ::StringSeq *& +-StringSeq_out::ptr (void) // ptr +ACE_INLINE ::CORBA_StringSeq *& +CORBA_StringSeq_out::ptr (void) // ptr { return this->ptr_; } --ACE_INLINE ::CORBA::StringSeq * --CORBA::StringSeq_out::operator-> (void) +-ACE_INLINE ::StringSeq * +-StringSeq_out::operator-> (void) +ACE_INLINE ::CORBA_StringSeq * +CORBA_StringSeq_out::operator-> (void) { @@ -605,46 +679,57 @@ } ACE_INLINE TAO_SeqElem_String_Manager --CORBA::StringSeq_out::operator[] (CORBA::ULong index) +-StringSeq_out::operator[] (CORBA::ULong index) +CORBA_StringSeq_out::operator[] (CORBA::ULong index) { return this->ptr_->operator[] (index); } -@@ -240,40 +240,40 @@ +@@ -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 // ************************************************************* ACE_INLINE --CORBA::WStringSeq_var::WStringSeq_var (void) // default constructor +-WStringSeq_var::WStringSeq_var (void) // default constructor +CORBA_WStringSeq_var::CORBA_WStringSeq_var (void) // default constructor : ptr_ (0) {} ACE_INLINE --CORBA::WStringSeq_var::WStringSeq_var (WStringSeq *p) +-WStringSeq_var::WStringSeq_var (WStringSeq *p) +CORBA_WStringSeq_var::CORBA_WStringSeq_var (CORBA_WStringSeq *p) : ptr_ (p) {} ACE_INLINE --CORBA::WStringSeq_var::WStringSeq_var (const ::CORBA::WStringSeq_var &p) // copy constructor +-WStringSeq_var::WStringSeq_var (const ::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_, ::CORBA::WStringSeq (*p.ptr_)); +- ACE_NEW (this->ptr_, ::WStringSeq (*p.ptr_)); + ACE_NEW (this->ptr_, ::CORBA_WStringSeq (*p.ptr_)); else this->ptr_ = 0; } ACE_INLINE --CORBA::WStringSeq_var::~WStringSeq_var (void) // destructor +-WStringSeq_var::~WStringSeq_var (void) // destructor +CORBA_WStringSeq_var::~CORBA_WStringSeq_var (void) // destructor { delete this->ptr_; } --ACE_INLINE CORBA::WStringSeq_var & --CORBA::WStringSeq_var::operator= (WStringSeq *p) +-ACE_INLINE WStringSeq_var & +-WStringSeq_var::operator= (WStringSeq *p) +ACE_INLINE CORBA_WStringSeq_var & +CORBA_WStringSeq_var::operator= (CORBA_WStringSeq *p) { @@ -653,43 +738,30 @@ return *this; } --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) +-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 { if (this != &p) - { -@@ -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 @@ + { + delete this->ptr_; +- ACE_NEW_RETURN (this->ptr_, ::WStringSeq (*p.ptr_), *this); ++ ACE_NEW_RETURN (this->ptr_, ::CORBA_WStringSeq (*p.ptr_), *this); + } return *this; } --ACE_INLINE const ::CORBA::WStringSeq * --CORBA::WStringSeq_var::operator-> (void) const +-ACE_INLINE const ::WStringSeq * +-WStringSeq_var::operator-> (void) const +ACE_INLINE const ::CORBA_WStringSeq * +CORBA_WStringSeq_var::operator-> (void) const { return this->ptr_; } --ACE_INLINE ::CORBA::WStringSeq * --CORBA::WStringSeq_var::operator-> (void) +-ACE_INLINE ::WStringSeq * +-WStringSeq_var::operator-> (void) +ACE_INLINE ::CORBA_WStringSeq * +CORBA_WStringSeq_var::operator-> (void) { @@ -697,21 +769,21 @@ } ACE_INLINE --CORBA::WStringSeq_var::operator const ::CORBA::WStringSeq &() const // cast +-WStringSeq_var::operator const ::WStringSeq &() const // cast +CORBA_WStringSeq_var::operator const ::CORBA_WStringSeq &() const // cast { return *this->ptr_; } ACE_INLINE --CORBA::WStringSeq_var::operator ::CORBA::WStringSeq &() // cast +-WStringSeq_var::operator ::WStringSeq &() // cast +CORBA_WStringSeq_var::operator ::CORBA_WStringSeq &() // cast { return *this->ptr_; } ACE_INLINE --CORBA::WStringSeq_var::operator ::CORBA::WStringSeq &() const // cast +-WStringSeq_var::operator ::WStringSeq &() const // cast +CORBA_WStringSeq_var::operator ::CORBA_WStringSeq &() const // cast { return *this->ptr_; @@ -719,29 +791,29 @@ // variable-size types only ACE_INLINE --CORBA::WStringSeq_var::operator ::CORBA::WStringSeq *&() // cast +-WStringSeq_var::operator ::WStringSeq *&() // cast +CORBA_WStringSeq_var::operator ::CORBA_WStringSeq *&() // cast { return this->ptr_; } ACE_INLINE TAO_SeqElem_WString_Manager --CORBA::WStringSeq_var::operator[] (CORBA::ULong index) +-WStringSeq_var::operator[] (CORBA::ULong index) +CORBA_WStringSeq_var::operator[] (CORBA::ULong index) { return this->ptr_->operator[] (index); } --ACE_INLINE const ::CORBA::WStringSeq & --CORBA::WStringSeq_var::in (void) const +-ACE_INLINE const ::WStringSeq & +-WStringSeq_var::in (void) const +ACE_INLINE const ::CORBA_WStringSeq & +CORBA_WStringSeq_var::in (void) const { return *this->ptr_; } --ACE_INLINE ::CORBA::WStringSeq & --CORBA::WStringSeq_var::inout (void) +-ACE_INLINE ::WStringSeq & +-WStringSeq_var::inout (void) +ACE_INLINE ::CORBA_WStringSeq & +CORBA_WStringSeq_var::inout (void) { @@ -749,8 +821,8 @@ } // mapping for variable size --ACE_INLINE ::CORBA::WStringSeq *& --CORBA::WStringSeq_var::out (void) +-ACE_INLINE ::WStringSeq *& +-WStringSeq_var::out (void) +ACE_INLINE ::CORBA_WStringSeq *& +CORBA_WStringSeq_var::out (void) { @@ -759,29 +831,32 @@ return this->ptr_; } --ACE_INLINE ::CORBA::WStringSeq * --CORBA::WStringSeq_var::_retn (void) +-ACE_INLINE ::WStringSeq * +-WStringSeq_var::_retn (void) +ACE_INLINE ::CORBA_WStringSeq * +CORBA_WStringSeq_var::_retn (void) { -- ::CORBA::WStringSeq *tmp = this->ptr_; +- ::WStringSeq *tmp = this->ptr_; + ::CORBA_WStringSeq *tmp = this->ptr_; this->ptr_ = 0; return tmp; } --ACE_INLINE ::CORBA::WStringSeq * --CORBA::WStringSeq_var::ptr (void) const +-ACE_INLINE ::WStringSeq * +-WStringSeq_var::ptr (void) const +ACE_INLINE ::CORBA_WStringSeq * +CORBA_WStringSeq_var::ptr (void) const { return this->ptr_; } -@@ -383,14 +383,14 @@ + + // ************************************************************* +-// Inline operations for class WStringSeq_out ++// Inline operations for class CORBA_WStringSeq_out // ************************************************************* ACE_INLINE --CORBA::WStringSeq_out::WStringSeq_out (WStringSeq *&p) +-WStringSeq_out::WStringSeq_out (WStringSeq *&p) +CORBA_WStringSeq_out::CORBA_WStringSeq_out (CORBA_WStringSeq *&p) : ptr_ (p) { @@ -789,23 +864,23 @@ } ACE_INLINE --CORBA::WStringSeq_out::WStringSeq_out (WStringSeq_var &p) // constructor from _var +-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_; -@@ -398,44 +398,44 @@ +@@ -364,44 +364,44 @@ } ACE_INLINE --CORBA::WStringSeq_out::WStringSeq_out (const ::CORBA::WStringSeq_out &p) // copy constructor +-WStringSeq_out::WStringSeq_out (const ::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 ::CORBA::WStringSeq_out & --CORBA::WStringSeq_out::operator= (const ::CORBA::WStringSeq_out &p) +-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) { @@ -814,8 +889,8 @@ return *this; } --ACE_INLINE ::CORBA::WStringSeq_out & --CORBA::WStringSeq_out::operator= (WStringSeq *p) +-ACE_INLINE ::WStringSeq_out & +-WStringSeq_out::operator= (WStringSeq *p) +ACE_INLINE ::CORBA_WStringSeq_out & +CORBA_WStringSeq_out::operator= (CORBA_WStringSeq *p) { @@ -824,22 +899,22 @@ } ACE_INLINE --CORBA::WStringSeq_out::operator ::CORBA::WStringSeq *&() // cast +-WStringSeq_out::operator ::WStringSeq *&() // cast +CORBA_WStringSeq_out::operator ::CORBA_WStringSeq *&() // cast { return this->ptr_; } --ACE_INLINE ::CORBA::WStringSeq *& --CORBA::WStringSeq_out::ptr (void) // ptr +-ACE_INLINE ::WStringSeq *& +-WStringSeq_out::ptr (void) // ptr +ACE_INLINE ::CORBA_WStringSeq *& +CORBA_WStringSeq_out::ptr (void) // ptr { return this->ptr_; } --ACE_INLINE ::CORBA::WStringSeq * --CORBA::WStringSeq_out::operator-> (void) +-ACE_INLINE ::WStringSeq * +-WStringSeq_out::operator-> (void) +ACE_INLINE ::CORBA_WStringSeq * +CORBA_WStringSeq_out::operator-> (void) { @@ -847,27 +922,64 @@ } ACE_INLINE TAO_SeqElem_WString_Manager --CORBA::WStringSeq_out::operator[] (CORBA::ULong index) +-WStringSeq_out::operator[] (CORBA::ULong index) +CORBA_WStringSeq_out::operator[] (CORBA::ULong index) { return this->ptr_->operator[] (index); } -@@ -464,11 +464,11 @@ +@@ -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 + + 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 CORBA::WStringSeq & +- const WStringSeq & + const CORBA_WStringSeq & ); CORBA::Boolean TAO_Export operator>> ( TAO_InputCDR &, -- CORBA::WStringSeq & +- WStringSeq & + CORBA_WStringSeq & ); - #endif /* _TAO_CDR_OP_CORBA_WStringSeq_I_ */ ---- StringSeqC.cpp.old Fri Mar 2 23:51:36 2001 -+++ StringSeqC.cpp Sat Mar 3 11:28:29 2001 +-#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: @@ -21,10 +21,6 @@ #include "StringSeqC.h" @@ -879,63 +991,56 @@ #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus #endif /* __BORLANDC__ */ -@@ -33,6 +29,9 @@ +@@ -33,17 +29,18 @@ #include "StringSeqC.i" #endif /* !defined INLINE */ -+#include "Any.h" -+#include "CDR.h" -+#include "Typecode.h" ++#include "tao/Any.h" + +-#if !defined (_STRINGSEQ_CS_) +-#define _STRINGSEQ_CS_ ++#if !defined (TAO_STRINGSEQ_CS) ++#define TAO_STRINGSEQ_CS - #if !defined (_CORBA_STRINGSEQ_CS_) - #define _CORBA_STRINGSEQ_CS_ -@@ -41,40 +40,40 @@ - // CORBA::StringSeq + // ************************************************************* +-// StringSeq ++// CORBA_StringSeq // ************************************************************* --CORBA::StringSeq::StringSeq (void) +-StringSeq::StringSeq (void) +CORBA_StringSeq::CORBA_StringSeq (void) {} --CORBA::StringSeq::StringSeq (CORBA::ULong max) // uses max size -- : +-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 - #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_String_Sequence --#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ -+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +@@ -52,7 +49,7 @@ + #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max) {} --CORBA::StringSeq::StringSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release) -- : +-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 - #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_String_Sequence --#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ -+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +@@ -61,7 +58,7 @@ + #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} --CORBA::StringSeq::StringSeq (const StringSeq &seq) // copy ctor -- : +-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 - #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_String_Sequence --#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ -+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +@@ -70,22 +67,22 @@ + #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} --CORBA::StringSeq::~StringSeq (void) // dtor +-StringSeq::~StringSeq (void) // dtor +CORBA_StringSeq::~CORBA_StringSeq (void) // dtor {} --void CORBA::StringSeq::_tao_any_destructor (void *x) +-void StringSeq::_tao_any_destructor (void *x) +void CORBA_StringSeq::_tao_any_destructor (void *x) { - StringSeq *tmp = ACE_static_cast (StringSeq*,x); @@ -943,68 +1048,74 @@ delete tmp; } -@@ -89,12 +88,12 @@ + + #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 -- CORBA::tk_string, -+ CORBA::tk_string, - 0U, // string length +@@ -94,20 +91,20 @@ 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_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)); - TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) - TAO_NAMESPACE_BEGIN (CORBA) - TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StringSeq, &_tc_TAO_tc_CORBA_StringSeq) -@@ -107,40 +106,40 @@ - // CORBA::WStringSeq ++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 + + // ************************************************************* +-// WStringSeq ++// CORBA_WStringSeq // ************************************************************* --CORBA::WStringSeq::WStringSeq (void) +-WStringSeq::WStringSeq (void) +CORBA_WStringSeq::CORBA_WStringSeq (void) {} --CORBA::WStringSeq::WStringSeq (CORBA::ULong max) // uses max size -- : +-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 - #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_WString_Sequence --#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ -+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +@@ -116,7 +113,7 @@ + #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max) {} --CORBA::WStringSeq::WStringSeq (CORBA::ULong max, CORBA::ULong length, CORBA::WChar * *buffer, CORBA::Boolean release) -- : +-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 - #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_WString_Sequence --#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ -+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +@@ -125,7 +122,7 @@ + #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} --CORBA::WStringSeq::WStringSeq (const WStringSeq &seq) // copy ctor -- : +-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 - #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_WString_Sequence --#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ -+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +@@ -134,22 +131,22 @@ + #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} --CORBA::WStringSeq::~WStringSeq (void) // dtor +-WStringSeq::~WStringSeq (void) // dtor +CORBA_WStringSeq::~CORBA_WStringSeq (void) // dtor {} --void CORBA::WStringSeq::_tao_any_destructor (void *x) +-void WStringSeq::_tao_any_destructor (void *x) +void CORBA_WStringSeq::_tao_any_destructor (void *x) { - WStringSeq *tmp = ACE_static_cast (WStringSeq*,x); @@ -1012,68 +1123,91 @@ delete tmp; } -@@ -155,19 +154,20 @@ + + #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 -- CORBA::tk_wstring, -+ CORBA::tk_wstring, - 0U, // string length +@@ -158,54 +155,54 @@ 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_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)); - 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 -+ ++CORBA::TypeCode_ptr _tc_CORBA_WStringSeq = &_tc_TAO_tc_CORBA_WStringSeq; + void operator<<= ( CORBA::Any &_tao_any, -- const CORBA::StringSeq &_tao_elem +- const StringSeq &_tao_elem + const CORBA_StringSeq &_tao_elem ) // copying { TAO_OutputCDR stream; -@@ -181,7 +181,7 @@ + if (stream << _tao_elem) + { + _tao_any._tao_replace ( +- _tc_StringSeq, ++ _tc_CORBA_StringSeq, + TAO_ENCAP_BYTE_ORDER, + stream.begin () + ); } } --void operator<<= (CORBA::Any &_tao_any, CORBA::StringSeq *_tao_elem) // non copying +-void operator<<= (CORBA::Any &_tao_any, StringSeq *_tao_elem) // non copying +void operator<<= (CORBA::Any &_tao_any, CORBA_StringSeq *_tao_elem) // non copying { TAO_OutputCDR stream; stream << *_tao_elem; -@@ -191,19 +191,19 @@ + _tao_any._tao_replace ( +- _tc_StringSeq, ++ _tc_CORBA_StringSeq, + TAO_ENCAP_BYTE_ORDER, stream.begin (), 1, _tao_elem, -- CORBA::StringSeq::_tao_any_destructor +- StringSeq::_tao_any_destructor + CORBA_StringSeq::_tao_any_destructor ); } --CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::StringSeq *&_tao_elem) +-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, StringSeq *&_tao_elem) +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_StringSeq *&_tao_elem) { return _tao_any >>= ACE_const_cast( -- const CORBA::StringSeq*&, +- const StringSeq*&, + const CORBA_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 StringSeq *&_tao_elem) +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_StringSeq *&_tao_elem) { _tao_elem = 0; ACE_TRY_NEW_ENV -@@ -217,15 +217,15 @@ + { + CORBA::TypeCode_var type = _tao_any.type (); +- if (!type->equivalent (_tc_StringSeq, ACE_TRY_ENV)) // not equal ++ if (!type->equivalent (_tc_CORBA_StringSeq, ACE_TRY_ENV)) // not equal + { + return 0; + } +@@ -213,15 +210,15 @@ if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( -- const CORBA::StringSeq*, +- const StringSeq*, + const CORBA_StringSeq*, _tao_any.value () ); @@ -1081,69 +1215,90 @@ } else { -- CORBA::StringSeq *tmp; -- ACE_NEW_RETURN (tmp, CORBA::StringSeq, 0); +- StringSeq *tmp; +- ACE_NEW_RETURN (tmp, 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 () -@@ -236,7 +236,7 @@ - CORBA::_tc_StringSeq, +@@ -229,10 +226,10 @@ + if (stream >> *tmp) + { + ((CORBA::Any *)&_tao_any)->_tao_replace ( +- _tc_StringSeq, ++ _tc_CORBA_StringSeq, 1, ACE_static_cast (void *, tmp), -- CORBA::StringSeq::_tao_any_destructor +- StringSeq::_tao_any_destructor + CORBA_StringSeq::_tao_any_destructor ); _tao_elem = tmp; return 1; -@@ -256,7 +256,7 @@ +@@ -252,49 +249,49 @@ void operator<<= ( CORBA::Any &_tao_any, -- const CORBA::WStringSeq &_tao_elem +- const WStringSeq &_tao_elem + const CORBA_WStringSeq &_tao_elem ) // copying { TAO_OutputCDR stream; -@@ -270,7 +270,7 @@ + if (stream << _tao_elem) + { + _tao_any._tao_replace ( +- _tc_WStringSeq, ++ _tc_CORBA_WStringSeq, + TAO_ENCAP_BYTE_ORDER, + stream.begin () + ); } } --void operator<<= (CORBA::Any &_tao_any, CORBA::WStringSeq *_tao_elem) // non copying +-void operator<<= (CORBA::Any &_tao_any, WStringSeq *_tao_elem) // non copying +void operator<<= (CORBA::Any &_tao_any, CORBA_WStringSeq *_tao_elem) // non copying { TAO_OutputCDR stream; stream << *_tao_elem; -@@ -280,19 +280,19 @@ + _tao_any._tao_replace ( +- _tc_WStringSeq, ++ _tc_CORBA_WStringSeq, + TAO_ENCAP_BYTE_ORDER, stream.begin (), 1, _tao_elem, -- CORBA::WStringSeq::_tao_any_destructor +- WStringSeq::_tao_any_destructor + CORBA_WStringSeq::_tao_any_destructor ); } --CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::WStringSeq *&_tao_elem) +-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, WStringSeq *&_tao_elem) +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_WStringSeq *&_tao_elem) { return _tao_any >>= ACE_const_cast( -- const CORBA::WStringSeq*&, +- const WStringSeq*&, + const CORBA_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 WStringSeq *&_tao_elem) +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_WStringSeq *&_tao_elem) { _tao_elem = 0; ACE_TRY_NEW_ENV -@@ -306,15 +306,15 @@ + { + CORBA::TypeCode_var type = _tao_any.type (); +- if (!type->equivalent (_tc_WStringSeq, ACE_TRY_ENV)) // not equal ++ if (!type->equivalent (_tc_CORBA_WStringSeq, ACE_TRY_ENV)) // not equal + { + return 0; + } +@@ -302,15 +299,15 @@ if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( -- const CORBA::WStringSeq*, +- const WStringSeq*, + const CORBA_WStringSeq*, _tao_any.value () ); @@ -1151,78 +1306,59 @@ } else { -- CORBA::WStringSeq *tmp; -- ACE_NEW_RETURN (tmp, CORBA::WStringSeq, 0); +- WStringSeq *tmp; +- ACE_NEW_RETURN (tmp, 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 () -@@ -325,7 +325,7 @@ - CORBA::_tc_WStringSeq, +@@ -318,10 +315,10 @@ + if (stream >> *tmp) + { + ((CORBA::Any *)&_tao_any)->_tao_replace ( +- _tc_WStringSeq, ++ _tc_CORBA_WStringSeq, 1, ACE_static_cast (void *, tmp), -- CORBA::WStringSeq::_tao_any_destructor +- WStringSeq::_tao_any_destructor + CORBA_WStringSeq::_tao_any_destructor ); _tao_elem = tmp; return 1; -@@ -345,7 +345,7 @@ +@@ -341,7 +338,7 @@ CORBA::Boolean operator<< ( TAO_OutputCDR &strm, -- const CORBA::StringSeq &_tao_sequence +- const StringSeq &_tao_sequence + const CORBA_StringSeq &_tao_sequence ) { if (strm << _tao_sequence.length ()) -@@ -363,7 +363,7 @@ +@@ -359,7 +356,7 @@ CORBA::Boolean operator>> ( TAO_InputCDR &strm, -- CORBA::StringSeq &_tao_sequence +- StringSeq &_tao_sequence + CORBA_StringSeq &_tao_sequence ) { CORBA::ULong _tao_seq_len; -@@ -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 @@ +@@ -383,7 +380,7 @@ CORBA::Boolean operator<< ( TAO_OutputCDR &strm, -- const CORBA::WStringSeq &_tao_sequence +- const WStringSeq &_tao_sequence + const CORBA_WStringSeq &_tao_sequence ) { if (strm << _tao_sequence.length ()) -@@ -405,7 +405,7 @@ +@@ -401,7 +398,7 @@ CORBA::Boolean operator>> ( TAO_InputCDR &strm, -- CORBA::WStringSeq &_tao_sequence +- WStringSeq &_tao_sequence + CORBA_WStringSeq &_tao_sequence ) { 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 - } -- |