public inbox for libstdc++-cvs@sourceware.org help / color / mirror / Atom feed
From: Aldy Hernandez <aldyh@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc/devel/ranger] libstdc++: LWG 3313 join_view::iterator::operator-- is incorrectly constrained Date: Wed, 17 Jun 2020 19:11:27 +0000 (GMT) [thread overview] Message-ID: <20200617191127.507BD3954C65@sourceware.org> (raw) https://gcc.gnu.org/g:55c4b3f486200bcfd6c5c333754e6abb7acd470c commit 55c4b3f486200bcfd6c5c333754e6abb7acd470c Author: Patrick Palka <ppalka@redhat.com> Date: Mon Feb 24 16:09:48 2020 -0500 libstdc++: LWG 3313 join_view::iterator::operator-- is incorrectly constrained libstdc++-v3/ChangeLog: LWG 3313 join_view::_Iterator::operator-- is incorrectly constrained * include/std/ranges (join_view::_Iterator::operator--): Require that range_reference_t<_Base> models common_range. * testsuite/std/ranges/adaptors/lwg3313_neg.cc: New test. Diff: --- libstdc++-v3/ChangeLog | 5 +++ libstdc++-v3/include/std/ranges | 2 ++ .../testsuite/std/ranges/adaptors/lwg3313_neg.cc | 40 ++++++++++++++++++++++ 3 files changed, 47 insertions(+) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 1a56a7d221c..1bb2f3dfaf4 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2020-02-25 Patrick Palka <ppalka@redhat.com> + LWG 3313 join_view::_Iterator::operator-- is incorrectly constrained + * include/std/ranges (join_view::_Iterator::operator--): Require that + range_reference_t<_Base> models common_range. + * testsuite/std/ranges/adaptors/lwg3313_neg.cc: New test. + LWG 3301 transform_view::_Iterator has incorrect iterator_category * include/std/ranges (transform_view::_Iterator::_S_iter_cat): Adjust determination of iterator_category as per LWG 3301. diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index aed90e9710e..ffdd3367b05 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -2399,6 +2399,7 @@ namespace views operator--() requires _S_ref_is_glvalue && bidirectional_range<_Base> && bidirectional_range<range_reference_t<_Base>> + && common_range<range_reference_t<_Base>> { if (_M_outer == ranges::end(_M_parent->_M_base)) _M_inner = ranges::end(*--_M_outer); @@ -2412,6 +2413,7 @@ namespace views operator--(int) requires _S_ref_is_glvalue && bidirectional_range<_Base> && bidirectional_range<range_reference_t<_Base>> + && common_range<range_reference_t<_Base>> { auto __tmp = *this; --*this; diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/lwg3313_neg.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/lwg3313_neg.cc new file mode 100644 index 00000000000..054df92554b --- /dev/null +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/lwg3313_neg.cc @@ -0,0 +1,40 @@ +// Copyright (C) 2020 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// <http://www.gnu.org/licenses/>. + +// { dg-options "-std=gnu++2a" } +// { dg-do compile { target c++2a } } + +#include <array> +#include <iterator> +#include <ranges> + +namespace ranges = std::ranges; +namespace views = std::views; + +void +test01() +{ + int x[] = {1}; + auto rx = ranges::subrange{std::counted_iterator(x,1), std::default_sentinel}; + std::array<decltype(rx), 5> y = {rx, rx, rx, rx, rx,}; + auto v = y | views::join; + auto i = v.begin(); + ++i; + ++i; + --i; // { dg-error "no match" } + i--; // { dg-error "" } +}
reply other threads:[~2020-06-17 19:11 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200617191127.507BD3954C65@sourceware.org \ --to=aldyh@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ --cc=libstdc++-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).