diff --git a/hashing.hh b/hashing.hh index 65501a9d45..59026fd4f7 100644 --- a/hashing.hh +++ b/hashing.hh @@ -46,7 +46,7 @@ GCC6_CONCEPT( template concept bool Hasher() { return requires(H& h, const char* ptr, size_t size) { - { h.update(ptr, size) } -> void + { h.update(ptr, size) } -> void; }; } ) diff --git a/mutation_fragment.hh b/mutation_fragment.hh index 4fcbc642c9..d22e1097d1 100644 --- a/mutation_fragment.hh +++ b/mutation_fragment.hh @@ -636,8 +636,8 @@ GCC6_CONCEPT( template concept bool StreamedMutationTranformer() { return requires(F f, mutation_fragment mf, schema_ptr s) { - { f(std::move(mf)) } -> mutation_fragment - { f(s) } -> schema_ptr + { f(std::move(mf)) } -> mutation_fragment; + { f(s) } -> schema_ptr; }; } ) diff --git a/partition_version.cc b/partition_version.cc index 1d1fbb2d98..1831716247 100644 --- a/partition_version.cc +++ b/partition_version.cc @@ -90,7 +90,7 @@ GCC6_CONCEPT( template concept bool Mapper() { return requires(U obj, const Domain& src) { - { obj(src) } -> const CoDomain& + { obj(src) } -> const CoDomain&; }; } diff --git a/sstables/partition.cc b/sstables/partition.cc index 01fb0366fb..a7d93e9d53 100644 --- a/sstables/partition.cc +++ b/sstables/partition.cc @@ -82,7 +82,7 @@ concept bool RowConsumer() { { t.io_priority() } -> const io_priority_class&; { t.is_mutation_end() } -> bool; { t.setup_for_partition(pk) } -> void; - { t.push_ready_fragments() } -> void + { t.push_ready_fragments() } -> void; { t.maybe_skip() } -> std::optional; { t.fast_forward_to(std::move(cr), timeout) } -> std::optional; }; diff --git a/sstables/types.hh b/sstables/types.hh index fa80ce1f94..0bd2b6d991 100644 --- a/sstables/types.hh +++ b/sstables/types.hh @@ -53,7 +53,7 @@ GCC6_CONCEPT( template concept bool Writer() { return requires(T& wr, const char* data, size_t size) { - { wr.write(data, size) } -> void + { wr.write(data, size) } -> void; }; } ) diff --git a/test/boost/sstable_test.hh b/test/boost/sstable_test.hh index efbfde2b80..6f708fbdb4 100644 --- a/test/boost/sstable_test.hh +++ b/test/boost/sstable_test.hh @@ -243,7 +243,7 @@ inline std::array all_sstable_versions = { }; template -GCC6_CONCEPT( requires requires (AsyncAction aa, sstables::sstable::version_types& c) { { aa(c) } -> future<> } ) +GCC6_CONCEPT( requires requires (AsyncAction aa, sstables::sstable::version_types& c) { { aa(c) } -> future<>; } ) inline future<> for_each_sstable_version(AsyncAction action) { return seastar::do_for_each(all_sstable_versions, std::move(action));