Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make internal type for ToAscii conversion written once but do not forget all necessary type casts (aka warning fix).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-11-04 20:22:44 +00:00
parent 6e36105bda
commit be7eecf834
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/string.cpp
View File

@@ -1407,12 +1407,14 @@ const wxCharBuffer wxString::ToAscii() const
// this will allocate enough space for the terminating NUL too // this will allocate enough space for the terminating NUL too
wxCharBuffer buffer(length()); 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(); const wchar_t *pwc = c_str();
for ( ;; ) 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 // the output string can't have embedded NULs anyhow, so we can safely
// stop at first of them even if we do have any // stop at first of them even if we do have any
@@ -1420,6 +1422,8 @@ const wxCharBuffer wxString::ToAscii() const
break; break;
} }
#undef LOCAL_DEST_TYPE
return buffer; return buffer;
} }