]> 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>
Sat, 19 Jun 2021 00:50:23 +0000 (20:50 -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.

libstdc++-v3/include/std/ranges

index ff093bfdf9319a58b7208fc22b6067c98a2b8078..49babe81437a3d5964b2f7e6eb64a7ba81ece116 100644 (file)
@@ -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{};