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

Correct compile errors in non-unicode build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-10-07 18:08:05 +00:00
parent 3da9181eb4
commit 7c9b5f42f5
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/string.cpp
View File

@@ -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();
}