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

Unfortunatelly compiler does not know which bits play here and still warns about loosing them.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-11-08 19:34:45 +00:00
parent 048ba49d87
commit 6356d52a67
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/strconv.cpp
View File

@@ -436,7 +436,7 @@ size_t wxMBConvUTF7::MB2WC(wchar_t *buf, const char *psz, size_t n) const
d += cc; d += cc;
for (l += 6; l >= 8; lsb = !lsb) for (l += 6; l >= 8; lsb = !lsb)
{ {
c = (d >> (l -= 8)) % 256; c = (unsigned char)((d >> (l -= 8)) % 256);
if (lsb) if (lsb)
{ {
if (buf) if (buf)
@@ -445,7 +445,7 @@ size_t wxMBConvUTF7::MB2WC(wchar_t *buf, const char *psz, size_t n) const
} }
else else
if (buf) if (buf)
*buf = c << 8; *buf = (wchar_t)(c << 8);
} }
} }
if (*psz == '-') if (*psz == '-')

2
src/common/uri.cpp
View File

@@ -118,7 +118,7 @@ wxChar wxURI::TranslateEscape(const wxChar* s)
wxASSERT_MSG(IsHex(*s) && IsHex(*(s+1)), wxT("Invalid escape!")); wxASSERT_MSG(IsHex(*s) && IsHex(*(s+1)), wxT("Invalid escape!"));
//<<4 == 16 //<<4 == 16
return ( CharToHex(*s) << 4 ) | CharToHex(*++s); return (wxChar)( CharToHex(*s) << 4 ) | CharToHex(*++s);
} }
wxString wxURI::Unescape(const wxString& uri) wxString wxURI::Unescape(const wxString& uri)