diff options
| author | Patrick Palka <ppalka@redhat.com> | 2021-05-06 09:11:44 -0400 |
|---|---|---|
| committer | Patrick Palka <ppalka@redhat.com> | 2021-05-06 09:11:44 -0400 |
| commit | eb1aa9ad2afbcd8f3e939310d5785ff8563a8c5c (patch) | |
| tree | dcc6d294f6a689914d75b6feeb693ca03a6b8f41 | |
| parent | 08f3287eefea1d7c244db795d018870e8148d1c8 (diff) | |
| download | gcc-eb1aa9ad2afbcd8f3e939310d5785ff8563a8c5c.zip gcc-eb1aa9ad2afbcd8f3e939310d5785ff8563a8c5c.tar.gz gcc-eb1aa9ad2afbcd8f3e939310d5785ff8563a8c5c.tar.bz2 | |
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.
| -rw-r--r-- | libstdc++-v3/include/std/ranges | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 2305bd2..48100e9 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -1182,9 +1182,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 @@ -1450,9 +1449,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 @@ -3386,8 +3384,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 |