diff options
Diffstat (limited to 'TAO/tao/AnyTypeCode')
-rw-r--r-- | TAO/tao/AnyTypeCode/Any.cpp | 2 | ||||
-rw-r--r-- | TAO/tao/AnyTypeCode/NVList.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/TAO/tao/AnyTypeCode/Any.cpp b/TAO/tao/AnyTypeCode/Any.cpp index 57bf9f564dc..588a45691e3 100644 --- a/TAO/tao/AnyTypeCode/Any.cpp +++ b/TAO/tao/AnyTypeCode/Any.cpp @@ -357,7 +357,7 @@ CORBA::Any::operator<<= (CORBA::Any::from_string s) void CORBA::Any::operator<<= (CORBA::Any::from_wstring ws) { - if (ws.bound_ > 0 && ws.val_ != 0 && ACE_OS::wslen (ws.val_) > ws.bound_) + if (ws.bound_ > 0 && ws.val_ != 0 && ACE_OS::strlen (ws.val_) > ws.bound_) { return; } diff --git a/TAO/tao/AnyTypeCode/NVList.cpp b/TAO/tao/AnyTypeCode/NVList.cpp index b07e186305c..c7a98213742 100644 --- a/TAO/tao/AnyTypeCode/NVList.cpp +++ b/TAO/tao/AnyTypeCode/NVList.cpp @@ -362,7 +362,7 @@ CORBA::NVList::_tao_encode (TAO_OutputCDR &cdr, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("NVList::_tao_encode - parameter <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR (arg))); + ACE_TEXT_TO_TCHAR_IN (arg))); } CORBA::TypeCode_ptr tc = nv->value ()->_tao_get_typecode (); (void) TAO_Marshal_Object::perform_append (tc, @@ -433,7 +433,7 @@ CORBA::NVList::_tao_decode (TAO_InputCDR &incoming, { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) : NVList::_tao_decode - %s\n"), - ACE_TEXT_CHAR_TO_TCHAR (nv->name ()? nv->name () : "(no name given)" ))); + ACE_TEXT_TO_TCHAR_IN (nv->name ()? nv->name () : "(no name given)" ))); } CORBA::Any_ptr any = nv->value (); |