* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@157818
138bc75d-0d04-0410-961f-
82ee72b054a4
+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
#define _GLIBCXX_DEBUG_LIST 1
#include <list>
-#include <bits/stl_algo.h>
#include <debug/safe_sequence.h>
#include <debug/safe_iterator.h>
#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
{
} // namespace __debug
} // namespace std
+#endif // __GXX_EXPERIMENTAL_CXX0X__
+
#endif
#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
{
} // namespace __debug
} // namespace std
+#endif // __GXX_EXPERIMENTAL_CXX0X__
+
#endif
#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
#undef _GLIBCXX_BASE
#undef _GLIBCXX_STD_BASE
+#endif // __GXX_EXPERIMENTAL_CXX0X__
+
#endif
#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
#undef _GLIBCXX_BASE
#undef _GLIBCXX_STD_BASE
+#endif // __GXX_EXPERIMENTAL_CXX0X__
+
#endif