Another STL compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -403,8 +403,12 @@ void SurfaceImpl::MeasureWidths(Font &font, const char *s, int len, int *positio
|
||||
#else
|
||||
|
||||
// If not unicode then just use the widths we have
|
||||
#if wxUSE_STL
|
||||
std::copy(tpos.begin(), tpos.end(), positions);
|
||||
#else
|
||||
memcpy(positions, tpos.begin(), len * sizeof(int));
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
@@ -403,8 +403,12 @@ void SurfaceImpl::MeasureWidths(Font &font, const char *s, int len, int *positio
|
||||
#else
|
||||
|
||||
// If not unicode then just use the widths we have
|
||||
#if wxUSE_STL
|
||||
std::copy(tpos.begin(), tpos.end(), positions);
|
||||
#else
|
||||
memcpy(positions, tpos.begin(), len * sizeof(int));
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user