Skip to content
Snippets Groups Projects
Commit 285addf8 authored by Edward Moyse's avatar Edward Moyse
Browse files

Merge branch 'clang.TrigHLTJetHypo-20201208' into 'master'

TrigHLTJetHypo: Fix clang warnings.

See merge request atlas/athena!38991
parents 1e11ca0c 179f43c8
No related branches found
No related tags found
No related merge requests found
...@@ -16,7 +16,7 @@ class AllJetsGrouper: public IJetGrouper{ ...@@ -16,7 +16,7 @@ class AllJetsGrouper: public IJetGrouper{
std::vector<HypoJetGroupVector> group(HypoJetIter&, std::vector<HypoJetGroupVector> group(HypoJetIter&,
HypoJetIter&) const override; HypoJetIter&) const override;
std::optional<HypoJetGroupVector> next(); virtual std::optional<HypoJetGroupVector> next() override;
std::string getName() const override; std::string getName() const override;
std::string toString() const override; std::string toString() const override;
......
...@@ -43,7 +43,7 @@ TrigJetConditionConfig_capacitychecked::getCapacityCheckedCondition() const { ...@@ -43,7 +43,7 @@ TrigJetConditionConfig_capacitychecked::getCapacityCheckedCondition() const {
StatusCode TrigJetConditionConfig_capacitychecked::checkVals() const { StatusCode TrigJetConditionConfig_capacitychecked::checkVals() const {
if (m_multiplicity < 1) { if (m_multiplicity < 1u) {
ATH_MSG_ERROR("m_multiplicity = " + std::to_string(m_multiplicity) + ATH_MSG_ERROR("m_multiplicity = " + std::to_string(m_multiplicity) +
"expected > 0"); "expected > 0");
return StatusCode::FAILURE; return StatusCode::FAILURE;
......
...@@ -116,7 +116,7 @@ TrigJetHypoToolConfig_fastreduction::getCapacityCheckedConditions() const { ...@@ -116,7 +116,7 @@ TrigJetHypoToolConfig_fastreduction::getCapacityCheckedConditions() const {
// return an invalid optional if any src signals a problem // return an invalid optional if any src signals a problem
for(const auto& cm : m_conditionMakers){ for(const auto& cm : m_conditionMakers){
conditions.push_back(std::move(cm->getCapacityCheckedCondition())); conditions.push_back(cm->getCapacityCheckedCondition());
} }
return std::make_optional<ConditionPtrs>(std::move(conditions)); return std::make_optional<ConditionPtrs>(std::move(conditions));
...@@ -128,7 +128,7 @@ TrigJetHypoToolConfig_fastreduction::getConditions() const { ...@@ -128,7 +128,7 @@ TrigJetHypoToolConfig_fastreduction::getConditions() const {
ConditionsMT conditions; ConditionsMT conditions;
for(const auto& cm : m_conditionMakers){ for(const auto& cm : m_conditionMakers){
conditions.push_back(std::move(cm->getCapacityCheckedCondition())); conditions.push_back(cm->getCapacityCheckedCondition());
} }
return std::make_optional<ConditionsMT>(std::move(conditions)); return std::make_optional<ConditionsMT>(std::move(conditions));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment