diff --git a/include/oneapi/dpl/pstl/zip_view_impl.h b/include/oneapi/dpl/pstl/zip_view_impl.h index 41140b6a1aa..d45fd5fb1cb 100644 --- a/include/oneapi/dpl/pstl/zip_view_impl.h +++ b/include/oneapi/dpl/pstl/zip_view_impl.h @@ -102,13 +102,15 @@ class zip_view : public std::ranges::view_interface> { std::forward_iterator_tag, std::input_iterator_tag>>>; - using value_type = std::conditional_t...>, - tuple_type...>>; + using value_type = std::conditional_t...>, + tuple_type...>>; - using difference_type = std::conditional_t...>, - std::common_type_t...>>; - using return_tuple_type = std::conditional_t>::reference...>, - tuple_type>::reference...>>; + using difference_type = std::conditional_t...>, + std::common_type_t...>>; + + using return_tuple_type = std::conditional_t>::reference...>, + tuple_type>::reference...>>; iterator() = default; @@ -303,9 +305,9 @@ class zip_view : public std::ranges::view_interface> { tuple_type...>>; end_type end_; - }; // class sentinel + }; // class sentinel - constexpr auto begin() requires (std::ranges::range && ...) // !simple_view? + constexpr auto begin() requires (std::ranges::range && ...) { auto __tr = [](auto... __args) { return iterator(__args...);}; return apply_to_tuple(__tr, std::ranges::begin, views_); @@ -317,7 +319,7 @@ class zip_view : public std::ranges::view_interface> { return apply_to_tuple(__tr, std::ranges::begin, views_); } - constexpr auto end() requires (std::ranges::range && ...) // requires !simple_view { + constexpr auto end() requires (std::ranges::range && ...) { if constexpr (!zip_is_common) {