From 2e2e9c604914da18e6346063af2e9132d8aaaac4 Mon Sep 17 00:00:00 2001 From: Enrico Seiler Date: Tue, 2 Jul 2024 13:05:49 +0200 Subject: [PATCH 1/3] Squashed 'include/hibf/contrib/std/' changes from 57a41f7..c5e3faa c5e3faa [MISC] Update copyright 14f20f7 [FIX] Add missing include git-subtree-dir: include/hibf/contrib/std git-subtree-split: c5e3faa869e83d1f2441d9dc151666916954b6ba --- .clang-format | 4 +- .gitignore | 4 +- LICENSE.md | 4 +- README.md | 4 +- all_view.hpp | 4 +- chunk_by_view.hpp | 4 +- chunk_view.hpp | 4 +- concepts.hpp | 18 ++-- detail/adaptor_base.hpp | 4 +- detail/adaptor_for_view_without_args.hpp | 4 +- detail/adaptor_from_functor.hpp | 4 +- detail/compiler_definitions.hpp | 4 +- detail/exposition_only.hpp | 4 +- detail/movable_box.hpp | 4 +- detail/non_propagating_cache.hpp | 4 +- join_with_view.hpp | 4 +- pair.hpp | 22 ++--- to.hpp | 4 +- tuple.hpp | 100 ++++++++--------------- zip_view.hpp | 29 +++---- 20 files changed, 98 insertions(+), 135 deletions(-) diff --git a/.clang-format b/.clang-format index fb57c48c..1e71a74d 100644 --- a/.clang-format +++ b/.clang-format @@ -1,5 +1,5 @@ -# SPDX-FileCopyrightText: 2006-2023, Knut Reinert & Freie Universität Berlin -# SPDX-FileCopyrightText: 2016-2023, Knut Reinert & MPI für molekulare Genetik +# SPDX-FileCopyrightText: 2006-2024 Knut Reinert & Freie Universität Berlin +# SPDX-FileCopyrightText: 2016-2024 Knut Reinert & MPI für molekulare Genetik # SPDX-License-Identifier: CC0-1.0 # Format all files diff --git a/.gitignore b/.gitignore index ae8ca2a7..12e28439 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -# SPDX-FileCopyrightText: 2006-2023, Knut Reinert & Freie Universität Berlin -# SPDX-FileCopyrightText: 2016-2023, Knut Reinert & MPI für molekulare Genetik +# SPDX-FileCopyrightText: 2006-2024 Knut Reinert & Freie Universität Berlin +# SPDX-FileCopyrightText: 2016-2024 Knut Reinert & MPI für molekulare Genetik # SPDX-License-Identifier: CC0-1.0 # Prerequisites diff --git a/LICENSE.md b/LICENSE.md index ce0b8c2b..1a476688 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,5 +1,5 @@ -Copyright (c) 2006-2023, Knut Reinert & Freie Universität Berlin -Copyright (c) 2016-2023, Knut Reinert & MPI für molekulare Genetik +Copyright (c) 2006-2024, Knut Reinert & Freie Universität Berlin +Copyright (c) 2016-2024, Knut Reinert & MPI für molekulare Genetik All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/README.md b/README.md index 113cb24a..5d81900a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ diff --git a/all_view.hpp b/all_view.hpp index c095c5eb..00592caa 100644 --- a/all_view.hpp +++ b/all_view.hpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2006-2023, Knut Reinert & Freie Universität Berlin -// SPDX-FileCopyrightText: 2016-2023, Knut Reinert & MPI für molekulare Genetik +// SPDX-FileCopyrightText: 2006-2024 Knut Reinert & Freie Universität Berlin +// SPDX-FileCopyrightText: 2016-2024 Knut Reinert & MPI für molekulare Genetik // SPDX-License-Identifier: BSD-3-Clause /*!\file diff --git a/chunk_by_view.hpp b/chunk_by_view.hpp index 5367a03d..6eda897a 100644 --- a/chunk_by_view.hpp +++ b/chunk_by_view.hpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2006-2023, Knut Reinert & Freie Universität Berlin -// SPDX-FileCopyrightText: 2016-2023, Knut Reinert & MPI für molekulare Genetik +// SPDX-FileCopyrightText: 2006-2024 Knut Reinert & Freie Universität Berlin +// SPDX-FileCopyrightText: 2016-2024 Knut Reinert & MPI für molekulare Genetik // SPDX-License-Identifier: BSD-3-Clause /*!\file diff --git a/chunk_view.hpp b/chunk_view.hpp index 8388fa63..fd7667ec 100644 --- a/chunk_view.hpp +++ b/chunk_view.hpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2006-2023, Knut Reinert & Freie Universität Berlin -// SPDX-FileCopyrightText: 2016-2023, Knut Reinert & MPI für molekulare Genetik +// SPDX-FileCopyrightText: 2006-2024 Knut Reinert & Freie Universität Berlin +// SPDX-FileCopyrightText: 2016-2024 Knut Reinert & MPI für molekulare Genetik // SPDX-License-Identifier: BSD-3-Clause /*!\file diff --git a/concepts.hpp b/concepts.hpp index 4d679cf3..2e053c9c 100644 --- a/concepts.hpp +++ b/concepts.hpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2006-2023, Knut Reinert & Freie Universität Berlin -// SPDX-FileCopyrightText: 2016-2023, Knut Reinert & MPI für molekulare Genetik +// SPDX-FileCopyrightText: 2006-2024 Knut Reinert & Freie Universität Berlin +// SPDX-FileCopyrightText: 2016-2024 Knut Reinert & MPI für molekulare Genetik // SPDX-License-Identifier: BSD-3-Clause /*!\file @@ -26,13 +26,13 @@ namespace seqan::stl::ranges { template -concept viewable_range = std::ranges::range - && ((std::ranges::view> - && std::constructible_from, T>) - || (!std::ranges::view> - && (std::is_lvalue_reference_v - || (std::movable> - && !seqan::stl::detail::is_initializer_list>)))); +concept viewable_range = + std::ranges::range + && ((std::ranges::view> && std::constructible_from, T>) + || (!std::ranges::view> + && (std::is_lvalue_reference_v + || (std::movable> + && !seqan::stl::detail::is_initializer_list>)))); } // namespace seqan::stl::ranges diff --git a/detail/adaptor_base.hpp b/detail/adaptor_base.hpp index b508f5ca..64420150 100644 --- a/detail/adaptor_base.hpp +++ b/detail/adaptor_base.hpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2006-2023, Knut Reinert & Freie Universität Berlin -// SPDX-FileCopyrightText: 2016-2023, Knut Reinert & MPI für molekulare Genetik +// SPDX-FileCopyrightText: 2006-2024 Knut Reinert & Freie Universität Berlin +// SPDX-FileCopyrightText: 2016-2024 Knut Reinert & MPI für molekulare Genetik // SPDX-License-Identifier: BSD-3-Clause /*!\file diff --git a/detail/adaptor_for_view_without_args.hpp b/detail/adaptor_for_view_without_args.hpp index 981abada..3e182a5b 100644 --- a/detail/adaptor_for_view_without_args.hpp +++ b/detail/adaptor_for_view_without_args.hpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2006-2023, Knut Reinert & Freie Universität Berlin -// SPDX-FileCopyrightText: 2016-2023, Knut Reinert & MPI für molekulare Genetik +// SPDX-FileCopyrightText: 2006-2024 Knut Reinert & Freie Universität Berlin +// SPDX-FileCopyrightText: 2016-2024 Knut Reinert & MPI für molekulare Genetik // SPDX-License-Identifier: BSD-3-Clause /*!\file diff --git a/detail/adaptor_from_functor.hpp b/detail/adaptor_from_functor.hpp index 7905cb05..a7c5aa6f 100644 --- a/detail/adaptor_from_functor.hpp +++ b/detail/adaptor_from_functor.hpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2006-2023, Knut Reinert & Freie Universität Berlin -// SPDX-FileCopyrightText: 2016-2023, Knut Reinert & MPI für molekulare Genetik +// SPDX-FileCopyrightText: 2006-2024 Knut Reinert & Freie Universität Berlin +// SPDX-FileCopyrightText: 2016-2024 Knut Reinert & MPI für molekulare Genetik // SPDX-License-Identifier: BSD-3-Clause /*!\file diff --git a/detail/compiler_definitions.hpp b/detail/compiler_definitions.hpp index 73211630..29a09d66 100644 --- a/detail/compiler_definitions.hpp +++ b/detail/compiler_definitions.hpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2006-2023, Knut Reinert & Freie Universität Berlin -// SPDX-FileCopyrightText: 2016-2023, Knut Reinert & MPI für molekulare Genetik +// SPDX-FileCopyrightText: 2006-2024 Knut Reinert & Freie Universität Berlin +// SPDX-FileCopyrightText: 2016-2024 Knut Reinert & MPI für molekulare Genetik // SPDX-License-Identifier: BSD-3-Clause /*!\file diff --git a/detail/exposition_only.hpp b/detail/exposition_only.hpp index 6b9b15c5..c79a6020 100644 --- a/detail/exposition_only.hpp +++ b/detail/exposition_only.hpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2006-2023, Knut Reinert & Freie Universität Berlin -// SPDX-FileCopyrightText: 2016-2023, Knut Reinert & MPI für molekulare Genetik +// SPDX-FileCopyrightText: 2006-2024 Knut Reinert & Freie Universität Berlin +// SPDX-FileCopyrightText: 2016-2024 Knut Reinert & MPI für molekulare Genetik // SPDX-License-Identifier: BSD-3-Clause /*!\file diff --git a/detail/movable_box.hpp b/detail/movable_box.hpp index a9daca2a..7be6865d 100644 --- a/detail/movable_box.hpp +++ b/detail/movable_box.hpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2006-2023, Knut Reinert & Freie Universität Berlin -// SPDX-FileCopyrightText: 2016-2023, Knut Reinert & MPI für molekulare Genetik +// SPDX-FileCopyrightText: 2006-2024 Knut Reinert & Freie Universität Berlin +// SPDX-FileCopyrightText: 2016-2024 Knut Reinert & MPI für molekulare Genetik // SPDX-License-Identifier: BSD-3-Clause /*!\file diff --git a/detail/non_propagating_cache.hpp b/detail/non_propagating_cache.hpp index 2ec119b0..8f1cfd79 100644 --- a/detail/non_propagating_cache.hpp +++ b/detail/non_propagating_cache.hpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2006-2023, Knut Reinert & Freie Universität Berlin -// SPDX-FileCopyrightText: 2016-2023, Knut Reinert & MPI für molekulare Genetik +// SPDX-FileCopyrightText: 2006-2024 Knut Reinert & Freie Universität Berlin +// SPDX-FileCopyrightText: 2016-2024 Knut Reinert & MPI für molekulare Genetik // SPDX-License-Identifier: BSD-3-Clause /*!\file diff --git a/join_with_view.hpp b/join_with_view.hpp index 7af082d4..c2a00e0f 100644 --- a/join_with_view.hpp +++ b/join_with_view.hpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2006-2023, Knut Reinert & Freie Universität Berlin -// SPDX-FileCopyrightText: 2016-2023, Knut Reinert & MPI für molekulare Genetik +// SPDX-FileCopyrightText: 2006-2024 Knut Reinert & Freie Universität Berlin +// SPDX-FileCopyrightText: 2016-2024 Knut Reinert & MPI für molekulare Genetik // SPDX-License-Identifier: BSD-3-Clause /*!\file diff --git a/pair.hpp b/pair.hpp index c74dcf78..618aa998 100644 --- a/pair.hpp +++ b/pair.hpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2006-2023, Knut Reinert & Freie Universität Berlin -// SPDX-FileCopyrightText: 2016-2023, Knut Reinert & MPI für molekulare Genetik +// SPDX-FileCopyrightText: 2006-2024 Knut Reinert & Freie Universität Berlin +// SPDX-FileCopyrightText: 2016-2024 Knut Reinert & MPI für molekulare Genetik // SPDX-License-Identifier: BSD-3-Clause /*!\file @@ -576,9 +576,9 @@ struct common_type, std::pair> template class TQual, template class UQual> requires requires { - typename seqan::stl::pair, UQual>, - std::common_reference_t, UQual>>; - } + typename seqan::stl::pair, UQual>, + std::common_reference_t, UQual>>; + } struct basic_common_reference, seqan::stl::pair, TQual, UQual> { using type = @@ -587,9 +587,9 @@ struct basic_common_reference, seqan::stl::pair template class TQual, template class UQual> requires requires { - typename seqan::stl::pair, UQual>, - std::common_reference_t, UQual>>; - } + typename seqan::stl::pair, UQual>, + std::common_reference_t, UQual>>; + } struct basic_common_reference, seqan::stl::pair, TQual, UQual> { using type = @@ -598,9 +598,9 @@ struct basic_common_reference, seqan::stl::pair, TQual template class TQual, template class UQual> requires requires { - typename seqan::stl::pair, UQual>, - std::common_reference_t, UQual>>; - } + typename seqan::stl::pair, UQual>, + std::common_reference_t, UQual>>; + } struct basic_common_reference, std::pair, TQual, UQual> { using type = diff --git a/to.hpp b/to.hpp index ed9ee3f5..e137db97 100644 --- a/to.hpp +++ b/to.hpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2006-2023, Knut Reinert & Freie Universität Berlin -// SPDX-FileCopyrightText: 2016-2023, Knut Reinert & MPI für molekulare Genetik +// SPDX-FileCopyrightText: 2006-2024 Knut Reinert & Freie Universität Berlin +// SPDX-FileCopyrightText: 2016-2024 Knut Reinert & MPI für molekulare Genetik // SPDX-License-Identifier: BSD-3-Clause /*!\file diff --git a/tuple.hpp b/tuple.hpp index 75264c65..952eca21 100644 --- a/tuple.hpp +++ b/tuple.hpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2006-2023, Knut Reinert & Freie Universität Berlin -// SPDX-FileCopyrightText: 2016-2023, Knut Reinert & MPI für molekulare Genetik +// SPDX-FileCopyrightText: 2006-2024 Knut Reinert & Freie Universität Berlin +// SPDX-FileCopyrightText: 2016-2024 Knut Reinert & MPI für molekulare Genetik // SPDX-License-Identifier: BSD-3-Clause /*!\file @@ -207,8 +207,7 @@ class tuple : public std::tuple [&](std::integer_sequence) { ((std::get(*this) = std::get(other)), ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); return *this; } @@ -220,8 +219,7 @@ class tuple : public std::tuple [&](std::integer_sequence) { ((std::get(*this) = std::get(other)), ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); return *this; } @@ -233,8 +231,7 @@ class tuple : public std::tuple [&](std::integer_sequence) { ((std::get(*this) = std::get(other)), ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); return *this; } @@ -246,8 +243,7 @@ class tuple : public std::tuple [&](std::integer_sequence) { ((std::get(*this) = std::get(other)), ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); return *this; } @@ -259,8 +255,7 @@ class tuple : public std::tuple [&](std::integer_sequence) { ((std::get(*this) = std::get(other)), ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); return *this; } @@ -272,8 +267,7 @@ class tuple : public std::tuple [&](std::integer_sequence) { ((std::get(*this) = std::get(other)), ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); return *this; } @@ -285,8 +279,7 @@ class tuple : public std::tuple [&](std::integer_sequence) { ((std::get(*this) = std::get(other)), ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); return *this; } @@ -298,8 +291,7 @@ class tuple : public std::tuple [&](std::integer_sequence) { ((std::get(*this) = std::get(other)), ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); return *this; } @@ -317,8 +309,7 @@ class tuple : public std::tuple [&](std::integer_sequence) { ((std::get(*this) = std::get(other)), ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); return *this; } @@ -330,8 +321,7 @@ class tuple : public std::tuple [&](std::integer_sequence) { ((std::get(*this) = std::get(other)), ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); return *this; } @@ -343,8 +333,7 @@ class tuple : public std::tuple [&](std::integer_sequence) { ((std::get(*this) = std::get(other)), ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); return *this; } @@ -356,8 +345,7 @@ class tuple : public std::tuple [&](std::integer_sequence) { ((std::get(*this) = std::get(other)), ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); return *this; } @@ -369,8 +357,7 @@ class tuple : public std::tuple [&](std::integer_sequence) { ((std::get(*this) = std::get(other)), ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); return *this; } @@ -382,8 +369,7 @@ class tuple : public std::tuple [&](std::integer_sequence) { ((std::get(*this) = std::get(other)), ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); return *this; } @@ -395,8 +381,7 @@ class tuple : public std::tuple [&](std::integer_sequence) { ((std::get(*this) = std::get(other)), ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); return *this; } @@ -408,8 +393,7 @@ class tuple : public std::tuple [&](std::integer_sequence) { ((std::get(*this) = std::get(other)), ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); return *this; } @@ -427,8 +411,7 @@ class tuple : public std::tuple [&](std::integer_sequence) { ((std::get(*this) = std::get(other)), ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); return *this; } @@ -440,8 +423,7 @@ class tuple : public std::tuple [&](std::integer_sequence) { ((std::get(*this) = std::get(other)), ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); return *this; } @@ -453,8 +435,7 @@ class tuple : public std::tuple [&](std::integer_sequence) { ((std::get(*this) = std::get(other)), ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); return *this; } @@ -466,8 +447,7 @@ class tuple : public std::tuple [&](std::integer_sequence) { ((std::get(*this) = std::get(other)), ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); return *this; } @@ -479,8 +459,7 @@ class tuple : public std::tuple [&](std::integer_sequence) { ((std::get(*this) = std::get(other)), ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); return *this; } @@ -492,8 +471,7 @@ class tuple : public std::tuple [&](std::integer_sequence) { ((std::get(*this) = std::get(other)), ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); return *this; } @@ -505,8 +483,7 @@ class tuple : public std::tuple [&](std::integer_sequence) { ((std::get(*this) = std::get(other)), ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); return *this; } @@ -518,8 +495,7 @@ class tuple : public std::tuple [&](std::integer_sequence) { ((std::get(*this) = std::get(other)), ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); return *this; } @@ -537,8 +513,7 @@ class tuple : public std::tuple [&](std::integer_sequence) { ((std::get(*this) = std::get(other)), ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); return *this; } @@ -550,8 +525,7 @@ class tuple : public std::tuple [&](std::integer_sequence) { ((std::get(*this) = std::get(other)), ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); return *this; } @@ -563,8 +537,7 @@ class tuple : public std::tuple [&](std::integer_sequence) { ((std::get(*this) = std::get(other)), ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); return *this; } @@ -576,8 +549,7 @@ class tuple : public std::tuple [&](std::integer_sequence) { ((std::get(*this) = std::get(other)), ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); return *this; } @@ -589,8 +561,7 @@ class tuple : public std::tuple [&](std::integer_sequence) { ((std::get(*this) = std::get(other)), ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); return *this; } @@ -602,8 +573,7 @@ class tuple : public std::tuple [&](std::integer_sequence) { ((std::get(*this) = std::get(other)), ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); return *this; } @@ -615,8 +585,7 @@ class tuple : public std::tuple [&](std::integer_sequence) { ((std::get(*this) = std::get(other)), ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); return *this; } @@ -628,8 +597,7 @@ class tuple : public std::tuple [&](std::integer_sequence) { ((std::get(*this) = std::get(other)), ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); return *this; } diff --git a/zip_view.hpp b/zip_view.hpp index 8daef551..6f264ca2 100644 --- a/zip_view.hpp +++ b/zip_view.hpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2006-2023, Knut Reinert & Freie Universität Berlin -// SPDX-FileCopyrightText: 2016-2023, Knut Reinert & MPI für molekulare Genetik +// SPDX-FileCopyrightText: 2006-2024 Knut Reinert & Freie Universität Berlin +// SPDX-FileCopyrightText: 2016-2024 Knut Reinert & MPI für molekulare Genetik // SPDX-License-Identifier: BSD-3-Clause /*!\file @@ -32,6 +32,7 @@ using std::ranges::views::zip; # include "concepts.hpp" # include "detail/compiler_definitions.hpp" # include "detail/exposition_only.hpp" +# include "pair.hpp" # include "tuple.hpp" namespace seqan::stl::detail::zip @@ -117,11 +118,10 @@ constexpr t abs(t && v) noexcept // https://eel.is/c++draft/range.zip#concept:zip-is-common template -concept zip_is_common = (sizeof...(range_ts) == 1 && (std::ranges::common_range && ...)) - || (!(std::ranges::bidirectional_range && ...) - && (std::ranges::common_range && ...)) - || ((std::ranges::random_access_range && ...) - && (std::ranges::sized_range && ...)); +concept zip_is_common = + (sizeof...(range_ts) == 1 && (std::ranges::common_range && ...)) + || (!(std::ranges::bidirectional_range && ...) && (std::ranges::common_range && ...)) + || ((std::ranges::random_access_range && ...) && (std::ranges::sized_range && ...)); } // namespace seqan::stl::detail::zip @@ -355,8 +355,7 @@ SEQAN_STD_NESTED_VISIBILITY return [&](std::integer_sequence) { return ((std::get(x.current_) == std::get(y.current_)) || ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); } } @@ -429,8 +428,7 @@ SEQAN_STD_NESTED_VISIBILITY { return seqan::stl::detail::zip::abs(b) < seqan::stl::detail::zip::abs(a); }); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); } friend constexpr auto iter_move(iterator const & i) noexcept( @@ -455,8 +453,7 @@ SEQAN_STD_NESTED_VISIBILITY [&](std::integer_sequence) { (std::ranges::iter_swap(std::get(l.current_), std::get(r.current)), ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); } }; @@ -498,8 +495,7 @@ SEQAN_STD_NESTED_VISIBILITY return [&](std::integer_sequence) { return ((std::get(x.current_) == std::get(y.end_)) || ...); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); } template @@ -519,8 +515,7 @@ SEQAN_STD_NESTED_VISIBILITY { return seqan::stl::detail::zip::abs(b) < seqan::stl::detail::zip::abs(a); }); - } - (std::index_sequence_for{}); + }(std::index_sequence_for{}); } template From 9ed6b5ac05aa38855a2443d1c9d269ac22735fb5 Mon Sep 17 00:00:00 2001 From: Enrico Seiler Date: Tue, 2 Jul 2024 13:16:25 +0200 Subject: [PATCH 2/3] debug1 --- cmake/package-lock.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/package-lock.cmake b/cmake/package-lock.cmake index 802f9cb8..72953568 100644 --- a/cmake/package-lock.cmake +++ b/cmake/package-lock.cmake @@ -35,7 +35,7 @@ CPMDeclarePackage (googletest VERSION ${HIBF_GOOGLETEST_VERSION} GITHUB_REPOSITORY google/googletest SYSTEM TRUE - OPTIONS "BUILD_GMOCK OFF" "INSTALL_GTEST OFF") + OPTIONS "BUILD_GMOCK OFF" "INSTALL_GTEST OFF" "CMAKE_CXX_STANDARD 20") # doxygen-awesome set (HIBF_DOXYGEN_AWESOME_VERSION 2.3.2) CPMDeclarePackage (doxygen_awesome From 087fb915d326c23806e29905fab40445860a7681 Mon Sep 17 00:00:00 2001 From: Enrico Seiler Date: Tue, 2 Jul 2024 13:21:01 +0200 Subject: [PATCH 3/3] debug2 --- cmake/package-lock.cmake | 2 +- test/header/CMakeLists.txt | 3 +++ test/performance/CMakeLists.txt | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cmake/package-lock.cmake b/cmake/package-lock.cmake index 72953568..1f5fad30 100644 --- a/cmake/package-lock.cmake +++ b/cmake/package-lock.cmake @@ -21,7 +21,7 @@ CPMDeclarePackage (simde DOWNLOAD_ONLY YES GITHUB_REPOSITORY simd-everywhere/simde) # benchmark -set (HIBF_BENCHMARK_VERSION 1.8.2) +set (HIBF_BENCHMARK_VERSION 1.8.4) CPMDeclarePackage (benchmark NAME benchmark VERSION ${HIBF_BENCHMARK_VERSION} diff --git a/test/header/CMakeLists.txt b/test/header/CMakeLists.txt index 98389767..03489101 100644 --- a/test/header/CMakeLists.txt +++ b/test/header/CMakeLists.txt @@ -125,6 +125,9 @@ macro (hibf_header_test component header_base_path exclude_regex) endmacro () CPMGetPackage (benchmark) +if (benchmark_ADDED) + set_target_properties (benchmark PROPERTIES CXX_STANDARD 20) +endif () CPMGetPackage (googletest) # note: hibf/version.hpp is one of the only header that is not required to have a hibf/platform.hpp include diff --git a/test/performance/CMakeLists.txt b/test/performance/CMakeLists.txt index 76cfa338..88ae02fa 100644 --- a/test/performance/CMakeLists.txt +++ b/test/performance/CMakeLists.txt @@ -26,5 +26,8 @@ macro (hibf_benchmark benchmark_cpp) endmacro () CPMGetPackage (benchmark) +if (benchmark_ADDED) + set_target_properties (benchmark PROPERTIES CXX_STANDARD 20) +endif () add_subdirectories ()