From: Mattia Barbon <mbarbon@cpan.org>
Date: Sun, 24 Apr 2005 15:56:00 +0000 (+0000)
Subject:   Another STL compilation fix.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f3ee029e052f2b8b3ea36ca9afd94809834bb8cf

  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 2e5309ef25..fabec08d83 100644
--- 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
+#if wxUSE_STL
+    std::copy(tpos.begin(), tpos.end(), positions);
+#else
     memcpy(positions, tpos.begin(), len * sizeof(int));
 #endif
+#endif
 }
 
 
diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index 2e5309ef25..fabec08d83 100644
--- 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
+#if wxUSE_STL
+    std::copy(tpos.begin(), tpos.end(), positions);
+#else
     memcpy(positions, tpos.begin(), len * sizeof(int));
 #endif
+#endif
 }