diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-08-23 12:52:37 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-08-23 12:52:37 +0000 |
commit | 91a6f80a23845e80ce57d85a107e18e48aed087f (patch) | |
tree | 90c07c0d31df63530abc39b26d701fd89a612dee /TAO/tao/CORBA_String.cpp | |
parent | 4b66f39b2fea8e1cc4d5dc3bbe5daf19834a29b1 (diff) | |
download | ATCD-91a6f80a23845e80ce57d85a107e18e48aed087f.tar.gz |
ChangeLogTag: Tue Aug 23 10:26:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/CORBA_String.cpp')
-rw-r--r-- | TAO/tao/CORBA_String.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/TAO/tao/CORBA_String.cpp b/TAO/tao/CORBA_String.cpp index 870c61bf2ca..0511d23755a 100644 --- a/TAO/tao/CORBA_String.cpp +++ b/TAO/tao/CORBA_String.cpp @@ -74,7 +74,8 @@ CORBA::wstring_dup (const WChar *const str) return 0; } - CORBA::WChar* retval = CORBA::wstring_alloc (ACE_OS::strlen (str)); + CORBA::WChar* retval = + CORBA::wstring_alloc (static_cast <CORBA::ULong> (ACE_OS::strlen (str))); // The wscpy() below assumes that the destination is a valid buffer. if (retval == 0) @@ -272,7 +273,8 @@ operator>> (istream &is, CORBA::String_out &so) ostream & operator<< (ostream &os, const CORBA::WString_var &wsv) { - const CORBA::ULong len = ACE_OS::strlen (wsv.in ()); + const CORBA::ULong len = + static_cast <CORBA::ULong> (ACE_OS::strlen (wsv.in ())); for (CORBA::ULong i = 0; i < len; ++i) { @@ -311,9 +313,9 @@ ostream & operator<< (ostream &os, CORBA::WString_out &wso) { CORBA::WChar *tmp = wso.ptr (); - const CORBA::ULong len = ACE_OS::strlen (tmp); + const size_t len = ACE_OS::strlen (tmp); - for (CORBA::ULong i = 0; i < len; ++i) + for (size_t i = 0; i < len; ++i) { os << tmp[i]; } |