From: Patrick Palka <ppalka@redhat.com>
To: gcc-patches@gcc.gnu.org
Cc: libstdc++@gcc.gnu.org, Patrick Palka <ppalka@redhat.com>
Subject: [PATCH] libstdc++: Fix up implementation of LWG 3533 [PR101589]
Date: Fri, 23 Jul 2021 12:34:10 -0400 [thread overview]
Message-ID: <20210723163410.3292780-1-ppalka@redhat.com> (raw)
In r12-569 I accidentally applied the LWG 3533 change that
was intended for elements_view::iterator::base to
elements_view::base instead.
This patch corrects this, and also applies the corresponding LWG 3533
change to lazy_split_view::inner-iter::base now that we implement P2210.
Tested on x86_64-pc-linux-gnu, does this look OK for trunk and release
branches?
PR libstdc++/101589
libstdc++-v3/ChangeLog:
* include/std/ranges (lazy_split_view::_InnerIter::base): Make
the const& overload unconstrained and return a const reference
as per LWG 3533. Make unconditionally noexcept.
(elements_view::base): Revert accidental r12-569 change.
(elements_view::_Iterator::base): Make the const& overload
unconstrained and return a const reference as per LWG 3533.
Make unconditionally noexcept.
---
libstdc++-v3/include/std/ranges | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges
index d791e15d096..50b414e8c8c 100644
--- a/libstdc++-v3/include/std/ranges
+++ b/libstdc++-v3/include/std/ranges
@@ -3103,8 +3103,8 @@ namespace views::__adaptor
: _M_i(std::move(__i))
{ }
- constexpr iterator_t<_Base>
- base() const& requires copyable<iterator_t<_Base>>
+ constexpr const iterator_t<_Base>&
+ base() const& noexcept
{ return _M_i_current(); }
constexpr iterator_t<_Base>
@@ -3786,8 +3786,8 @@ namespace views::__adaptor
: _M_base(std::move(base))
{ }
- constexpr const _Vp&
- base() const & noexcept
+ constexpr _Vp
+ base() const& requires copy_constructible<_Vp>
{ return _M_base; }
constexpr _Vp
@@ -3913,9 +3913,8 @@ namespace views::__adaptor
: _M_current(std::move(i._M_current))
{ }
- constexpr iterator_t<_Base>
- base() const&
- requires copyable<iterator_t<_Base>>
+ constexpr const iterator_t<_Base>&
+ base() const& noexcept
{ return _M_current; }
constexpr iterator_t<_Base>
--
2.32.0.349.gdaab8a564f
next reply other threads:[~2021-07-23 16:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-23 16:34 Patrick Palka [this message]
2021-07-26 9:48 ` Jonathan Wakely
2021-07-23 16:34 Patrick Palka
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=20210723163410.3292780-1-ppalka@redhat.com \
--to=ppalka@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=libstdc++@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: link
Be 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).