stlport stl/_locale.h new operator unrecognized

faca71ef · Wei Ming Khoo · Michael Meeks · c450d964 · faca71ef · faca71ef
Kaydet (Commit) faca71ef authored Şub 19, 2012 tarafından Wei Ming Khoo Kaydeden (comit) Michael Meeks Şub 20, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 1 deletion

STLport-4.5-clang_locale_h.patch stlport/STLport-4.5-clang_locale_h.patch +11 -0

makefile.mk stlport/makefile.mk +2 -1

No files found.
--- a/stlport/STLport-4.5-clang_locale_h.patch
+++ b/stlport/STLport-4.5-clang_locale_h.patch
+--- misc/STLport-4.5/stlport/stl/_locale.h	2001-07-06 05:16:18.000000000 +0100
+++ misc/build/STLport-4.5/stlport/stl/_locale.h	2012-02-18 18:17:18.338109337 +0000
+@@ -120,7 +120,7 @@
+   locale(const locale& __loc, _Facet* __f) : _M_impl(0)
+     {
+       //      _M_impl = this->_S_copy_impl(__loc._M_impl, __f != 0);
+-      new(this) locale(__loc._M_impl, __f != 0);
+      new locale(__loc._M_impl, __f != 0);
+       if (__f != 0)
+         this->_M_insert(__f, _Facet::id);
+     }
--- a/stlport/makefile.mk
+++ b/stlport/makefile.mk
@@ -49,7 +49,8 @@ all:
    PATCH_FILES=\
                STLport-4.5.patch \
                STLport-4.5-gcc43_warnings.patch \
-                STLport-4.5-cxx0x.patch
+                STLport-4.5-cxx0x.patch \
+                STLport-4.5-clang_locale_h.patch
 .ELIF "$(GUI)"=="WNT"
    TARFILE_NAME=STLport-4.5-0119
    TARFILE_MD5=7376930b0d3f3d77a685d94c4a3acda8