From 179f43c807f52d15e6fd1d402da47c9fffb8a3c2 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Tue, 8 Dec 2020 16:23:56 +0100
Subject: [PATCH] TrigHLTJetHypo: Fix clang warnings.
Missing override keyword.
Don't use std::move with a non-lvalue.
---
.../TrigHLTJetHypo/TrigHLTJetHypoUtils/AllJetsGrouper.h | 2 +-
.../src/TrigJetConditionConfig_capacitychecked.cxx | 2 +-
.../src/TrigJetHypoToolConfig_fastreduction.cxx | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/AllJetsGrouper.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/AllJetsGrouper.h
index 9bc4ae4008f..47cdba67e25 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/AllJetsGrouper.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/AllJetsGrouper.h
@@ -16,7 +16,7 @@ class AllJetsGrouper: public IJetGrouper{
std::vector<HypoJetGroupVector> group(HypoJetIter&,
HypoJetIter&) const override;
- std::optional<HypoJetGroupVector> next();
+ virtual std::optional<HypoJetGroupVector> next() override;
std::string getName() const override;
std::string toString() const override;
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetConditionConfig_capacitychecked.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetConditionConfig_capacitychecked.cxx
index 7e6b83429a5..cbfc4a02ac0 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetConditionConfig_capacitychecked.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetConditionConfig_capacitychecked.cxx
@@ -42,7 +42,7 @@ TrigJetConditionConfig_capacitychecked::getCapacityCheckedCondition() const {
StatusCode TrigJetConditionConfig_capacitychecked::checkVals() const {
- if (m_multiplicity < 1) {
+ if (m_multiplicity < 1u) {
ATH_MSG_ERROR("m_multiplicity = " + std::to_string(m_multiplicity) +
"expected > 0");
return StatusCode::FAILURE;
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_fastreduction.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_fastreduction.cxx
index f407bcf776c..c819ee3580b 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_fastreduction.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_fastreduction.cxx
@@ -116,7 +116,7 @@ TrigJetHypoToolConfig_fastreduction::getCapacityCheckedConditions() const {
// return an invalid optional if any src signals a problem
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));
@@ -128,7 +128,7 @@ TrigJetHypoToolConfig_fastreduction::getConditions() const {
ConditionsMT conditions;
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));
--
GitLab