Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[INFRA] Update contrib #3194

Merged
merged 2 commits into from
Sep 28, 2023
Merged

[INFRA] Update contrib #3194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cc630d
Squashed 'include/seqan3/contrib/std/' changes from 8bf6a492e..77f4aeaf0
eseiler Sep 28, 2023
acb3def
Merge commit '6cc630df95c9a4b16cb9917e53e04b305cf06e17' into infra/up…
eseiler Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions include/seqan3/contrib/std/chunk_view.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_;
Expand Down Expand Up @@ -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_);
Expand Down Expand Up @@ -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_);
Expand Down
4 changes: 2 additions & 2 deletions include/seqan3/contrib/std/join_with_view.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
5 changes: 3 additions & 2 deletions include/seqan3/contrib/std/zip_view.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -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<>>;
}
Expand Down