From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id F2A2B398B42E; Thu, 10 Jun 2021 19:08:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F2A2B398B42E 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 r10-9906] libstdc++: Implement LWG 3533 changes to foo_view::iterator::base() X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: 6c0ce0194d3384cd5c6e8a83a39cf3e33a36caeb X-Git-Newrev: 3c01b4dd1b61399e9c06e3543531bee2bd38fac4 Message-Id: <20210610190811.F2A2B398B42E@sourceware.org> Date: Thu, 10 Jun 2021 19:08:11 +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: Thu, 10 Jun 2021 19:08:12 -0000 https://gcc.gnu.org/g:3c01b4dd1b61399e9c06e3543531bee2bd38fac4 commit r10-9906-g3c01b4dd1b61399e9c06e3543531bee2bd38fac4 Author: Patrick Palka Date: Thu May 6 09:11:44 2021 -0400 libstdc++: Implement LWG 3533 changes to foo_view::iterator::base() libstdc++-v3/ChangeLog: * include/std/ranges (filter_view::_Iterator::base): Make the const& overload unconstrained and return a const reference as per LWG 3533. Make unconditionally noexcept. (transform_view::_Iterator::base): Likewise. (elements_view::_Iterator::base): Likewise. (cherry picked from commit eb1aa9ad2afbcd8f3e939310d5785ff8563a8c5c) Diff: --- libstdc++-v3/include/std/ranges | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 5f67f830174..c69a44f2ed8 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -1478,9 +1478,8 @@ namespace views _M_parent(__parent) { } - constexpr _Vp_iter - base() const & - requires copyable<_Vp_iter> + constexpr const _Vp_iter& + base() const & noexcept { return _M_current; } constexpr _Vp_iter @@ -1729,9 +1728,8 @@ namespace views : _M_current(std::move(__i._M_current)), _M_parent(__i._M_parent) { } - constexpr _Base_iter - base() const & - requires copyable<_Base_iter> + constexpr const _Base_iter& + base() const & noexcept { return _M_current; } constexpr _Base_iter @@ -3467,8 +3465,8 @@ namespace views : _M_base(std::move(base)) { } - constexpr _Vp - base() const& requires copy_constructible<_Vp> + constexpr const _Vp& + base() const & noexcept { return _M_base; } constexpr _Vp