Fix 'unqualified call to std::move' errors in clang 15+

This commit is contained in:
Konstantinos Margaritis
2023-10-03 20:24:39 +03:00
parent 4918f81ea3
commit 0d2f9ccbaa
37 changed files with 224 additions and 224 deletions

View File

@@ -174,7 +174,7 @@ unique_ptr<EngineStream> EngineHyperscan::streamOpen(EngineContext &ectx,
return nullptr;
}
stream->sn = streamId;
return move(stream);
return std::move(stream);
}
void EngineHyperscan::streamClose(unique_ptr<EngineStream> stream,

View File

@@ -111,7 +111,7 @@ public:
thread_barrier &tb_in, thread_func_t function_in,
vector<DataBlock> corpus_data_in)
: num(num_in), results(repeats), engine(db_in),
enginectx(db_in.makeContext()), corpus_data(move(corpus_data_in)),
enginectx(db_in.makeContext()), corpus_data(std::move(corpus_data_in)),
tb(tb_in), function(function_in) {}
// Start the thread.
@@ -219,7 +219,7 @@ void usage(const char *error) {
/** Wraps up a name and the set of signature IDs it refers to. */
struct BenchmarkSigs {
BenchmarkSigs(string name_in, SignatureSet sigs_in)
: name(move(name_in)), sigs(move(sigs_in)) {}
: name(std::move(name_in)), sigs(std::move(sigs_in)) {}
string name;
SignatureSet sigs;
};
@@ -457,7 +457,7 @@ void processArgs(int argc, char *argv[], vector<BenchmarkSigs> &sigSets,
for (const auto &file : sigFiles) {
SignatureSet sigs;
loadSignatureList(file, sigs);
sigSets.emplace_back(file, move(sigs));
sigSets.emplace_back(file, std::move(sigs));
}
useLiteralApi = (bool)literalFlag;
@@ -590,7 +590,7 @@ void benchStreamingInternal(ThreadContext *ctx, vector<StreamInfo> &streams,
// if this was the last block in the stream, close the stream handle
if (b.id == stream.last_block_id) {
e.streamClose(move(stream.eng_handle), r);
e.streamClose(std::move(stream.eng_handle), r);
stream.eng_handle = nullptr;
}
}
@@ -963,7 +963,7 @@ void runBenchmark(const Engine &db,
printf("Unable to start processing thread %u\n", i);
exit(1);
}
threads.push_back(move(t));
threads.push_back(std::move(t));
}
// Reap threads.
@@ -1011,7 +1011,7 @@ int HS_CDECL main(int argc, char *argv[]) {
for (auto i : exprMapTemplate | map_keys) {
sigs.push_back(i);
}
sigSets.emplace_back(exprPath, move(sigs));
sigSets.emplace_back(exprPath, std::move(sigs));
}
// read in and process our corpus