summaryrefslogtreecommitdiff
path: root/stlport
diff options
context:
space:
mode:
authorWei Ming Khoo <weimzz@gmail.com>2012-02-19 15:56:46 +0000
committerMichael Meeks <michael.meeks@suse.com>2012-02-20 16:32:51 +0000
commitfaca71ef8abc4a6507d40cf19cdb20be7e63e2cf (patch)
tree36f29a33c33a6fad3de26d45e30ababae671b078 /stlport
parentc450d9645d1a06cf00c65272471bc7d03f28f353 (diff)
stlport stl/_locale.h new operator unrecognized
Diffstat (limited to 'stlport')
-rw-r--r--stlport/STLport-4.5-clang_locale_h.patch11
-rw-r--r--stlport/makefile.mk3
2 files changed, 13 insertions, 1 deletions
diff --git a/stlport/STLport-4.5-clang_locale_h.patch b/stlport/STLport-4.5-clang_locale_h.patch
new file mode 100644
index 000000000000..8cbfbfc234aa
--- /dev/null
+++ b/stlport/STLport-4.5-clang_locale_h.patch
@@ -0,0 +1,11 @@
+--- 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);
+ }
diff --git a/stlport/makefile.mk b/stlport/makefile.mk
index 9211a5e117fd..3e4a8deaec0f 100644
--- 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