Another STL compilation fix.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/stc/PlatWX.cpp b/contrib/src/stc/PlatWX.cpp
index 2e5309ef256b9d6fe163181416a32a2d5f45ed56..fabec08d8372982dbb9b63a4a8ef68739dfd0d29 100644 (file)
--- a/contrib/src/stc/PlatWX.cpp
+++ b/contrib/src/stc/PlatWX.cpp
@@ -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
 #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
     memcpy(positions, tpos.begin(), len * sizeof(int));
 #endif

+#endif

 }
 
 
 }
 
 

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index 2e5309ef256b9d6fe163181416a32a2d5f45ed56..fabec08d8372982dbb9b63a4a8ef68739dfd0d29 100644 (file)
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -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
 #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
     memcpy(positions, tpos.begin(), len * sizeof(int));
 #endif

+#endif

 }
 
 
 }