From 0dcbb107ee16728264af4173c59ced5763349cbb Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Tue, 29 Mar 2011 18:40:18 +0000 Subject: [PATCH] fix clang warning (? having two different operand types) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/strconv.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index e04e85b8fa..8fc90a869e 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -995,7 +995,7 @@ wxMBConvStrictUTF8::ToWChar(wchar_t *dst, size_t dstLen, for ( const char *p = src; ; p++ ) { - if ( !(srcLen == wxNO_LEN ? *p : srcLen) ) + if ( (srcLen == wxNO_LEN ? !*p : !srcLen) ) { // all done successfully, just add the trailing NULL if we are not // using explicit length @@ -1115,7 +1115,7 @@ wxMBConvStrictUTF8::FromWChar(char *dst, size_t dstLen, for ( const wchar_t *wp = src; ; wp++ ) { - if ( !(srcLen == wxNO_LEN ? *wp : srcLen) ) + if ( (srcLen == wxNO_LEN ? !*wp : !srcLen) ) { // all done successfully, just add the trailing NULL if we are not // using explicit length -- 2.45.2