Correct compile errors in non-unicode build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -475,7 +475,7 @@ size_t wxStringBase::find(const wxStringBase& str, size_t nStart) const
|
|||||||
wxASSERT( nStart <= length() );
|
wxASSERT( nStart <= length() );
|
||||||
|
|
||||||
//anchor
|
//anchor
|
||||||
const wxChar* p = wxMemchr(c_str() + nStart,
|
const wxChar* p = (const wxChar*)wxMemchr(c_str() + nStart,
|
||||||
str.c_str()[0],
|
str.c_str()[0],
|
||||||
length() - nStart);
|
length() - nStart);
|
||||||
|
|
||||||
@@ -486,7 +486,7 @@ size_t wxStringBase::find(const wxStringBase& str, size_t nStart) const
|
|||||||
wxMemcmp(p, str.c_str(), str.length()) )
|
wxMemcmp(p, str.c_str(), str.length()) )
|
||||||
{
|
{
|
||||||
//anchor again
|
//anchor again
|
||||||
p = wxMemchr(++p,
|
p = (const wxChar*)wxMemchr(++p,
|
||||||
str.c_str()[0],
|
str.c_str()[0],
|
||||||
length() - (p - c_str()));
|
length() - (p - c_str()));
|
||||||
|
|
||||||
@@ -506,7 +506,7 @@ size_t wxStringBase::find(wxChar ch, size_t nStart) const
|
|||||||
{
|
{
|
||||||
wxASSERT( nStart <= length() );
|
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();
|
return p == NULL ? npos : p - c_str();
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user