mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-05-12 19:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

treewide: tighten concepts syntax

Browse Source 
gcc 10 requires a semicolon after every compound requirement,
as per the standard. Add missing semicolons where necessary.
Message-Id: <20200129205805.20928-1-avi@scylladb.com>
This commit is contained in:
Avi Kivity
2020-01-29 22:58:05 +02:00
parent 4b4efcf302
commit adb64dc72f
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hashing.hh
View File

@@ -46,7 +46,7 @@ GCC6_CONCEPT(
template<typename H>
concept bool Hasher() {
return requires(H& h, const char* ptr, size_t size) {
{ h.update(ptr, size) } -> void
{ h.update(ptr, size) } -> void;
};
}
)

4
mutation_fragment.hh
View File

@@ -636,8 +636,8 @@ GCC6_CONCEPT(
template<typename F>
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;
};
}
)

2
partition_version.cc
View File

@@ -90,7 +90,7 @@ GCC6_CONCEPT(
template<typename U, typename Domain, typename CoDomain>
concept bool Mapper() {
return requires(U obj, const Domain& src) {
{ obj(src) } -> const CoDomain&
{ obj(src) } -> const CoDomain&;
};
}

2
sstables/partition.cc
View File

@@ -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<position_in_partition_view>;
{ t.fast_forward_to(std::move(cr), timeout) } -> std::optional<position_in_partition_view>;
};

2
sstables/types.hh
View File

@@ -53,7 +53,7 @@ GCC6_CONCEPT(
template<typename T>
concept bool Writer() {
return requires(T& wr, const char* data, size_t size) {
{ wr.write(data, size) } -> void
{ wr.write(data, size) } -> void;
};
}
)

2
test/boost/sstable_test.hh
View File

@@ -243,7 +243,7 @@ inline std::array<sstables::sstable::version_types, 3> all_sstable_versions = {
};
template<typename AsyncAction>
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));