[gcc r11-8544] libstdc++: Implement LWG 3533 changes to foo_view::iterator::base()
Patrick Palka
ppalka@gcc.gnu.org
Thu Jun 10 19:03:24 GMT 2021
https://gcc.gnu.org/g:e3804ba98f2d8de9b4540d134fa0d9275a1e8057
commit r11-8544-ge3804ba98f2d8de9b4540d134fa0d9275a1e8057
Author: Patrick Palka <ppalka@redhat.com>
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 265e109bc7e..1f4093a17b5 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
More information about the Gcc-cvs
mailing list