From: Jonathan Wakely <jwakely.gcc@gmail.com>
To: "libstdc++" <libstdc++@gcc.gnu.org>,
gcc-patches <gcc-patches@gcc.gnu.org>
Subject: [patch] fix libstdc++/55631
Date: Tue, 11 Dec 2012 22:31:00 -0000 [thread overview]
Message-ID: <CAH6eHdTqQtfD+xZg1Mo7Qt3oiFep62GRsM96=KkGgc9pRnuWoQ@mail.gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 281 bytes --]
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.
Tested x86_64-linux, committed to trunk.
[-- Attachment #2: patch.txt --]
[-- Type: text/plain, Size: 2204 bytes --]
commit 4e4d3c624f02150044702ff9bff695c2c168308f
Author: Jonathan Wakely <jwakely.gcc@gmail.com>
Date: Tue Dec 11 19:29:27 2012 +0000
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.
diff --git a/libstdc++-v3/include/ext/alloc_traits.h b/libstdc++-v3/include/ext/alloc_traits.h
index a0834c3..b46b0fc 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 5592a77..b3c8687 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 f85ab99..7df905f 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 5e2a78b..89add48 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
next reply other threads:[~2012-12-11 22:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-11 22:31 Jonathan Wakely [this message]
2012-12-12 23:05 ` Jonathan Wakely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAH6eHdTqQtfD+xZg1Mo7Qt3oiFep62GRsM96=KkGgc9pRnuWoQ@mail.gmail.com' \
--to=jwakely.gcc@gmail.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=libstdc++@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).