diff --git a/tools/hscollider/GraphTruth.cpp b/tools/hscollider/GraphTruth.cpp index 6069ff5c..bd18d655 100644 --- a/tools/hscollider/GraphTruth.cpp +++ b/tools/hscollider/GraphTruth.cpp @@ -133,7 +133,7 @@ void CNGInfo::compile() { auto pl = std::make_unique(); pl->parseLogicalCombination(id, re.c_str(), ~0U, 0, ~0ULL); pl->logicalKeyRenumber(); - cng = make_unique(move(pl)); + cng = make_unique(std::move(pl)); return; } @@ -192,7 +192,7 @@ void CNGInfo::compile() { } } - cng = make_unique(move(g), move(rm)); + cng = make_unique(std::move(g), std::move(rm)); } catch (CompileError &e) { throw NGCompileFailure(e.reason); } catch (NGUnsupportedFailure &e) { diff --git a/tools/hscollider/NfaGeneratedCorpora.cpp b/tools/hscollider/NfaGeneratedCorpora.cpp index 4de320e1..07213889 100644 --- a/tools/hscollider/NfaGeneratedCorpora.cpp +++ b/tools/hscollider/NfaGeneratedCorpora.cpp @@ -107,7 +107,7 @@ void NfaGeneratedCorpora::generate(unsigned id, vector &data) { a_subid = it.first; vector sub_data; generate(a_subid, sub_data); - m_data.emplace(a_subid, move(sub_data)); + m_data.emplace(a_subid, std::move(sub_data)); } assert(!m_data.empty()); size_t num_corpus = m_data[a_subid].size(); diff --git a/tools/hscollider/UltimateTruth.cpp b/tools/hscollider/UltimateTruth.cpp index c448b780..93d432c3 100644 --- a/tools/hscollider/UltimateTruth.cpp +++ b/tools/hscollider/UltimateTruth.cpp @@ -1079,7 +1079,7 @@ shared_ptr UltimateTruth::compile(const set &ids, } } - return move(db); + return std::move(db); } bool UltimateTruth::allocScratch(shared_ptr db) { diff --git a/tools/hscollider/main.cpp b/tools/hscollider/main.cpp index 7c071903..dcc5c1b6 100644 --- a/tools/hscollider/main.cpp +++ b/tools/hscollider/main.cpp @@ -1188,7 +1188,7 @@ struct CorpusGenUnit { CorpusGenUnit(unique_ptr cngi_in, unique_ptr pcre_in, shared_ptr ue2_in, unsigned expr_id, bool multi_in, bool utf8_in) - : cngi(move(cngi_in)), pcre(move(pcre_in)), ue2(ue2_in), id(expr_id), + : cngi(std::move(cngi_in)), pcre(std::move(pcre_in)), ue2(ue2_in), id(expr_id), multi(multi_in), utf8(utf8_in) {} unique_ptr cngi; @@ -1220,7 +1220,7 @@ public: } addCorporaToQueue(out, testq, c->id, *corpora, summary, - move(c->pcre), move(c->cngi), c->ue2, c->multi, + std::move(c->pcre), std::move(c->cngi), c->ue2, c->multi, c->utf8); count++; @@ -1434,7 +1434,7 @@ unique_ptr makeCorpusGenUnit(unsigned id, TestSummary &summary, // Caller may already have set the UTF-8 property (in multi cases) utf8 |= cpcre ? cpcre->utf8 : cngi->utf8; - return std::make_unique(move(cngi), move(cpcre), ue2, id, + return std::make_unique(std::move(cngi), std::move(cpcre), ue2, id, multi, utf8); } @@ -1489,7 +1489,7 @@ void buildSingle(BoundedQueue &corpq, TestSummary &summary, auto u = makeCorpusGenUnit(id, summary, ground, graph, ultimate, ue2, multi, utf8); if (u) { - corpq.push(move(u)); + corpq.push(std::move(u)); } } } @@ -1547,7 +1547,7 @@ void buildBanded(BoundedQueue &corpq, TestSummary &summary, auto u = makeCorpusGenUnit(id, summary, ground, graph, ultimate, ue2, multi, utf8); if (u) { - corpq.push(move(u)); + corpq.push(std::move(u)); } } } @@ -1587,7 +1587,7 @@ void buildMulti(BoundedQueue &corpq, TestSummary &summary, auto u = makeCorpusGenUnit(id, summary, ground, graph, ultimate, ue2, multi, utf8); if (u) { - corpq.push(move(u)); + corpq.push(std::move(u)); } } } @@ -1607,7 +1607,7 @@ void generateTests(CorporaSource &corpora_src, const ExpressionMap &exprMap, for (size_t i = 0; i < numGeneratorThreads; i++) { auto c = make_unique(i, testq, corpq, corpora_src); c->start(); - generators.push_back(move(c)); + generators.push_back(std::move(c)); } if (g_ue2CompileAll && multicompile_bands) { @@ -1830,11 +1830,11 @@ unique_ptr buildCorpora(const vector &corporaFiles, exit_with_fail(); } } - return move(c); /* move allows unique_ptr conversion */ + return std::move(c); /* move allows unique_ptr conversion */ } else { auto c = std::make_unique( exprMap, corpus_gen_prop, force_utf8, force_prefilter); - return move(c); + return std::move(c); } } @@ -1883,7 +1883,7 @@ bool runTests(CorporaSource &corpora_source, const ExpressionMap &exprMap, for (size_t i = 0; i < numScannerThreads; i++) { auto s = std::make_unique(i, testq, exprMap, plat, grey); s->start(); - scanners.push_back(move(s)); + scanners.push_back(std::move(s)); } generateTests(corpora_source, exprMap, summary, plat, grey, testq);