diff options
Diffstat (limited to 'TAO/tao/Managed_Types.i')
| -rw-r--r-- | TAO/tao/Managed_Types.i | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/TAO/tao/Managed_Types.i b/TAO/tao/Managed_Types.i index 88aac12835e..dc5eda08f2e 100644 --- a/TAO/tao/Managed_Types.i +++ b/TAO/tao/Managed_Types.i @@ -19,7 +19,7 @@ // default CTOR initializes to empty string ACE_INLINE TAO_String_Manager::TAO_String_Manager (void) - : ptr_ (CORBA::string_dup ("")) + : ptr_ (0) // @@ CORBA::string_dup (L"")) { } @@ -192,13 +192,12 @@ TAO_SeqElem_String_Manager::_retn (void) return temp; } -#if 0 /* To be included once we have support for WString_var */ // **************************************************************** // default CTOR initializes to empty string ACE_INLINE TAO_WString_Manager::TAO_WString_Manager (void) - : ptr_ (CORBA::wstring_dup ("")) + : ptr_ (0) // @@ TODO CORBA::wstring_dup ("")) { } @@ -228,15 +227,6 @@ TAO_WString_Manager::operator= (const TAO_WString_Manager &rhs) return *this; } -// assignment from CORBA::String_var makes a copy -ACE_INLINE TAO_WString_Manager& -TAO_WString_Manager::operator= (const CORBA::String_var &var) -{ - CORBA::string_free (this->ptr_); - this->ptr_ = CORBA::wstring_dup (var.in ()); - return *this; -} - // assignment from const CORBA::WChar* makes a copy ACE_INLINE TAO_WString_Manager & TAO_WString_Manager::operator= (const CORBA::WChar * p) @@ -292,8 +282,9 @@ TAO_WString_Manager::_retn (void) // **************************************************************** ACE_INLINE -TAO_SeqElem_WString_Manager::TAO_SeqElem_WString_Manager (CORBA::WChar **buffer, - CORBA::Boolean release) +TAO_SeqElem_WString_Manager:: + TAO_SeqElem_WString_Manager (CORBA::WChar **buffer, + CORBA::Boolean release) : ptr_ (buffer), release_ (release) { @@ -317,16 +308,6 @@ TAO_SeqElem_WString_Manager::operator= (const TAO_SeqElem_WString_Manager &rhs) return *this; } -// assignment from String_var -ACE_INLINE TAO_SeqElem_WString_Manager& -TAO_SeqElem_WString_Manager::operator= (const CORBA::wstring_var &var) -{ - if (this->release_) - CORBA::wstring_free (*this->ptr_); - *this->ptr_ = CORBA::wstring_dup (var.in ()); - return *this; -} - // assignment from const CORBA::WChar* will make copy ACE_INLINE TAO_SeqElem_WString_Manager & TAO_SeqElem_WString_Manager::operator= (const CORBA::WChar *p) @@ -380,5 +361,3 @@ TAO_SeqElem_WString_Manager::_retn (void) *this->ptr_ = 0; return temp; } - -#endif /* 0 */ |