public inbox for libstdc++-cvs@sourceware.org help / color / mirror / Atom feed
From: Jonathan Wakely <redi@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r8-10573] libstdc++: Fix non-reserved name in header Date: Thu, 8 Oct 2020 00:36:58 +0000 (GMT) [thread overview] Message-ID: <20201008003658.0D33B385701E@sourceware.org> (raw) https://gcc.gnu.org/g:ba597a9fad83b3721c5a4d30d9fcf27f8a29eb86 commit r8-10573-gba597a9fad83b3721c5a4d30d9fcf27f8a29eb86 Author: Jonathan Wakely <jwakely@redhat.com> Date: Thu Oct 8 00:05:53 2020 +0100 libstdc++: Fix non-reserved name in header There's a "il" parameter in a std::seed_seq constructor in <random> which is only reserved since C++14. libstdc++-v3/ChangeLog: * include/bits/random.h (seed_seq(initializer_list<T>)): Rename parameter to use reserved name. * testsuite/17_intro/names.cc: Check "il". (cherry picked from commit 23f75da95f5e8e09e9fcbd5b0d2885e6c44739aa) Diff: --- libstdc++-v3/include/bits/random.h | 2 +- libstdc++-v3/testsuite/17_intro/names.cc | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/include/bits/random.h b/libstdc++-v3/include/bits/random.h index ccd5c834db8..50da41615d5 100644 --- a/libstdc++-v3/include/bits/random.h +++ b/libstdc++-v3/include/bits/random.h @@ -5968,7 +5968,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { } template<typename _IntType> - seed_seq(std::initializer_list<_IntType> il); + seed_seq(std::initializer_list<_IntType> __il); template<typename _InputIterator> seed_seq(_InputIterator __begin, _InputIterator __end); diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc index dad7ba970aa..d758138dfb1 100644 --- a/libstdc++-v3/testsuite/17_intro/names.cc +++ b/libstdc++-v3/testsuite/17_intro/names.cc @@ -104,6 +104,11 @@ #define uses_allocator ( #endif +#if __cplusplus < 201402L +// <complex> defines operator""il +#define il ( +#endif + #if __cplusplus < 201703L // <charconv> defines to_chars_result::ptr and to_chars_result::ec #define ec (
reply other threads:[~2020-10-08 0:36 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20201008003658.0D33B385701E@sourceware.org \ --to=redi@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ --cc=libstdc++-cvs@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: linkBe 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).