diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-04-05 17:41:56 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-04-05 17:41:56 +0000 |
| commit | c452411be99a3dd64572e605b7ce6f8ab3c7489d (patch) | |
| tree | de53c0af57b416089c977887a63fcfd302a9ca6d /libstdc++-v3/include/profile | |
| parent | 30da32a1db8fade012e59aef1144c2aab9ea9d21 (diff) | |
| download | gcc-c452411be99a3dd64572e605b7ce6f8ab3c7489d.tar.gz | |
2010-04-05 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 157965
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@157967 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/profile')
| -rw-r--r-- | libstdc++-v3/include/profile/unordered_map | 13 | ||||
| -rw-r--r-- | libstdc++-v3/include/profile/unordered_set | 13 |
2 files changed, 12 insertions, 14 deletions
diff --git a/libstdc++-v3/include/profile/unordered_map b/libstdc++-v3/include/profile/unordered_map index b9e67873d95..929a72d0e4c 100644 --- a/libstdc++-v3/include/profile/unordered_map +++ b/libstdc++-v3/include/profile/unordered_map @@ -34,15 +34,12 @@ #ifndef _GLIBCXX_PROFILE_UNORDERED_MAP #define _GLIBCXX_PROFILE_UNORDERED_MAP 1 -#include <profile/base.h> - -#ifdef __GXX_EXPERIMENTAL_CXX0X__ -# include <unordered_map> -#else +#ifndef __GXX_EXPERIMENTAL_CXX0X__ # include <bits/c++0x_warning.h> -#endif +#else +# include <unordered_map> -#include <initializer_list> +#include <profile/base.h> #define _GLIBCXX_BASE unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc> #define _GLIBCXX_STD_BASE _GLIBCXX_STD_PR::_GLIBCXX_BASE @@ -516,4 +513,6 @@ namespace __profile #undef _GLIBCXX_BASE #undef _GLIBCXX_STD_BASE +#endif // __GXX_EXPERIMENTAL_CXX0X__ + #endif diff --git a/libstdc++-v3/include/profile/unordered_set b/libstdc++-v3/include/profile/unordered_set index 6dcdc837398..453157cf941 100644 --- a/libstdc++-v3/include/profile/unordered_set +++ b/libstdc++-v3/include/profile/unordered_set @@ -34,15 +34,12 @@ #ifndef _GLIBCXX_PROFILE_UNORDERED_SET #define _GLIBCXX_PROFILE_UNORDERED_SET 1 -#include <profile/base.h> - -#ifdef __GXX_EXPERIMENTAL_CXX0X__ -# include <unordered_set> -#else +#ifndef __GXX_EXPERIMENTAL_CXX0X__ # include <bits/c++0x_warning.h> -#endif +#else +# include <unordered_set> -#include <initializer_list> +#include <profile/base.h> #define _GLIBCXX_BASE unordered_set<_Key, _Hash, _Pred, _Alloc> #define _GLIBCXX_STD_BASE _GLIBCXX_STD_PR::_GLIBCXX_BASE @@ -504,4 +501,6 @@ namespace __profile #undef _GLIBCXX_BASE #undef _GLIBCXX_STD_BASE +#endif // __GXX_EXPERIMENTAL_CXX0X__ + #endif |