From ffc47ff79631a80dbc7e497e7e9caec9751820e2 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 3 Feb 2011 01:55:09 -0700 Subject: Adapt the forwarding headers to MSVC compiler --- 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(+) (limited to 'stlport') diff --git a/stlport/systemstl/functional b/stlport/systemstl/functional index 50d6505038a1..2c555ba2573d 100644 --- a/stlport/systemstl/functional +++ b/stlport/systemstl/functional @@ -55,9 +55,13 @@ namespace std # endif } +#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 083188d1c504..8dfc514027e3 100644 --- a/stlport/systemstl/hash_map +++ b/stlport/systemstl/hash_map @@ -73,9 +73,18 @@ namespace std using __gnu_cxx::hash_multimap; } +#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 f7b0ffc3c013..9704396da066 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 13e3f09059fa..61a06888f22b 100644 --- a/stlport/systemstl/numeric +++ b/stlport/systemstl/numeric @@ -46,9 +46,13 @@ 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 965753c20ae2..8a50edafed20 100644 --- a/stlport/systemstl/vector +++ b/stlport/systemstl/vector @@ -43,8 +43,12 @@ namespace std typedef vector > bit_vector; } +#else +#ifdef _MSC_VER +#include <../include/vector> #else #error UNSUPPORTED COMPILER #endif #endif +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit