diff options
Diffstat (limited to 'stlport')
| -rw-r--r-- | stlport/systemstl/functional | 21 | ||||
| -rw-r--r-- | stlport/systemstl/hash_map | 17 | ||||
| -rw-r--r-- | stlport/systemstl/hash_set | 16 | ||||
| -rw-r--r-- | stlport/systemstl/numeric | 14 | ||||
| -rw-r--r-- | stlport/systemstl/rope | 4 | ||||
| -rw-r--r-- | stlport/systemstl/slist | 3 |
6 files changed, 47 insertions, 28 deletions
diff --git a/stlport/systemstl/functional b/stlport/systemstl/functional index 6fb7e66330f6..232cddbef5ad 100644 --- a/stlport/systemstl/functional +++ b/stlport/systemstl/functional @@ -32,30 +32,33 @@ #define SYSTEM_STL_FUNCTIONAL #ifdef GCC -#ifdef __MINGW32__ +# ifdef __MINGW32__ # define _SYSTEM_STL_MAKE_HEADER(path,header) <path/header> # include _SYSTEM_STL_MAKE_HEADER(GXX_INCLUDE_PATH,functional) -#else +# else # include <ext/../functional> -#endif -#include <ext/functional> +# endif +# include <ext/functional> namespace std { - using __gnu_cxx::select1st; - using __gnu_cxx::select2nd; using __gnu_cxx::project1st; using __gnu_cxx::project2nd; - using __gnu_cxx::unary_compose; - using __gnu_cxx::binary_compose; + using __gnu_cxx::select1st; + using __gnu_cxx::select2nd; using __gnu_cxx::compose1; using __gnu_cxx::compose2; + using __gnu_cxx::unary_compose; + using __gnu_cxx::binary_compose; +# ifndef __GXX_EXPERIMENTAL_CXX0X__ using __gnu_cxx::identity; using __gnu_cxx::mem_fun1; using __gnu_cxx::mem_fun1_ref; +# endif } + #else -#error UNSUPPORTED COMPILER +# error UNSUPPORTED COMPILER #endif #endif diff --git a/stlport/systemstl/hash_map b/stlport/systemstl/hash_map index e855427f2c67..b969b11b211b 100644 --- a/stlport/systemstl/hash_map +++ b/stlport/systemstl/hash_map @@ -31,11 +31,14 @@ #ifndef SYSTEM_STL_HASHMAP #define SYSTEM_STL_HASHMAP -#define _BACKWARD_BACKWARD_WARNING_H 1 -#include <ext/hash_map> -#undef _BACKWARD_BACKWARD_WARNING_H - #ifdef GCC + +# include <functional> + +# define _BACKWARD_BACKWARD_WARNING_H 1 +# include <ext/hash_map> +# undef _BACKWARD_BACKWARD_WARNING_H + namespace __gnu_cxx { template<> struct hash < std::string > @@ -62,14 +65,18 @@ namespace __gnu_cxx } }; } + namespace std { +# ifndef __GXX_EXPERIMENTAL_CXX0X__ using __gnu_cxx::hash; +# endif using __gnu_cxx::hash_map; using __gnu_cxx::hash_multimap; } + #else -#error UNSUPPORTED COMPILER +# error UNSUPPORTED COMPILER #endif diff --git a/stlport/systemstl/hash_set b/stlport/systemstl/hash_set index 35ceccad40d1..89c4b51853dd 100644 --- a/stlport/systemstl/hash_set +++ b/stlport/systemstl/hash_set @@ -31,21 +31,25 @@ #ifndef SYSTEM_STL_HASHSET #define SYSTEM_STL_HASHSET -#define _BACKWARD_BACKWARD_WARNING_H 1 -#include <ext/hash_set> -#undef _BACKWARD_BACKWARD_WARNING_H - #ifdef GCC + +# include <functional> + +# define _BACKWARD_BACKWARD_WARNING_H 1 +# include <ext/hash_set> +# undef _BACKWARD_BACKWARD_WARNING_H + namespace std { +# ifndef __GXX_EXPERIMENTAL_CXX0X__ using __gnu_cxx::hash; +# endif using __gnu_cxx::hash_set; using __gnu_cxx::hash_multiset; } #else -#error UNSUPPORTED COMPILER +# error UNSUPPORTED COMPILER #endif - #endif /* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/stlport/systemstl/numeric b/stlport/systemstl/numeric index d18328bc5363..5ea17ad0758a 100644 --- a/stlport/systemstl/numeric +++ b/stlport/systemstl/numeric @@ -32,22 +32,24 @@ #define SYSTEM_STL_NUMERIC #ifdef GCC -#include <functional> -#ifdef __MINGW32__ +# include <functional> +# ifdef __MINGW32__ # define _SYSTEM_STL_MAKE_HEADER(path,header) <path/header> # include _SYSTEM_STL_MAKE_HEADER(GXX_INCLUDE_PATH,numeric) -#else +# else # include <ext/../numeric> -#endif -#include <ext/numeric> +# endif +# include <ext/numeric> +# ifndef __GXX_EXPERIMENTAL_CXX0X__ namespace std { using __gnu_cxx::iota; } +# endif #else -#error UNSUPPORTED COMPILER +# error UNSUPPORTED COMPILER #endif #endif diff --git a/stlport/systemstl/rope b/stlport/systemstl/rope index 6441d9549988..c6349947ca7b 100644 --- a/stlport/systemstl/rope +++ b/stlport/systemstl/rope @@ -33,9 +33,11 @@ #include <functional> #include <numeric> -#include <ext/rope> #ifdef GCC + +#include <ext/rope> + namespace std { using __gnu_cxx::rope; diff --git a/stlport/systemstl/slist b/stlport/systemstl/slist index 27a46f9b23c1..48a37c2fd512 100644 --- a/stlport/systemstl/slist +++ b/stlport/systemstl/slist @@ -31,9 +31,10 @@ #ifndef SYSTEM_STL_SLIST #define SYSTEM_STL_SLIST +#ifdef GCC + #include <ext/slist> -#ifdef GCC namespace std { using __gnu_cxx::slist; |