From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id 362773858D20; Thu, 9 Mar 2023 18:37:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 362773858D20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1678387064; bh=O2HGMMmDoUp/tUtfPG2ilipi5pveQrG1+nKbVk5JWxg=; h=From:To:Subject:Date:From; b=FjlCOcityhokzkJGirWluJo9AC8vlcNViFEdwwb7hBJdz99wE6txJXF9+14H8fPpp 5NDAoc+4ijV4OnC443KRLNeY5llQsUKoxqM/kwGxy4PrzQy6dxieDpvFhz6h1zQCxV P+jd/ksrSj0f2uv3h3AzAkhapPA5oW7caa8vm8zY= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Patrick Palka To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-6561] libstdc++: Implement LWG 3796 changes to repeat_/chunk_by_view [PR109024] X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/master X-Git-Oldrev: 95827e1b9f7d5dd5a697bd60292e3876a7e8c15c X-Git-Newrev: 065c93b89c5e97dcbfd79ee5172cf6800c286896 Message-Id: <20230309183744.362773858D20@sourceware.org> Date: Thu, 9 Mar 2023 18:37:44 +0000 (GMT) List-Id: https://gcc.gnu.org/g:065c93b89c5e97dcbfd79ee5172cf6800c286896 commit r13-6561-g065c93b89c5e97dcbfd79ee5172cf6800c286896 Author: Patrick Palka Date: Thu Mar 9 13:37:29 2023 -0500 libstdc++: Implement LWG 3796 changes to repeat_/chunk_by_view [PR109024] PR libstdc++/109024 libstdc++-v3/ChangeLog: * include/std/ranges (chunk_by_view::_M_pred): Remove DMI as per LWG 3796. (repeat_view::_M_pred): Likewise. * testsuite/std/ranges/adaptors/chunk_by/1.cc (test03): New test. * testsuite/std/ranges/repeat/1.cc (test05): New test. Diff: --- libstdc++-v3/include/std/ranges | 4 ++-- libstdc++-v3/testsuite/std/ranges/adaptors/chunk_by/1.cc | 8 ++++++++ libstdc++-v3/testsuite/std/ranges/repeat/1.cc | 8 ++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 867844e9e12..f6809413ee1 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -6735,7 +6735,7 @@ namespace views::__adaptor class chunk_by_view : public view_interface> { _Vp _M_base = _Vp(); - __detail::__box<_Pred> _M_pred = _Pred(); + __detail::__box<_Pred> _M_pred; __detail::_CachedPosition<_Vp> _M_cached_begin; constexpr iterator_t<_Vp> @@ -7411,7 +7411,7 @@ namespace views::__adaptor && (__detail::__is_integer_like<_Bound> || same_as<_Bound, unreachable_sentinel_t>)) class repeat_view : public view_interface> { - __detail::__box<_Tp> _M_value = _Tp(); + __detail::__box<_Tp> _M_value; [[no_unique_address]] _Bound _M_bound = _Bound(); struct _Iterator; diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/chunk_by/1.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/chunk_by/1.cc index cba6fad6f9a..f165c7d9a95 100644 --- a/libstdc++-v3/testsuite/std/ranges/adaptors/chunk_by/1.cc +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/chunk_by/1.cc @@ -54,9 +54,17 @@ test02() VERIFY( i == v.end() ); } +void +test03() +{ + // LWG 3796 + ranges::chunk_by_view, ranges::equal_to> r; +} + int main() { static_assert(test01()); test02(); + test03(); } diff --git a/libstdc++-v3/testsuite/std/ranges/repeat/1.cc b/libstdc++-v3/testsuite/std/ranges/repeat/1.cc index 2f3ad4522a4..07b70891042 100644 --- a/libstdc++-v3/testsuite/std/ranges/repeat/1.cc +++ b/libstdc++-v3/testsuite/std/ranges/repeat/1.cc @@ -120,6 +120,13 @@ test04() return true; } +void +test05() +{ + // LWG 3796 + ranges::repeat_view r; +} + int main() { @@ -127,4 +134,5 @@ main() static_assert(test02()); static_assert(test03()); static_assert(test04()); + test05(); }