From 6356d52a67c8935e0e348d17140cc640f1940ac7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Mon, 8 Nov 2004 19:34:45 +0000 Subject: [PATCH] Unfortunatelly compiler does not know which bits play here and still warns about loosing them. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/strconv.cpp | 4 ++-- src/common/uri.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index 6f1ce18020..50571277e7 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -436,7 +436,7 @@ size_t wxMBConvUTF7::MB2WC(wchar_t *buf, const char *psz, size_t n) const d += cc; for (l += 6; l >= 8; lsb = !lsb) { - c = (d >> (l -= 8)) % 256; + c = (unsigned char)((d >> (l -= 8)) % 256); if (lsb) { if (buf) @@ -445,7 +445,7 @@ size_t wxMBConvUTF7::MB2WC(wchar_t *buf, const char *psz, size_t n) const } else if (buf) - *buf = c << 8; + *buf = (wchar_t)(c << 8); } } if (*psz == '-') diff --git a/src/common/uri.cpp b/src/common/uri.cpp index 584eaf37e1..e6475f93fb 100644 --- a/src/common/uri.cpp +++ b/src/common/uri.cpp @@ -118,7 +118,7 @@ wxChar wxURI::TranslateEscape(const wxChar* s) wxASSERT_MSG(IsHex(*s) && IsHex(*(s+1)), wxT("Invalid escape!")); //<<4 == 16 - return ( CharToHex(*s) << 4 ) | CharToHex(*++s); + return (wxChar)( CharToHex(*s) << 4 ) | CharToHex(*++s); } wxString wxURI::Unescape(const wxString& uri) -- 2.45.2