Skip to content

Commit 1b672ad

Browse files
authored
Merge pull request seqan#3257 from eseiler/infra/clang-18
[FIX] clang-18
2 parents 21c7d04 + de751e3 commit 1b672ad

File tree

3 files changed

+13
-17
lines changed

3 files changed

+13
-17
lines changed

include/seqan3/contrib/parallel/buffer_queue.hpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <cassert>
1616
#include <cmath>
1717
#include <concepts>
18+
#include <exception>
1819
#include <mutex>
1920
#include <ranges>
2021
#include <seqan3/std/new>
@@ -334,15 +335,15 @@ class buffer_queue
334335
}
335336

336337
template <typename value2_t>
337-
requires (std::convertible_to<value2_t, value_t>) && (buffer_policy == buffer_queue_policy::fixed) bool
338-
overflow(value2_t &&)
338+
requires (std::convertible_to<value2_t, value_t>) && (buffer_policy == buffer_queue_policy::fixed)
339+
bool overflow(value2_t &&)
339340
{
340341
return false;
341342
}
342343

343344
template <typename value2_t>
344-
requires (std::convertible_to<value2_t, value_t>) && (buffer_policy == buffer_queue_policy::dynamic) bool
345-
overflow(value2_t && value);
345+
requires (std::convertible_to<value2_t, value_t>) && (buffer_policy == buffer_queue_policy::dynamic)
346+
bool overflow(value2_t && value);
346347

347348
//!\brief The buffer that is used as ring buffer.
348349
buffer_t buffer;

include/seqan3/core/detail/template_inspection.hpp

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,8 @@ struct is_type_specialisation_of : public std::false_type
135135
{};
136136

137137
//!\overload
138-
template <typename source_t, template <typename...> typename target_template>
139-
requires (
140-
!std::same_as<transformation_trait_or_t<transfer_template_args_onto<source_t, target_template>, void>, void>)
141-
struct is_type_specialisation_of<source_t, target_template> :
142-
std::is_same<source_t, transfer_template_args_onto_t<source_t, target_template>>
138+
template <template <typename...> typename source_t, typename... source_args>
139+
struct is_type_specialisation_of<source_t<source_args...>, source_t> : public std::true_type
143140
{};
144141

145142
/*!\brief Helper variable template for seqan3::detail::is_type_specialisation_of (unary_type_trait shortcut).
@@ -169,11 +166,8 @@ struct is_value_specialisation_of : std::false_type
169166
* \see seqan3::detail::is_type_specialisation_of
170167
* \see seqan3::detail::is_value_specialisation_of_v
171168
*/
172-
template <typename source_t, template <auto...> typename target_template>
173-
requires (
174-
!std::same_as<transformation_trait_or_t<transfer_template_vargs_onto<source_t, target_template>, void>, void>)
175-
struct is_value_specialisation_of<source_t, target_template> :
176-
std::is_same<source_t, transfer_template_vargs_onto_t<source_t, target_template>>
169+
template <template <auto...> typename source_t, auto... source_args>
170+
struct is_value_specialisation_of<source_t<source_args...>, source_t> : public std::true_type
177171
{};
178172

179173
/*!\brief Helper variable template for seqan3::detail::is_value_specialisation_of (unary_type_trait shortcut).

include/seqan3/io/sam_file/format_sam.hpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -295,11 +295,12 @@ inline void format_sam::read_sequence_record(stream_type & stream,
295295
if (std::ranges::distance(sequence) == 0)
296296
throw parse_error{"The sequence information must not be empty."};
297297
if constexpr (!detail::decays_to_ignore_v<id_type>)
298+
{
298299
if (std::ranges::distance(id) == 0)
299300
throw parse_error{"The id information must not be empty."};
300-
301-
if (options.truncate_ids)
302-
id = id | detail::take_until_and_consume(is_space) | ranges::to<id_type>();
301+
if (options.truncate_ids)
302+
id = id | detail::take_until_and_consume(is_space) | ranges::to<id_type>();
303+
}
303304
}
304305

305306
//!\copydoc sequence_file_output_format::write_sequence_record

0 commit comments

Comments
 (0)