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

removed implicit conversion from wxString::iterator to wxStringImpl::iterator (fixes VC6 compilation)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45484 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-04-15 19:02:38 +00:00
parent 8a7afe4dfe
commit cf9a878b54
2 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/string.cpp
View File

@@ -507,7 +507,7 @@ void wxString::PosLenToImpl(size_t pos, size_t len,
else
{
const_iterator i = begin() + pos;
*implPos = wxStringImpl::const_iterator(i) - m_impl.begin();
*implPos = wxStringImpl::const_iterator(i.impl()) - m_impl.begin();
if ( len == npos )
*implLen = npos;
else
@@ -518,8 +518,7 @@ void wxString::PosLenToImpl(size_t pos, size_t len,
if ( pos + len > length() )
len = length() - pos;
*implLen = wxStringImpl::const_iterator(i + len) -
wxStringImpl::const_iterator(i);
*implLen = (i + len).impl() - i.impl();
}
}
}