From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by sourceware.org (Postfix) with ESMTPS id 45EBA385842B; Mon, 17 Apr 2023 07:23:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 45EBA385842B Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-x635.google.com with SMTP id u3so9559125ejj.12; Mon, 17 Apr 2023 00:23:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681716208; x=1684308208; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=f9nw4jpacvvjiVJ+gJQBaBPiSGFwIPJezxXqR9xPrAw=; b=C6s6A42PWK/gSyqug/dViPIAYvol/XORFy+Le33hX6YUv8Sa08fX/1b++4JJZtcyMp Umuj5s2ae4qlH4nasKxyO0gwOD99xKkMIeeiXTKSMOEbQIMqm+re5iQb4nisiaPn1owP D7Ua/xqGd5DjadkKbZ0DAUGa/M30aA4YL8nW40LZkSNtM/xkUd/EmdWyu2xnlZSoa5cH 4ZxSMcObXosge0j15Kzm3zBoeLWkQxDUMUZvwqIcTxuhXg0ahSde1wo2w1COL9hxUaXA wUk0uemol0j87F87qKDWAFbdZ2WM7iwLnXQq//Zh02L+uyCjUV2boTHJmEsdXxNVcbEF m1yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681716208; x=1684308208; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=f9nw4jpacvvjiVJ+gJQBaBPiSGFwIPJezxXqR9xPrAw=; b=b7WCzRNO4GmwZ3UnDeX3Vv60rXGjbibq/9tXHh8DMHbTeVFwh3KsrHOa0isGfPHR9v VoDkfyjXdPoLKAb5aKRewRfoeJiv7DHDyxarR3ANGpqnUUtYTCov16fPmmJbCsnDv1E0 f7y+M2KtHH2HHoJZ74770hyosLeoRuJO88qLlFKhOjsy2CDYaV1+8S7J3Epr2P2QJCZ+ rO42ayOehaUKVXtnd4XDUcPBRX/wFdD5iFNOxR/bHfkKAnjUY3sHrnmfK16HjXy8Kk9h xlRXc20qyVj/97sUoMNWV9tO+YGoj6TChqV9gxEfjAehvDCEzIeTt6oFSo9ivIhYsARI +VQw== X-Gm-Message-State: AAQBX9edWMs9VhE8vkh9TYLwFaVv6BWK/cB5/wzVuEhaPFY28OS0YsLY iLJJV02LaL65uta4pKlhgeUVDZreUgGH5ZyCHxc= X-Google-Smtp-Source: AKy350ZBsBMkouYrfnYG/CceTUjcbU6XzFAYbr5pDgWY04be4wM8ThDk47Eivu8CzF7qTl21vBexcDFyoLS4yEhlARE= X-Received: by 2002:a17:907:da4:b0:94f:967d:e4f with SMTP id go36-20020a1709070da400b0094f967d0e4fmr1036191ejc.39.1681716207899; Mon, 17 Apr 2023 00:23:27 -0700 (PDT) MIME-Version: 1.0 References: <20230417034553.2646005-1-ppalka@redhat.com> In-Reply-To: <20230417034553.2646005-1-ppalka@redhat.com> From: Jonathan Wakely Date: Mon, 17 Apr 2023 09:23:16 +0200 Message-ID: Subject: Re: [PATCH] libstdc++: Fix typo in views::as_const's operator() [PR109525] To: Patrick Palka Cc: gcc-patches , "libstdc++" Content-Type: multipart/alternative; boundary="0000000000002f56ce05f98311bd" X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,HTML_MESSAGE,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --0000000000002f56ce05f98311bd Content-Type: text/plain; charset="UTF-8" OK On Mon, 17 Apr 2023, 05:46 Patrick Palka via Libstdc++, < libstdc++@gcc.gnu.org> wrote: > PR libstdc++/109525 > > libstdc++-v3/ChangeLog: > > * include/std/ranges (views::_AsConst::operator()): Add > missing const to constant_range test. > * testsuite/std/ranges/adaptors/as_const/1.cc (test02): > Improve formatting. Adjust expected type of v2. > (test03): New test. > --- > libstdc++-v3/include/std/ranges | 2 +- > .../std/ranges/adaptors/as_const/1.cc | 37 ++++++++++++------- > 2 files changed, 24 insertions(+), 15 deletions(-) > > diff --git a/libstdc++-v3/include/std/ranges > b/libstdc++-v3/include/std/ranges > index 283d757faa4..1714f3fb16c 100644 > --- a/libstdc++-v3/include/std/ranges > +++ b/libstdc++-v3/include/std/ranges > @@ -9025,7 +9025,7 @@ namespace views::__adaptor > return ref_view(static_cast > (std::forward<_Range>(__r).base())); > else if constexpr (is_lvalue_reference_v<_Range> > - && constant_range<_Tp> > + && constant_range > && !view<_Tp>) > return ref_view(static_cast(__r)); > else > diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/as_const/1.cc > b/libstdc++-v3/testsuite/std/ranges/adaptors/as_const/1.cc > index d04645f047e..ac1be7440e4 100644 > --- a/libstdc++-v3/testsuite/std/ranges/adaptors/as_const/1.cc > +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/as_const/1.cc > @@ -5,6 +5,7 @@ > #include > #include > #include > +#include > #include > #include > > @@ -36,29 +37,37 @@ test01() > constexpr bool > test02() > { > - std::same_as> auto v1 > - = views::empty | views::as_const; > - > int x[] = {1, 2, 3}; > - std::same_as>> auto v2 > - = x | views::as_const; > - std::same_as> auto v3 > - = std::as_const(x) | views::as_const; > - std::same_as> auto v4 > - = std::as_const(x) | views::all | views::as_const; > - std::same_as> auto v5 > - = std::span{x, x+3} | views::as_const; > - > - > std::same_as>>> > auto v6 > - = x | views::chunk(2) | views::as_const; > + std::same_as> > + auto v1 = views::empty | views::as_const; > + std::same_as> > + auto v2 = x | views::as_const; > + std::same_as> > + auto v3 = std::as_const(x) | views::as_const; > + std::same_as> > + auto v4 = std::as_const(x) | views::all | views::as_const; > + std::same_as> > + auto v5 = std::span{x, x+3} | views::as_const; > + > std::same_as>>> > + auto v6 = x | views::chunk(2) | views::as_const; > VERIFY( v6.size() == 2 ); > > return true; > } > > +void > +test03() > +{ > + // PR libstdc++/109525 > + std::vector v; > + std::same_as>> > + auto r = views::as_const(v); > +} > + > int > main() > { > static_assert(test01()); > static_assert(test02()); > + test03(); > } > -- > 2.40.0.335.g9857273be0 > > --0000000000002f56ce05f98311bd--