Commit c878d6ba by Paolo Carlini Committed by Paolo Carlini

unordered_map: Clean-up includes and guards.

2010-03-30  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/debug/unordered_map: Clean-up includes and guards.
	* include/debug/unordered_set: Likewise.
	* include/debug/list: Likewise.
	* include/profile/unordered_map: Likewise.
	* include/profile/unordered_set: Likewise.

From-SVN: r157818
parent 15baf7f8
2010-03-30 Paolo Carlini <paolo.carlini@oracle.com>
* include/debug/unordered_map: Clean-up includes and guards.
* include/debug/unordered_set: Likewise.
* include/debug/list: Likewise.
* include/profile/unordered_map: Likewise.
* include/profile/unordered_set: Likewise.
2010-03-29 John David Anglin <dave.anglin@nrc-cnrc.gc.ca> 2010-03-29 John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
PR target/43458 PR target/43458
......
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#define _GLIBCXX_DEBUG_LIST 1 #define _GLIBCXX_DEBUG_LIST 1
#include <list> #include <list>
#include <bits/stl_algo.h>
#include <debug/safe_sequence.h> #include <debug/safe_sequence.h>
#include <debug/safe_iterator.h> #include <debug/safe_iterator.h>
......
...@@ -30,15 +30,13 @@ ...@@ -30,15 +30,13 @@
#ifndef _GLIBCXX_DEBUG_UNORDERED_MAP #ifndef _GLIBCXX_DEBUG_UNORDERED_MAP
#define _GLIBCXX_DEBUG_UNORDERED_MAP 1 #define _GLIBCXX_DEBUG_UNORDERED_MAP 1
#ifdef __GXX_EXPERIMENTAL_CXX0X__ #ifndef __GXX_EXPERIMENTAL_CXX0X__
# include <unordered_map>
#else
# include <bits/c++0x_warning.h> # include <bits/c++0x_warning.h>
#endif #else
# include <unordered_map>
#include <debug/safe_sequence.h> #include <debug/safe_sequence.h>
#include <debug/safe_iterator.h> #include <debug/safe_iterator.h>
#include <initializer_list>
namespace std namespace std
{ {
...@@ -555,4 +553,6 @@ namespace __debug ...@@ -555,4 +553,6 @@ namespace __debug
} // namespace __debug } // namespace __debug
} // namespace std } // namespace std
#endif // __GXX_EXPERIMENTAL_CXX0X__
#endif #endif
...@@ -30,15 +30,13 @@ ...@@ -30,15 +30,13 @@
#ifndef _GLIBCXX_DEBUG_UNORDERED_SET #ifndef _GLIBCXX_DEBUG_UNORDERED_SET
#define _GLIBCXX_DEBUG_UNORDERED_SET 1 #define _GLIBCXX_DEBUG_UNORDERED_SET 1
#ifdef __GXX_EXPERIMENTAL_CXX0X__ #ifndef __GXX_EXPERIMENTAL_CXX0X__
# include <unordered_set>
#else
# include <bits/c++0x_warning.h> # include <bits/c++0x_warning.h>
#endif #else
# include <unordered_set>
#include <debug/safe_sequence.h> #include <debug/safe_sequence.h>
#include <debug/safe_iterator.h> #include <debug/safe_iterator.h>
#include <initializer_list>
namespace std namespace std
{ {
...@@ -548,4 +546,6 @@ namespace __debug ...@@ -548,4 +546,6 @@ namespace __debug
} // namespace __debug } // namespace __debug
} // namespace std } // namespace std
#endif // __GXX_EXPERIMENTAL_CXX0X__
#endif #endif
...@@ -34,15 +34,12 @@ ...@@ -34,15 +34,12 @@
#ifndef _GLIBCXX_PROFILE_UNORDERED_MAP #ifndef _GLIBCXX_PROFILE_UNORDERED_MAP
#define _GLIBCXX_PROFILE_UNORDERED_MAP 1 #define _GLIBCXX_PROFILE_UNORDERED_MAP 1
#include <profile/base.h> #ifndef __GXX_EXPERIMENTAL_CXX0X__
#ifdef __GXX_EXPERIMENTAL_CXX0X__
# include <unordered_map>
#else
# include <bits/c++0x_warning.h> # 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_BASE unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>
#define _GLIBCXX_STD_BASE _GLIBCXX_STD_PR::_GLIBCXX_BASE #define _GLIBCXX_STD_BASE _GLIBCXX_STD_PR::_GLIBCXX_BASE
...@@ -516,4 +513,6 @@ namespace __profile ...@@ -516,4 +513,6 @@ namespace __profile
#undef _GLIBCXX_BASE #undef _GLIBCXX_BASE
#undef _GLIBCXX_STD_BASE #undef _GLIBCXX_STD_BASE
#endif // __GXX_EXPERIMENTAL_CXX0X__
#endif #endif
...@@ -34,15 +34,12 @@ ...@@ -34,15 +34,12 @@
#ifndef _GLIBCXX_PROFILE_UNORDERED_SET #ifndef _GLIBCXX_PROFILE_UNORDERED_SET
#define _GLIBCXX_PROFILE_UNORDERED_SET 1 #define _GLIBCXX_PROFILE_UNORDERED_SET 1
#include <profile/base.h> #ifndef __GXX_EXPERIMENTAL_CXX0X__
#ifdef __GXX_EXPERIMENTAL_CXX0X__
# include <unordered_set>
#else
# include <bits/c++0x_warning.h> # 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_BASE unordered_set<_Key, _Hash, _Pred, _Alloc>
#define _GLIBCXX_STD_BASE _GLIBCXX_STD_PR::_GLIBCXX_BASE #define _GLIBCXX_STD_BASE _GLIBCXX_STD_PR::_GLIBCXX_BASE
...@@ -504,4 +501,6 @@ namespace __profile ...@@ -504,4 +501,6 @@ namespace __profile
#undef _GLIBCXX_BASE #undef _GLIBCXX_BASE
#undef _GLIBCXX_STD_BASE #undef _GLIBCXX_STD_BASE
#endif // __GXX_EXPERIMENTAL_CXX0X__
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment