diff options
Diffstat (limited to 'TAO/tao/Managed_Types.h')
| -rw-r--r-- | TAO/tao/Managed_Types.h | 55 |
1 files changed, 28 insertions, 27 deletions
diff --git a/TAO/tao/Managed_Types.h b/TAO/tao/Managed_Types.h index 81b11412f62..72fd617f6c5 100644 --- a/TAO/tao/Managed_Types.h +++ b/TAO/tao/Managed_Types.h @@ -38,7 +38,7 @@ class TAO_Export TAO_String_Manager public: TAO_String_Manager (void); - // default CTOR will initialize the underlying ptr_ to empty string. + // default CTOR will initialize the underlying ptr_ to empty string. TAO_String_Manager (const TAO_String_Manager &); // copy constructor @@ -170,8 +170,7 @@ private: }; -#if 0 /* WString_var not implemented in TAO yet - 01/03/1999 */ -/****************************************************************/ +// **************************************************************** class TAO_Export TAO_WString_Manager { @@ -180,16 +179,18 @@ class TAO_Export TAO_WString_Manager // // = DESCRIPTION // - // This class implements the generic wstring manager and is used in the C++ - // mapping of "struct" members that are of type "wstring". The difference - // between this class and the CORBA::WString_var class is that the default - // conctructor initializes the underlying wstring to an empty string in this - // class whereas it is a NUL wstring for the _var class. + // This class implements the generic wstring manager and is used + // in the C++ mapping of "struct" members that are of type + // "wstring". + // The difference between this class and the CORBA::WString_var + // class is that the default constructor initializes the + // underlying wstring to an empty string in this class whereas it + // is a NUL wstring for the _var class. // public: TAO_WString_Manager (void); - // default CTOR will initialize the underlying ptr_ to empty string. + // default CTOR will initialize the underlying ptr_ to empty string. TAO_WString_Manager (const TAO_WString_Manager &); // copy constructor @@ -207,8 +208,8 @@ public: // assignment from a constant wchar* will make a copy TAO_WString_Manager &operator= (CORBA::WChar *); - // assignment from wchar* will not make a copy. The WString_Manager will now - // own the string. + // assignment from wchar* will not make a copy. The WString_Manager + // will now own the string. operator const CORBA::WChar*() const; // cast (read-only) @@ -255,10 +256,10 @@ class TAO_Export TAO_SeqElem_WString_Manager // This class implements the generic string manager and is used to // instantiate the proper sequence types. // - // This class will have the same semantics as the string manager classes - // defined earlier with respect to the various assignment - // operators. However, the freeing of old storage will be dependent on the - // "release" value of the parent sequence class. + // This class will have the same semantics as the string manager + // classes defined earlier with respect to the various assignment + // operators. However, the freeing of old storage will be + // dependent on the "release" value of the parent sequence class. // public: friend class TAO_Unbounded_WString_Sequence; @@ -268,7 +269,8 @@ public: // friend template<CORBA::ULong MAX> // class TAO_Bounded_WString_Sequence<TAO_SeqElem_WString_Manager,MAX>; - TAO_SeqElem_WString_Manager (char **buffer, CORBA::Boolean release); + TAO_SeqElem_WString_Manager (CORBA::WChar **buffer, + CORBA::Boolean release); // constructor from address of an element ~TAO_SeqElem_WString_Manager (void); @@ -280,30 +282,30 @@ public: TAO_SeqElem_WString_Manager &operator= (const CORBA::WString_var&); // assignment from var type will make a copy - TAO_SeqElem_WString_Manager &operator= (const char *); + TAO_SeqElem_WString_Manager &operator= (const CORBA::WChar *); // assignment from a constant char* will make a copy - TAO_SeqElem_WString_Manager &operator= (char *); - // assignment from char* will not make a copy. The SeqElem_WString_Manager will now - // own the string. + TAO_SeqElem_WString_Manager &operator= (CORBA::WChar *); + // assignment from char* will not make a copy. The + // SeqElem_WString_Manager will now own the string. - operator const char*() const; + operator const CORBA::WChar*() const; // cast (read-only) - const char *in (void) const; + const CORBA::WChar *in (void) const; // for in parameter. - char *&inout (void); + CORBA::WChar *&inout (void); // for inout parameter. - char *&out (void); + CORBA::WChar *&out (void); // for out parameter. - char *_retn (void); + CORBA::WChar *_retn (void); // for string of return type. private: - char **ptr_; + CORBA::WChar **ptr_; // Address of string element from the parent's buffer. CORBA::Boolean release_; @@ -320,7 +322,6 @@ private: // copy constructor }; -#endif /* 0 */ #if defined (__ACE_INLINE__) #include "tao/Managed_Types.i" |