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
This commit is contained in:
Paolo Carlini 2010-03-30 10:59:17 +00:00 committed by Paolo Carlini
parent 15baf7f802
commit c878d6baf6
6 changed files with 30 additions and 25 deletions

View File

@ -1,3 +1,11 @@
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>
PR target/43458

View File

@ -31,7 +31,6 @@
#define _GLIBCXX_DEBUG_LIST 1
#include <list>
#include <bits/stl_algo.h>
#include <debug/safe_sequence.h>
#include <debug/safe_iterator.h>

View File

@ -30,15 +30,13 @@
#ifndef _GLIBCXX_DEBUG_UNORDERED_MAP
#define _GLIBCXX_DEBUG_UNORDERED_MAP 1
#ifdef __GXX_EXPERIMENTAL_CXX0X__
# include <unordered_map>
#else
#ifndef __GXX_EXPERIMENTAL_CXX0X__
# include <bits/c++0x_warning.h>
#endif
#else
# include <unordered_map>
#include <debug/safe_sequence.h>
#include <debug/safe_iterator.h>
#include <initializer_list>
namespace std
{
@ -555,4 +553,6 @@ namespace __debug
} // namespace __debug
} // namespace std
#endif // __GXX_EXPERIMENTAL_CXX0X__
#endif

View File

@ -30,15 +30,13 @@
#ifndef _GLIBCXX_DEBUG_UNORDERED_SET
#define _GLIBCXX_DEBUG_UNORDERED_SET 1
#ifdef __GXX_EXPERIMENTAL_CXX0X__
# include <unordered_set>
#else
#ifndef __GXX_EXPERIMENTAL_CXX0X__
# include <bits/c++0x_warning.h>
#endif
#else
# include <unordered_set>
#include <debug/safe_sequence.h>
#include <debug/safe_iterator.h>
#include <initializer_list>
namespace std
{
@ -548,4 +546,6 @@ namespace __debug
} // namespace __debug
} // namespace std
#endif // __GXX_EXPERIMENTAL_CXX0X__
#endif

View File

@ -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

View File

@ -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