From 3c523cf8a8686d043208948f2e76a34ecb045114 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely.gcc@gmail.com>
Date: Tue, 11 Dec 2012 22:28:01 +0000
Subject: [PATCH] re PR libstdc++/55631 (Several ext/ headers can not be
#included on their own)
PR libstdc++/55631
* include/ext/alloc_traits.h: Include missing header.
* include/ext/pointer.h: Likewise.
* include/ext/string_conversions.h: Require C++11.
* libsupc++/initializer_list: Reindent.
From-SVN: r194429
---
libstdc++-v3/ChangeLog | 8 ++++++++
libstdc++-v3/include/ext/alloc_traits.h | 1 +
libstdc++-v3/include/ext/pointer.h | 1 +
libstdc++-v3/include/ext/string_conversions.h | 6 ++++++
libstdc++-v3/libsupc++/initializer_list | 2 +-
5 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 34cd0a5283ab..324ef51066e2 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2012-12-11 Jonathan Wakely <jwakely.gcc@gmail.com>
+
+ PR libstdc++/55631
+ * include/ext/alloc_traits.h: Include missing header.
+ * include/ext/pointer.h: Likewise.
+ * include/ext/string_conversions.h: Require C++11.
+ * libsupc++/initializer_list: Reindent.
+
2012-12-10 Benjamin Kosnik <bkoz@redhat.com>
* doc/Makefile.am (xml_sources_manual): Add
diff --git a/libstdc++-v3/include/ext/alloc_traits.h b/libstdc++-v3/include/ext/alloc_traits.h
index a0834c36c855..b46b0fc119e5 100644
--- a/libstdc++-v3/include/ext/alloc_traits.h
+++ b/libstdc++-v3/include/ext/alloc_traits.h
@@ -32,6 +32,7 @@
#pragma GCC system_header
#if __cplusplus >= 201103L
+# include <bits/move.h>
# include <bits/alloc_traits.h>
#else
# include <bits/allocator.h> // for __alloc_swap
diff --git a/libstdc++-v3/include/ext/pointer.h b/libstdc++-v3/include/ext/pointer.h
index 5592a77b3e13..b3c868745639 100644
--- a/libstdc++-v3/include/ext/pointer.h
+++ b/libstdc++-v3/include/ext/pointer.h
@@ -43,6 +43,7 @@
#include <ext/cast.h>
#include <ext/type_traits.h>
#if __cplusplus >= 201103L
+# include <bits/move.h>
# include <bits/ptr_traits.h>
#endif
diff --git a/libstdc++-v3/include/ext/string_conversions.h b/libstdc++-v3/include/ext/string_conversions.h
index f85ab99235c8..7df905fd6b25 100644
--- a/libstdc++-v3/include/ext/string_conversions.h
+++ b/libstdc++-v3/include/ext/string_conversions.h
@@ -31,6 +31,10 @@
#pragma GCC system_header
+#if __cplusplus < 201103L
+# include <bits/c++0x_warning.h>
+#else
+
#include <bits/c++config.h>
#include <ext/numeric_traits.h>
#include <bits/functexcept.h>
@@ -98,4 +102,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace
+#endif // C++11
+
#endif // _STRING_CONVERSIONS_H
diff --git a/libstdc++-v3/libsupc++/initializer_list b/libstdc++-v3/libsupc++/initializer_list
index 5e2a78bb97de..89add48d78cd 100644
--- a/libstdc++-v3/libsupc++/initializer_list
+++ b/libstdc++-v3/libsupc++/initializer_list
@@ -77,7 +77,7 @@ namespace std
// One past the last element.
constexpr const_iterator
end() const noexcept { return begin() + size(); }
- };
+ };
/**
* @brief Return an iterator pointing to the first element of
--
GitLab