From 1f77ec0994a88179e5f06881a70f6fc0fa0eac43 Mon Sep 17 00:00:00 2001 From: Ivan Razumov Date: Tue, 23 Apr 2024 09:11:10 +0200 Subject: [PATCH] [GCC13] Fix Woverloaded-virtual warning --- .../interface/PixelToFEDAssociateFromAscii.h | 2 ++ CondFormats/L1TObjects/interface/L1MuPacking.h | 10 ++++++++++ DQM/EcalCommon/interface/MESetDet0D.h | 3 +++ DQM/EcalCommon/interface/MESetDet1D.h | 3 +++ DQM/EcalCommon/interface/MESetDet2D.h | 3 +++ DQM/EcalCommon/interface/MESetProjection.h | 3 +++ DQM/HcalCommon/interface/ContainerProf2D.h | 8 +++++++- DataFormats/L1Trigger/interface/EGamma.h | 6 ++++-- DataFormats/L1Trigger/interface/EtSum.h | 6 ++++-- DataFormats/L1Trigger/interface/Jet.h | 6 ++++-- DataFormats/L1Trigger/interface/Muon.h | 6 ++++-- DataFormats/L1Trigger/interface/MuonShower.h | 6 ++++-- DataFormats/L1Trigger/interface/Tau.h | 6 ++++-- DataFormats/SiStripDigi/interface/SiStripRawDigi.h | 1 + 14 files changed, 56 insertions(+), 13 deletions(-) diff --git a/CalibTracker/SiPixelConnectivity/interface/PixelToFEDAssociateFromAscii.h b/CalibTracker/SiPixelConnectivity/interface/PixelToFEDAssociateFromAscii.h index 85f8750a1bceb..23df5e4354de6 100644 --- a/CalibTracker/SiPixelConnectivity/interface/PixelToFEDAssociateFromAscii.h +++ b/CalibTracker/SiPixelConnectivity/interface/PixelToFEDAssociateFromAscii.h @@ -67,5 +67,7 @@ class PixelToFEDAssociateFromAscii : public PixelToFEDAssociate { Bdu getBdu(std::string) const; Edu getEdu(std::string) const; Range readRange(const std::string &) const; + + using PixelToFEDAssociate::operator(); }; #endif diff --git a/CondFormats/L1TObjects/interface/L1MuPacking.h b/CondFormats/L1TObjects/interface/L1MuPacking.h index 050a044d972dd..39645a55d2d7c 100644 --- a/CondFormats/L1TObjects/interface/L1MuPacking.h +++ b/CondFormats/L1TObjects/interface/L1MuPacking.h @@ -82,6 +82,11 @@ class L1MuUnsignedPackingGeneric : public L1MuPacking { << "L1MuUnignedPacking::packedFromIdx: warning value " << idx << "exceeds " << nbits << "-bit range !!!"; return (unsigned)idx; }; + +private: + int signFromPacked(unsigned packed) const = 0; + int idxFromPacked(unsigned packed) const = 0; + unsigned packedFromIdx(int idx) const = 0; }; /** @@ -127,6 +132,11 @@ class L1MuSignedPackingGeneric : public L1MuPacking { << "L1MuSignedPacking::packedFromIdx: warning value " << idx << "exceeds " << nbits << "-bit range !!!"; return ~(std::numeric_limits::max() << nbits) & (idx < 0 ? (1U << nbits) + idx : idx); }; + +private: + int signFromPacked(unsigned packed) const = 0; + int idxFromPacked(unsigned packed) const = 0; + unsigned packedFromIdx(int idx) const = 0; }; /** diff --git a/DQM/EcalCommon/interface/MESetDet0D.h b/DQM/EcalCommon/interface/MESetDet0D.h index c52254831aee1..95ac7311771f6 100644 --- a/DQM/EcalCommon/interface/MESetDet0D.h +++ b/DQM/EcalCommon/interface/MESetDet0D.h @@ -37,6 +37,9 @@ namespace ecaldqm { double getBinContent(EcalDQMSetupObjects const, int, int = 0) const override; void reset(EcalElectronicsMapping const *, double = 0., double = 0., double = 0.) override; + + private: + using ecaldqm::MESetEcal::operator=; }; } // namespace ecaldqm diff --git a/DQM/EcalCommon/interface/MESetDet1D.h b/DQM/EcalCommon/interface/MESetDet1D.h index 1c548e208c15f..0f8f449ac6a10 100644 --- a/DQM/EcalCommon/interface/MESetDet1D.h +++ b/DQM/EcalCommon/interface/MESetDet1D.h @@ -69,6 +69,9 @@ namespace ecaldqm { int findBin(EcalDQMSetupObjects const, int, double, double = 0.) const override; void reset(EcalElectronicsMapping const *, double = 0., double = 0., double = 0.) override; + + private: + using ecaldqm::MESetEcal::operator=; }; } // namespace ecaldqm diff --git a/DQM/EcalCommon/interface/MESetDet2D.h b/DQM/EcalCommon/interface/MESetDet2D.h index 1a3d93659a0d0..f100e4f47986f 100644 --- a/DQM/EcalCommon/interface/MESetDet2D.h +++ b/DQM/EcalCommon/interface/MESetDet2D.h @@ -66,6 +66,9 @@ namespace ecaldqm { void fill_(unsigned, int, double) override; void fill_(unsigned, int, double, double) override; void fill_(unsigned, double, double, double) override; + + private: + using ecaldqm::MESetEcal::operator=; }; } // namespace ecaldqm diff --git a/DQM/EcalCommon/interface/MESetProjection.h b/DQM/EcalCommon/interface/MESetProjection.h index 63fa018bb03b8..bf3a97cff5023 100644 --- a/DQM/EcalCommon/interface/MESetProjection.h +++ b/DQM/EcalCommon/interface/MESetProjection.h @@ -42,6 +42,9 @@ namespace ecaldqm { using MESetEcal::getBinEntries; double getBinEntries(EcalDQMSetupObjects const, DetId const &, int = 0) const override; + + private: + using ecaldqm::MESetEcal::operator=; }; } // namespace ecaldqm diff --git a/DQM/HcalCommon/interface/ContainerProf2D.h b/DQM/HcalCommon/interface/ContainerProf2D.h index eef3fd7f6d88c..8b4a10ad87174 100644 --- a/DQM/HcalCommon/interface/ContainerProf2D.h +++ b/DQM/HcalCommon/interface/ContainerProf2D.h @@ -76,7 +76,13 @@ namespace hcaldqm { void fill(HcalElectronicsId const &, double, double, double); void fill(HcalTrigTowerDetId const &, double, double, double); - protected: + private: + void fill(uint32_t) override{}; + void fill(uint32_t, int) override{}; + void fill(uint32_t, double) override{}; + void fill(uint32_t, int, double) override{}; + void fill(uint32_t, int, int) override{}; + void fill(uint32_t, double, double) override{}; }; } // namespace hcaldqm diff --git a/DataFormats/L1Trigger/interface/EGamma.h b/DataFormats/L1Trigger/interface/EGamma.h index 18079f78b4ddc..a94949770e485 100644 --- a/DataFormats/L1Trigger/interface/EGamma.h +++ b/DataFormats/L1Trigger/interface/EGamma.h @@ -48,10 +48,12 @@ namespace l1t { short int shape() const; short int towerHoE() const; - virtual bool operator==(const l1t::EGamma& rhs) const; - virtual inline bool operator!=(const l1t::EGamma& rhs) const { return !(operator==(rhs)); }; + bool operator==(const l1t::EGamma& rhs) const; + inline bool operator!=(const l1t::EGamma& rhs) const { return !(operator==(rhs)); }; private: + using L1Candidate::operator==; + using L1Candidate::operator!=; // additional hardware quantities common to L1 global EG void clear_extended(); short int towerIEta_; diff --git a/DataFormats/L1Trigger/interface/EtSum.h b/DataFormats/L1Trigger/interface/EtSum.h index 09573cf7dada0..ed359c85826a7 100644 --- a/DataFormats/L1Trigger/interface/EtSum.h +++ b/DataFormats/L1Trigger/interface/EtSum.h @@ -70,10 +70,12 @@ namespace l1t { EtSumType getType() const; - virtual bool operator==(const l1t::EtSum& rhs) const; - virtual inline bool operator!=(const l1t::EtSum& rhs) const { return !(operator==(rhs)); }; + bool operator==(const l1t::EtSum& rhs) const; + inline bool operator!=(const l1t::EtSum& rhs) const { return !(operator==(rhs)); }; private: + using L1Candidate::operator==; + using L1Candidate::operator!=; // type of EtSum EtSumType type_; diff --git a/DataFormats/L1Trigger/interface/Jet.h b/DataFormats/L1Trigger/interface/Jet.h index 2b3c3d4a8f9fd..855f5ea118e0e 100644 --- a/DataFormats/L1Trigger/interface/Jet.h +++ b/DataFormats/L1Trigger/interface/Jet.h @@ -39,10 +39,12 @@ namespace l1t { short int puEt() const; short int puDonutEt(int i) const; - virtual bool operator==(const l1t::Jet& rhs) const; - virtual inline bool operator!=(const l1t::Jet& rhs) const { return !(operator==(rhs)); }; + bool operator==(const l1t::Jet& rhs) const; + inline bool operator!=(const l1t::Jet& rhs) const { return !(operator==(rhs)); }; private: + using L1Candidate::operator==; + using L1Candidate::operator!=; // additional hardware quantities common to L1 global jet void clear_extended(); short int towerIEta_; diff --git a/DataFormats/L1Trigger/interface/Muon.h b/DataFormats/L1Trigger/interface/Muon.h index 3b30133cf8c0e..148325be95648 100644 --- a/DataFormats/L1Trigger/interface/Muon.h +++ b/DataFormats/L1Trigger/interface/Muon.h @@ -114,10 +114,12 @@ namespace l1t { inline bool debug() const { return debug_; }; - virtual bool operator==(const l1t::Muon& rhs) const; - virtual inline bool operator!=(const l1t::Muon& rhs) const { return !(operator==(rhs)); }; + bool operator==(const l1t::Muon& rhs) const; + inline bool operator!=(const l1t::Muon& rhs) const { return !(operator==(rhs)); }; private: + using L1Candidate::operator==; + using L1Candidate::operator!=; // additional hardware quantities common to L1 global jet int hwCharge_; int hwChargeValid_; diff --git a/DataFormats/L1Trigger/interface/MuonShower.h b/DataFormats/L1Trigger/interface/MuonShower.h index 85a082ada20dc..cb3fd7a7c6b09 100644 --- a/DataFormats/L1Trigger/interface/MuonShower.h +++ b/DataFormats/L1Trigger/interface/MuonShower.h @@ -79,10 +79,12 @@ namespace l1t { bool isTwoLooseOutOfTime() const { return false; } bool isOneTightOutOfTime() const { return false; } - virtual bool operator==(const l1t::MuonShower& rhs) const; - virtual inline bool operator!=(const l1t::MuonShower& rhs) const { return !(operator==(rhs)); }; + bool operator==(const l1t::MuonShower& rhs) const; + inline bool operator!=(const l1t::MuonShower& rhs) const { return !(operator==(rhs)); }; private: + using L1Candidate::operator==; + using L1Candidate::operator!=; // Run-3 definitions as provided in DN-20-033 // in time and out-of-time qualities. only 2 bits each. bool oneNominalInTime_; diff --git a/DataFormats/L1Trigger/interface/Tau.h b/DataFormats/L1Trigger/interface/Tau.h index 95198564e0ef2..0f87895de4ae4 100644 --- a/DataFormats/L1Trigger/interface/Tau.h +++ b/DataFormats/L1Trigger/interface/Tau.h @@ -45,10 +45,12 @@ namespace l1t { bool hasEM() const; bool isMerged() const; - virtual bool operator==(const l1t::Tau& rhs) const; - virtual inline bool operator!=(const l1t::Tau& rhs) const { return !(operator==(rhs)); }; + bool operator==(const l1t::Tau& rhs) const; + inline bool operator!=(const l1t::Tau& rhs) const { return !(operator==(rhs)); }; private: + using L1Candidate::operator==; + using L1Candidate::operator!=; // additional hardware quantities common to L1 global tau void clear_extended(); short int towerIEta_; diff --git a/DataFormats/SiStripDigi/interface/SiStripRawDigi.h b/DataFormats/SiStripDigi/interface/SiStripRawDigi.h index 924917167b617..5c6da0de10510 100644 --- a/DataFormats/SiStripDigi/interface/SiStripRawDigi.h +++ b/DataFormats/SiStripDigi/interface/SiStripRawDigi.h @@ -1,6 +1,7 @@ #ifndef DataFormats_SiStripDigi_SiStripRawDigi_H #define DataFormats_SiStripDigi_SiStripRawDigi_H +#include #include "DataFormats/Common/interface/traits.h" /**