ChangeLogTag: Sat Jun 18 18:51:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

2 files changed, 16 insertions, 6 deletions

diff --git a/TAO/tao/CORBA_String.h b/TAO/tao/CORBA_String.h
index 50e3564e806..3bdefec28ea 100644
--- a/TAO/tao/CORBA_String.h
+++ b/TAO/tao/CORBA_String.h
@@ -273,6 +273,9 @@ namespace CORBA
     /// Assignment from a string.
     WString_out &operator= (CORBA::WChar *p);
 
+    /// Assignment from a constant CORBA::WChar*.
+    WString_out& operator= (const CORBA::WChar *p);
+
     /// Cast.
     operator CORBA::WChar *&();
 
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;
 }