From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 65B183855002; Tue, 22 Jun 2021 20:29:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 65B183855002 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-1734] libstdc++: Implement LWG 3422 for std::seed_seq X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: f61e5d4d8b6d4cfa96863187fa61b8c6b057a491 X-Git-Newrev: 6c63cb231e4cf99552bb7904ebe402f7adcafda4 Message-Id: <20210622202946.65B183855002@sourceware.org> Date: Tue, 22 Jun 2021 20:29:46 +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: Tue, 22 Jun 2021 20:29:46 -0000 https://gcc.gnu.org/g:6c63cb231e4cf99552bb7904ebe402f7adcafda4 commit r12-1734-g6c63cb231e4cf99552bb7904ebe402f7adcafda4 Author: Jonathan Wakely Date: Tue Jun 22 18:05:11 2021 +0100 libstdc++: Implement LWG 3422 for std::seed_seq This ensures that the std::seed_seq initializer-list constructor will not be used for list-initialization unless the initializers in the list are integers. This allows list-initialization syntax to be used with a pair of pointers and for that to use the appropriate constructor. Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: * include/bits/random.h (seed_seq): Constrain initializer-list constructor. * include/bits/random.tcc (seed_seq): Add template parameter. * testsuite/26_numerics/random/seed_seq/cons/default.cc: Check for noexcept. * testsuite/26_numerics/random/seed_seq/cons/initlist.cc: Check constraints. Diff: --- libstdc++-v3/include/bits/random.h | 2 +- libstdc++-v3/include/bits/random.tcc | 2 +- libstdc++-v3/testsuite/26_numerics/random/seed_seq/cons/default.cc | 4 +++- .../testsuite/26_numerics/random/seed_seq/cons/initlist.cc | 7 +++++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/include/bits/random.h b/libstdc++-v3/include/bits/random.h index 0da013c5f45..ed0d7a832f1 100644 --- a/libstdc++-v3/include/bits/random.h +++ b/libstdc++-v3/include/bits/random.h @@ -6073,7 +6073,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION : _M_v() { } - template + template>> seed_seq(std::initializer_list<_IntType> __il); template diff --git a/libstdc++-v3/include/bits/random.tcc b/libstdc++-v3/include/bits/random.tcc index 1357e181874..8e2b702b0be 100644 --- a/libstdc++-v3/include/bits/random.tcc +++ b/libstdc++-v3/include/bits/random.tcc @@ -3231,7 +3231,7 @@ namespace __detail } - template + template seed_seq::seed_seq(std::initializer_list<_IntType> __il) { for (auto __iter = __il.begin(); __iter != __il.end(); ++__iter) diff --git a/libstdc++-v3/testsuite/26_numerics/random/seed_seq/cons/default.cc b/libstdc++-v3/testsuite/26_numerics/random/seed_seq/cons/default.cc index 18f55e723f0..62434a66591 100644 --- a/libstdc++-v3/testsuite/26_numerics/random/seed_seq/cons/default.cc +++ b/libstdc++-v3/testsuite/26_numerics/random/seed_seq/cons/default.cc @@ -25,6 +25,9 @@ #include #include +static_assert( std::is_nothrow_default_constructible::value, + "LWG 3422" ); + void test01() { @@ -34,7 +37,6 @@ test01() seq.generate(foo.begin(), foo.end()); VERIFY( seq.size() == 0 ); - //VERIFY(); } int diff --git a/libstdc++-v3/testsuite/26_numerics/random/seed_seq/cons/initlist.cc b/libstdc++-v3/testsuite/26_numerics/random/seed_seq/cons/initlist.cc index 44b855e5627..1ed9eb784c3 100644 --- a/libstdc++-v3/testsuite/26_numerics/random/seed_seq/cons/initlist.cc +++ b/libstdc++-v3/testsuite/26_numerics/random/seed_seq/cons/initlist.cc @@ -36,6 +36,13 @@ test01() VERIFY( seq.size() == 10 ); } +void +lwg3422() +{ + int i[32] = { }; + std::seed_seq ss{i, i+32}; // LWG 3422 +} + int main() { test01();