diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/AllJetsGrouper.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/AllJetsGrouper.h index 9bc4ae4008f925838d45a82f05162d0f03d551de..47cdba67e25b3dad7025dcccf721bae6d73f2e9d 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 f98c2407a8eb2e99f76ee381482b2b8fb1e2af9c..6104c6517a7def1ae9b0089a50d6dc18ee70201a 100644 --- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetConditionConfig_capacitychecked.cxx +++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetConditionConfig_capacitychecked.cxx @@ -43,7 +43,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 f407bcf776c44e383135eb661b09e5397aa64acd..c819ee3580b170c7d76d5fd5fe25f403a6890a10 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));