]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
libstdc++: Implement LWG 3555 changes to transform/elements_view
authorPatrick Palka <ppalka@redhat.com>
Sat, 19 Jun 2021 00:33:31 +0000 (20:33 -0400)
committerPatrick Palka <ppalka@redhat.com>
Tue, 12 Oct 2021 17:51:51 +0000 (13:51 -0400)
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.

(cherry picked from commit bc046a60cfdd7145fd1e644184ced04d89feb871)

libstdc++-v3/include/std/ranges

index aebe1b90076f0e767586946899f4974bdc613631..1f43cad1d7317eb3c584b1720ff35a9cad48bf76 100644 (file)
@@ -1556,11 +1556,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{};
@@ -3584,11 +3584,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{};