summaryrefslogtreecommitdiff
path: root/stlport
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2010-12-10 21:33:32 +0000
committerCaolán McNamara <caolanm@redhat.com>2010-12-10 21:33:32 +0000
commit70ec8050c88f4e953d22e9a20f680a0db182476b (patch)
tree0ad562cb8d40b76a7767dcc5b5daf94dd98b9014 /stlport
parent1af7bd64334745e9bbfc8006d77ce47c809cf97e (diff)
extend this horrific hack for gcc 4.5.1
Diffstat (limited to 'stlport')
-rw-r--r--stlport/systemstlguards/preextstl.h15
1 files changed, 12 insertions, 3 deletions
diff --git a/stlport/systemstlguards/preextstl.h b/stlport/systemstlguards/preextstl.h
index 279f047bd9c8..d0ee030491e8 100644
--- a/stlport/systemstlguards/preextstl.h
+++ b/stlport/systemstlguards/preextstl.h
@@ -50,11 +50,20 @@
# endif
# include _STLP_NATIVE_HEADER(exception_defines.h)
# include _STLP_NATIVE_HEADER(limits)
-# include _STLP_NATIVE_HEADER(memory)
+# if !defined(__GXX_EXPERIMENTAL_CXX0X__)
+# include _STLP_NATIVE_HEADER(memory)
+# endif
# include _STLP_NATIVE_HEADER(exception)
# include _STLP_NATIVE_HEADER(iosfwd)
-# include _STLP_NATIVE_HEADER(algorithm)
-# include _STLP_NATIVE_HEADER(string)
+# if !defined(__GXX_EXPERIMENTAL_CXX0X__)
+# include _STLP_NATIVE_HEADER(algorithm)
+# include _STLP_NATIVE_HEADER(string)
+# else
+# include _STLP_NATIVE_HEADER(vector)
+# include _STLP_NATIVE_HEADER(string)
+# include _STLP_NATIVE_HEADER(numeric)
+# include _STLP_NATIVE_HEADER(algorithm)
+# endif
# include _STLP_NATIVE_HEADER(streambuf)
# include _STLP_NATIVE_HEADER(ios)
# include _STLP_NATIVE_HEADER(locale)