From: Ove Kaaven <ovek@arcticnet.no>
Date: Mon, 14 Jun 1999 21:51:06 +0000 (+0000)
Subject: Explicit casting/instantiation to resolve ambiguous overload.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9f50f9f1a161184359b7ee002d4f6bb7ecd8f04c

Explicit casting/instantiation to resolve ambiguous overload.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 3fc2571a97..47f5c3489d 100644
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -2190,7 +2190,7 @@ static void wxLoadCharacterSets(void)
 	  // skip whitespace again
 	  while (wxIsEmpty(uni) && token.HasMoreTokens()) uni = token.GetNextToken();
 
-	  if ((hex.Len() > 2) && (hex.GetChar(0) == escchar) && (hex.GetChar(1) == _T('x')) &&
+	  if ((hex.Len() > 2) && (wxString(hex.GetChar(0)) == escchar) && (hex.GetChar(1) == _T('x')) &&
 	      (uni.Left(2) == _T("<U"))) {
 	    hex.MakeUpper(); uni.MakeUpper();
 	    int pos = ::wxHexToDec(hex.Mid(2,2));