From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2136) id 028373953421; Wed, 17 Jun 2020 18:53:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 028373953421 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1592420032; bh=nWQpG5ksqdAmi31Q/Eb6GAstH2PJdjb/S5cTTWcvXlM=; h=From:To:Subject:Date:From; b=PU4xrme9fX4Pyib1inuHNvjZ9fnVIh69q/kN6QO/s6eVeIm/tXVay7MH2b5vDZIBG kK/yNvEgiMWAielEHykFxvln4+wc7jTxuNsQxVDE7Oqn36n48fmKp3LKF0teo18M92 Oxx/w/kSN/Bzg/EbByFALSeGAsZS4s/XiDxauNA0= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Aldy Hernandez To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc/devel/ranger] libstdc++: Implement LWG 3150 for std::uniform_random_bit_generator X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/devel/ranger X-Git-Oldrev: 458c8d6459c4005fc9886b6e25d168a6535ac415 X-Git-Newrev: 5b1d588509551291f4028497858ee9e04ce0bdee Message-Id: <20200617185352.028373953421@sourceware.org> Date: Wed, 17 Jun 2020 18:53:52 +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: Wed, 17 Jun 2020 18:53:52 -0000 https://gcc.gnu.org/g:5b1d588509551291f4028497858ee9e04ce0bdee commit 5b1d588509551291f4028497858ee9e04ce0bdee Author: Jonathan Wakely Date: Sat Feb 15 08:58:43 2020 +0000 libstdc++: Implement LWG 3150 for std::uniform_random_bit_generator * include/bits/random.h (uniform_random_bit_generator): Require min() and max() to be constant expressions and min() to be less than max(). * testsuite/26_numerics/random/concept.cc: Check additional cases. * testsuite/26_numerics/random/pr60037-neg.cc: Adjust dg-error lineno. Diff: --- libstdc++-v3/ChangeLog | 7 ++++++ libstdc++-v3/include/bits/random.h | 1 + .../testsuite/26_numerics/random/concept.cc | 27 ++++++++++++++++++++++ .../testsuite/26_numerics/random/pr60037-neg.cc | 2 +- 4 files changed, 36 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d1e5aad1b68..8e248703430 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2020-02-15 Jonathan Wakely + + * include/bits/random.h (uniform_random_bit_generator): Require min() + and max() to be constant expressions and min() to be less than max(). + * testsuite/26_numerics/random/concept.cc: Check additional cases. + * testsuite/26_numerics/random/pr60037-neg.cc: Adjust dg-error lineno. + 2020-02-13 Patrick Palka * include/Makefile.am: Add . diff --git a/libstdc++-v3/include/bits/random.h b/libstdc++-v3/include/bits/random.h index 3eefdefc96f..d4aebf45af0 100644 --- a/libstdc++-v3/include/bits/random.h +++ b/libstdc++-v3/include/bits/random.h @@ -60,6 +60,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { { _Gen::min() } -> same_as>; { _Gen::max() } -> same_as>; + requires bool_constant<(_Gen::min() < _Gen::max())>::value; }; #endif diff --git a/libstdc++-v3/testsuite/26_numerics/random/concept.cc b/libstdc++-v3/testsuite/26_numerics/random/concept.cc index 69a7fc1e674..cb1ea882e16 100644 --- a/libstdc++-v3/testsuite/26_numerics/random/concept.cc +++ b/libstdc++-v3/testsuite/26_numerics/random/concept.cc @@ -219,3 +219,30 @@ struct N11 }; static_assert( ! std::uniform_random_bit_generator ); + +struct N12 +{ + unsigned operator()(); + static unsigned min() { return 0; } // not constexpr + static constexpr unsigned max() { return 1; } +}; + +static_assert( ! std::uniform_random_bit_generator ); // LWG 3150 + +struct N13 +{ + unsigned operator()(); + static constexpr unsigned min() { return 0; } + static unsigned max() { return 1; } // not constexpr +}; + +static_assert( ! std::uniform_random_bit_generator ); // LWG 3150 + +struct N14 +{ + unsigned operator()(); + static constexpr unsigned min() { return 1; } + static constexpr unsigned max() { return 0; } // max not greater than min +}; + +static_assert( ! std::uniform_random_bit_generator ); // LWG 3150 diff --git a/libstdc++-v3/testsuite/26_numerics/random/pr60037-neg.cc b/libstdc++-v3/testsuite/26_numerics/random/pr60037-neg.cc index 201b87e9c52..91e5566c54a 100644 --- a/libstdc++-v3/testsuite/26_numerics/random/pr60037-neg.cc +++ b/libstdc++-v3/testsuite/26_numerics/random/pr60037-neg.cc @@ -10,6 +10,6 @@ std::__detail::_Adaptor aurng(urng); auto x = std::generate_canonical::digits>(urng); -// { dg-error "static assertion failed: template argument must be a floating point type" "" { target *-*-* } 171 } +// { dg-error "static assertion failed: template argument must be a floating point type" "" { target *-*-* } 172 } // { dg-error "static assertion failed: template argument must be a floating point type" "" { target *-*-* } 3281 }