From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 0D33B385701E; Thu, 8 Oct 2020 00:36:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0D33B385701E Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r8-10573] libstdc++: Fix non-reserved name in header X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-8 X-Git-Oldrev: 775c628e44e073df45e22a7b557f184e8966d05e X-Git-Newrev: ba597a9fad83b3721c5a4d30d9fcf27f8a29eb86 Message-Id: <20201008003658.0D33B385701E@sourceware.org> Date: Thu, 8 Oct 2020 00:36:58 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Oct 2020 00:36:58 -0000 https://gcc.gnu.org/g:ba597a9fad83b3721c5a4d30d9fcf27f8a29eb86 commit r8-10573-gba597a9fad83b3721c5a4d30d9fcf27f8a29eb86 Author: Jonathan Wakely 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 which is only reserved since C++14. libstdc++-v3/ChangeLog: * include/bits/random.h (seed_seq(initializer_list)): 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 - seed_seq(std::initializer_list<_IntType> il); + seed_seq(std::initializer_list<_IntType> __il); template 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 +// defines operator""il +#define il ( +#endif + #if __cplusplus < 201703L // defines to_chars_result::ptr and to_chars_result::ec #define ec (