[Libreoffice-commits] .: stlport/systemstl

Fridrich Strba fridrich at kemper.freedesktop.org
Thu Feb 3 01:12:29 PST 2011


 stlport/systemstl/functional |    4 ++++
 stlport/systemstl/hash_map   |    9 +++++++++
 stlport/systemstl/hash_set   |    9 +++++++++
 stlport/systemstl/numeric    |    4 ++++
 stlport/systemstl/vector     |    4 ++++
 5 files changed, 30 insertions(+)

New commits:
commit 498932c939960c3988b8eaef41e84bd364d56807
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date:   Thu Feb 3 01:55:09 2011 -0700

    Adapt the forwarding headers to MSVC compiler

diff --git a/stlport/systemstl/functional b/stlport/systemstl/functional
index 50d6505..2c555ba 100644
--- a/stlport/systemstl/functional
+++ b/stlport/systemstl/functional
@@ -56,8 +56,12 @@ namespace std
 }
 
 #else
+#ifdef _MSC_VER
+#include <../include/functional>
+#else
 # error UNSUPPORTED COMPILER
 #endif
+#endif
 
 #endif
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stlport/systemstl/hash_map b/stlport/systemstl/hash_map
index 083188d..8dfc514 100644
--- a/stlport/systemstl/hash_map
+++ b/stlport/systemstl/hash_map
@@ -74,8 +74,17 @@ namespace std
 }
 
 #else
+#ifdef _MSC_VER
+#define USE_MSVC_HASH_MAP
+#include <../include/hash_map>
+namespace std
+{
+	using namespace stdext;
+}
+#else
 # error UNSUPPORTED COMPILER
 #endif
+#endif
 
 
 #endif
diff --git a/stlport/systemstl/hash_set b/stlport/systemstl/hash_set
index f7b0ffc..9704396 100644
--- a/stlport/systemstl/hash_set
+++ b/stlport/systemstl/hash_set
@@ -46,8 +46,17 @@ namespace std
 	using __gnu_cxx::hash_multiset;
 }
 #else
+#ifdef _MSC_VER
+#define USE_MSVC_HASH_SET
+#include <../include/hash_set>
+namespace std
+{
+	using namespace stdext;
+}
+#else
 # error UNSUPPORTED COMPILER
 #endif
+#endif
 
 #endif
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stlport/systemstl/numeric b/stlport/systemstl/numeric
index 13e3f09..61a0688 100644
--- a/stlport/systemstl/numeric
+++ b/stlport/systemstl/numeric
@@ -47,8 +47,12 @@ namespace std
 # endif
 
 #else
+#ifdef _MSC_VER
+#include <../include/numeric>
+#else
 # error UNSUPPORTED COMPILER
 #endif
+#endif
 
 #endif
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stlport/systemstl/vector b/stlport/systemstl/vector
index 965753c..8a50eda 100644
--- a/stlport/systemstl/vector
+++ b/stlport/systemstl/vector
@@ -44,7 +44,11 @@ namespace std
 }
 
 #else
+#ifdef _MSC_VER
+#include <../include/vector>
+#else
 #error UNSUPPORTED COMPILER
 #endif
 #endif
+#endif
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list