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

slightly nicer workaround for pickier compiler warning

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2004-11-04 19:07:12 +00:00
parent bf8f21fdf8
commit 409a7ba772
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/uri.h
View File

@@ -122,7 +122,7 @@ protected:
static void Escape (wxString& s, const wxChar& c); static void Escape (wxString& s, const wxChar& c);
static bool IsEscape(const wxChar*& uri); static bool IsEscape(const wxChar*& uri);
static wxInt32 CharToHex(const wxChar& c); static wxChar CharToHex(const wxChar& c);
static bool IsUnreserved (const wxChar& c); static bool IsUnreserved (const wxChar& c);
static bool IsReserved (const wxChar& c); static bool IsReserved (const wxChar& c);

4
src/common/uri.cpp
View File

@@ -117,7 +117,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!"));
return (wxChar)( CharToHex(*s) * 0x10 + CharToHex(*++s) ); return CharToHex(*s) * 0x10 + CharToHex(*++s);
} }
wxString wxURI::Unescape(const wxString& uri) wxString wxURI::Unescape(const wxString& uri)
@@ -1150,7 +1150,7 @@ bool wxURI::ParseIPvFuture(const wxChar*& uri)
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
//static //static
wxInt32 wxURI::CharToHex(const wxChar& c) wxChar wxURI::CharToHex(const wxChar& c)
{ {
if ((c >= wxT('A')) && (c <= wxT('Z'))) return c - wxT('A') + 0x0A; if ((c >= wxT('A')) && (c <= wxT('Z'))) return c - wxT('A') + 0x0A;
if ((c >= wxT('a')) && (c <= wxT('z'))) return c - wxT('a') + 0x0a; if ((c >= wxT('a')) && (c <= wxT('z'))) return c - wxT('a') + 0x0a;