From 7c9b5f42f585fa564972fa439c6da60645514ae0 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 7 Oct 2004 18:08:05 +0000 Subject: [PATCH] Correct compile errors in non-unicode build git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/string.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/common/string.cpp b/src/common/string.cpp index 5e14e76ff9..7532732646 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -475,9 +475,9 @@ size_t wxStringBase::find(const wxStringBase& str, size_t nStart) const wxASSERT( nStart <= length() ); //anchor - const wxChar* p = wxMemchr(c_str() + nStart, - str.c_str()[0], - length() - nStart); + const wxChar* p = (const wxChar*)wxMemchr(c_str() + nStart, + str.c_str()[0], + length() - nStart); if(!p) return npos; @@ -486,9 +486,9 @@ size_t wxStringBase::find(const wxStringBase& str, size_t nStart) const wxMemcmp(p, str.c_str(), str.length()) ) { //anchor again - p = wxMemchr(++p, - str.c_str()[0], - length() - (p - c_str())); + p = (const wxChar*)wxMemchr(++p, + str.c_str()[0], + length() - (p - c_str())); if(!p) return npos; @@ -506,7 +506,7 @@ size_t wxStringBase::find(wxChar ch, size_t nStart) const { wxASSERT( nStart <= length() ); - const wxChar *p = wxMemchr(c_str() + nStart, ch, length() - nStart); + const wxChar *p = (const wxChar*)wxMemchr(c_str() + nStart, ch, length() - nStart); return p == NULL ? npos : p - c_str(); } -- 2.50.0