Skip to content

Commit 21d1f09

Browse files
committed
Use std::move rather than move
See https://reviews.llvm.org/D119670?id=408276 for the rationale. Clang on macOS now has this on by default and pollutes builds with warnings.
1 parent 9acd0cf commit 21d1f09

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

Framework/test/testAggregatorRunner.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ BOOST_AUTO_TEST_CASE(test_aggregator_runner)
7373
{ "qcConfiguration", VariantType::Dict, emptyDict(), { "Some dictionary configuration" } }
7474
};
7575
std::vector<std::unique_ptr<ParamRetriever>> retr;
76-
std::unique_ptr<ConfigParamStore> store = make_unique<ConfigParamStore>(move(options), move(retr));
76+
std::unique_ptr<ConfigParamStore> store = make_unique<ConfigParamStore>(std::move(options), std::move(retr));
7777
ConfigParamRegistry cfReg(std::move(store));
7878
ServiceRegistry sReg;
7979
InitContext initContext{ cfReg, sReg };
@@ -157,4 +157,4 @@ BOOST_AUTO_TEST_CASE(test_getDetector)
157157
auto checkEMC = std::make_shared<Aggregator>(config);
158158
aggregators.push_back(checkEMC);
159159
BOOST_CHECK_EQUAL(AggregatorRunner::getDetectorName(aggregators), "MANY");
160-
}
160+
}

Framework/test/testTaskInterface.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ o2::framework::ConfigParamRegistry createDummyRegistry()
4141
{
4242
using namespace o2::framework;
4343
std::unique_ptr<ParamRetriever> retriever;
44-
ConfigParamRegistry registry(move(retriever));
44+
ConfigParamRegistry registry(std::move(retriever));
4545

4646
return registry;
4747
}

Framework/test/testTaskRunner.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ BOOST_AUTO_TEST_CASE(test_task_runner)
112112
{ "qcConfiguration", VariantType::Dict, emptyDict(), { "Some dictionary configuration" } }
113113
};
114114
std::vector<std::unique_ptr<ParamRetriever>> retr;
115-
std::unique_ptr<ConfigParamStore> store = make_unique<ConfigParamStore>(move(options), move(retr));
115+
std::unique_ptr<ConfigParamStore> store = make_unique<ConfigParamStore>(std::move(options), std::move(retr));
116116
ConfigParamRegistry cfReg(std::move(store));
117117
ServiceRegistry sReg;
118118
InitContext initContext{ cfReg, sReg };

0 commit comments

Comments
 (0)