[Libreoffice-commits] .: stlport/systemstlguards

[Caolán McNamara]

 stlport/systemstlguards/preextstl.h |   15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

New commits:
commit 45751c678386a973194989275b09d405aa6ab510
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 10 21:33:32 2010 +0000

    extend this horrific hack for gcc 4.5.1

diff --git a/stlport/systemstlguards/preextstl.h b/stlport/systemstlguards/preextstl.h
index 279f047..d0ee030 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)