From bc046a60cfdd7145fd1e644184ced04d89feb871 Mon Sep 17 00:00:00 2001 From: Patrick Palka Date: Fri, 18 Jun 2021 20:33:31 -0400 Subject: [PATCH] libstdc++: Implement LWG 3555 changes to transform/elements_view libstdc++-v3/ChangeLog: * include/std/ranges (transform_view::_Iterator::_S_iter_concept): Consider _Base instead of _Vp as per LWG 3555. (elements_view::_Iterator::_S_iter_concept): Likewise. --- libstdc++-v3/include/std/ranges | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index ff093bfdf931..49babe81437a 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -1613,11 +1613,11 @@ namespace views::__adaptor static auto _S_iter_concept() { - if constexpr (random_access_range<_Vp>) + if constexpr (random_access_range<_Base>) return random_access_iterator_tag{}; - else if constexpr (bidirectional_range<_Vp>) + else if constexpr (bidirectional_range<_Base>) return bidirectional_iterator_tag{}; - else if constexpr (forward_range<_Vp>) + else if constexpr (forward_range<_Base>) return forward_iterator_tag{}; else return input_iterator_tag{}; @@ -3653,11 +3653,11 @@ namespace views::__adaptor static auto _S_iter_concept() { - if constexpr (random_access_range<_Vp>) + if constexpr (random_access_range<_Base>) return random_access_iterator_tag{}; - else if constexpr (bidirectional_range<_Vp>) + else if constexpr (bidirectional_range<_Base>) return bidirectional_iterator_tag{}; - else if constexpr (forward_range<_Vp>) + else if constexpr (forward_range<_Base>) return forward_iterator_tag{}; else return input_iterator_tag{}; -- 2.47.2