Merge commit '6cc630df95c9a4b16cb9917e53e04b305cf06e17' into infra/up…

…date_contrib
seqan · Sep 28, 2023 · acb3def · acb3def
2 parents 54c60ed + 6cc630d
commit acb3def
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/include/seqan3/contrib/std/chunk_view.hpp b/include/seqan3/contrib/std/chunk_view.hpp
@@ -172,7 +172,7 @@ class chunk_view<V>::outer_iterator
         return *x.parent_->current_ == std::ranges::end(x.parent_->base_) && x.parent_->remainder_ != 0;
     }
 
-    friend constexpr difference_type operator-(std::default_sentinel_t y, outer_iterator const & x)
+    friend constexpr difference_type operator-(std::default_sentinel_t, outer_iterator const & x)
         requires std::sized_sentinel_for<std::ranges::sentinel_t<V>, std::ranges::iterator_t<V>>
     {
         auto const dist = std::ranges::end(x.parent_->base_) - *x.parent_->current_;
@@ -269,7 +269,7 @@ class chunk_view<V>::inner_iterator
         return x.parent_->remainder_ == 0;
     }
 
-    friend constexpr difference_type operator-(std::default_sentinel_t y, inner_iterator const & x)
+    friend constexpr difference_type operator-(std::default_sentinel_t, inner_iterator const & x)
         requires std::sized_sentinel_for<std::ranges::sentinel_t<V>, std::ranges::iterator_t<V>>
     {
         std::ranges::min(x.parent_->remainder_, std::ranges::end(x.parent_->base_) - *x.parent_->current_);
@@ -571,7 +571,7 @@ class chunk_view<V>::iterator
         return (x.current_ - y.current_ + x.missing_ - y.missing_) / x.n_;
     }
 
-    friend constexpr difference_type operator-(std::default_sentinel_t y, iterator const & x)
+    friend constexpr difference_type operator-(std::default_sentinel_t, iterator const & x)
         requires std::sized_sentinel_for<std::ranges::sentinel_t<Base>, std::ranges::iterator_t<Base>>
     {
         return seqan::stl::detail::chunk::div_ceil(x.end_ - x.current_, x.n_);

diff --git a/include/seqan3/contrib/std/join_with_view.hpp b/include/seqan3/contrib/std/join_with_view.hpp
@@ -88,10 +88,10 @@ class join_with_view :
     Pattern pattern_{};
 
     template <bool Const>
-    struct iterator;
+    class iterator;
 
     template <bool Const>
-    struct sentinel;
+    class sentinel;
 
 public:
     join_with_view()

diff --git a/include/seqan3/contrib/std/zip_view.hpp b/include/seqan3/contrib/std/zip_view.hpp
@@ -16,7 +16,8 @@
 
 #include <ranges>
 
-#ifdef __cpp_lib_ranges_zip
+// https://godbolt.org/z/YW7e785sd
+#if defined __cpp_lib_ranges_zip && !defined(__clang__)
 
 namespace seqan::stl::views
 {
@@ -541,7 +542,7 @@ struct zip_fn
 {
     template <seqan::stl::ranges::viewable_range... urng_ts>
         requires (sizeof...(urng_ts) == 0)
-    constexpr auto operator()(urng_ts &&... ranges) const
+    constexpr auto operator()(urng_ts &&...) const
     {
         return std::views::empty<seqan::stl::tuple<>>;
     }