From: Patrick Palka Date: Thu, 6 May 2021 13:11:44 +0000 (-0400) Subject: libstdc++: Implement LWG 3533 changes to foo_view::iterator::base() X-Git-Tag: releases/gcc-11.2.0~258 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3804ba98f2d8de9b4540d134fa0d9275a1e8057;p=thirdparty%2Fgcc.git 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 --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 265e109bc7e5..1f4093a17b57 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -1263,9 +1263,8 @@ namespace views::__adaptor _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 @@ -1531,9 +1530,8 @@ namespace views::__adaptor : _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 @@ -3407,8 +3405,8 @@ namespace views::__adaptor : _M_base(std::move(base)) { } - constexpr _Vp - base() const& requires copy_constructible<_Vp> + constexpr const _Vp& + base() const & noexcept { return _M_base; } constexpr _Vp