From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id 2DEBC39B8075; Sat, 19 Jun 2021 00:51:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2DEBC39B8075 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 r12-1660] libstdc++: Implement LWG 3555 changes to transform/elements_view X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/master X-Git-Oldrev: 15736576df739fdcc5e795961dae30c7b0c87967 X-Git-Newrev: bc046a60cfdd7145fd1e644184ced04d89feb871 Message-Id: <20210619005127.2DEBC39B8075@sourceware.org> Date: Sat, 19 Jun 2021 00:51:27 +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: Sat, 19 Jun 2021 00:51:27 -0000 https://gcc.gnu.org/g:bc046a60cfdd7145fd1e644184ced04d89feb871 commit r12-1660-gbc046a60cfdd7145fd1e644184ced04d89feb871 Author: Patrick Palka Date: Fri Jun 18 20:33:31 2021 -0400 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. Diff: --- 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 ff093bfdf93..49babe81437 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{};