diff options
Diffstat (limited to 'TAO/tao/CORBA_String.inl')
| -rw-r--r-- | TAO/tao/CORBA_String.inl | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/TAO/tao/CORBA_String.inl b/TAO/tao/CORBA_String.inl index af595f91619..bdee6f54ac1 100644 --- a/TAO/tao/CORBA_String.inl +++ b/TAO/tao/CORBA_String.inl @@ -110,16 +110,16 @@ CORBA::String_out::operator= (const CORBA::String_out &s) } ACE_INLINE CORBA::String_out & -CORBA::String_out::operator= (char *s) +CORBA::String_out::operator= (char *p) { - this->ptr_ = s; + this->ptr_ = p; return *this; } ACE_INLINE CORBA::String_out & -CORBA::String_out::operator= (const char *s) +CORBA::String_out::operator= (const char *p) { - this->ptr_ = CORBA::string_dup (s); + this->ptr_ = CORBA::string_dup (p); return *this; } @@ -245,9 +245,16 @@ CORBA::WString_out::operator= (const CORBA::WString_out &s) } ACE_INLINE CORBA::WString_out & -CORBA::WString_out::operator= (CORBA::WChar *s) +CORBA::WString_out::operator= (CORBA::WChar *p) { - this->ptr_ = s; + this->ptr_ = p; + return *this; +} + +ACE_INLINE CORBA::WString_out & +CORBA::WString_out::operator= (const CORBA::WChar *p) +{ + this->ptr_ = CORBA::wstring_dup (p); return *this; } |