From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Tue, 30 Mar 2010 10:59:17 +0000 (+0000)
Subject: unordered_map: Clean-up includes and guards.
X-Git-Tag: releases/gcc-4.5.0~165
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c878d6baf6f7d453def3633b8701dfb623ccf72a;p=thirdparty%2Fgcc.git

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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 019e2b79cf47..06457d8bd728 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -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
diff --git a/libstdc++-v3/include/debug/list b/libstdc++-v3/include/debug/list
index 36caee4eb56b..39a648188304 100644
--- a/libstdc++-v3/include/debug/list
+++ b/libstdc++-v3/include/debug/list
@@ -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>
 
diff --git a/libstdc++-v3/include/debug/unordered_map b/libstdc++-v3/include/debug/unordered_map
index 6fef1e970577..e4c9fa213c5a 100644
--- a/libstdc++-v3/include/debug/unordered_map
+++ b/libstdc++-v3/include/debug/unordered_map
@@ -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
diff --git a/libstdc++-v3/include/debug/unordered_set b/libstdc++-v3/include/debug/unordered_set
index 09329b003673..2956bb04fc50 100644
--- a/libstdc++-v3/include/debug/unordered_set
+++ b/libstdc++-v3/include/debug/unordered_set
@@ -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
diff --git a/libstdc++-v3/include/profile/unordered_map b/libstdc++-v3/include/profile/unordered_map
index b9e67873d956..929a72d0e4c8 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 6dcdc8373986..453157cf941a 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