From be7eecf834108f09d5b00fc7e774e9f8c90fcf8d Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Thu, 4 Nov 2004 20:22:44 +0000 Subject: [PATCH] Make internal type for ToAscii conversion written once but do not forget all necessary type casts (aka warning fix). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/string.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/common/string.cpp b/src/common/string.cpp index 43ee90df20..d1cf41a7c4 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -1407,12 +1407,14 @@ const wxCharBuffer wxString::ToAscii() const // this will allocate enough space for the terminating NUL too wxCharBuffer buffer(length()); - signed char *dest = (signed char *)buffer.data(); + #define LOCAL_DEST_TYPE signed char + + LOCAL_DEST_TYPE *dest = (LOCAL_DEST_TYPE *)buffer.data(); const wchar_t *pwc = c_str(); for ( ;; ) { - *dest++ = *pwc > SCHAR_MAX ? wxT('_') : *pwc; + *dest++ = (LOCAL_DEST_TYPE)(*pwc > SCHAR_MAX ? wxT('_') : *pwc); // the output string can't have embedded NULs anyhow, so we can safely // stop at first of them even if we do have any @@ -1420,6 +1422,8 @@ const wxCharBuffer wxString::ToAscii() const break; } + #undef LOCAL_DEST_TYPE + return buffer; } -- 2.45.2