Skip to content

[GCC13] Fix Woverloaded-virtual warning #44581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cmsbuild merged 1 commit into from
May 10, 2024
Merged

[GCC13] Fix Woverloaded-virtual warning #44581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CalibTracker/SiPixelConnectivity/interface/PixelToFEDAssociateFromAscii.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 10 additions & 0 deletions CondFormats/L1TObjects/interface/L1MuPacking.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};

/**
Expand Down Expand Up @@ -127,6 +132,11 @@ class L1MuSignedPackingGeneric : public L1MuPacking {
<< "L1MuSignedPacking::packedFromIdx: warning value " << idx << "exceeds " << nbits << "-bit range !!!";
return ~(std::numeric_limits<unsigned>::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;
};

/**
Expand Down
3 changes: 3 additions & 0 deletions DQM/EcalCommon/interface/MESetDet0D.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 3 additions & 0 deletions DQM/EcalCommon/interface/MESetDet1D.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 3 additions & 0 deletions DQM/EcalCommon/interface/MESetDet2D.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 3 additions & 0 deletions DQM/EcalCommon/interface/MESetProjection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 7 additions & 1 deletion DQM/HcalCommon/interface/ContainerProf2D.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 4 additions & 2 deletions DataFormats/L1Trigger/interface/EGamma.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_;
Expand Down
6 changes: 4 additions & 2 deletions DataFormats/L1Trigger/interface/EtSum.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_;

Expand Down
6 changes: 4 additions & 2 deletions DataFormats/L1Trigger/interface/Jet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_;
Expand Down
6 changes: 4 additions & 2 deletions DataFormats/L1Trigger/interface/Muon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_;
Expand Down
6 changes: 4 additions & 2 deletions DataFormats/L1Trigger/interface/MuonShower.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_;
Expand Down
6 changes: 4 additions & 2 deletions DataFormats/L1Trigger/interface/Tau.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_;
Expand Down
1 change: 1 addition & 0 deletions DataFormats/SiStripDigi/interface/SiStripRawDigi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifndef DataFormats_SiStripDigi_SiStripRawDigi_H
#define DataFormats_SiStripDigi_SiStripRawDigi_H

#include <cstdint>
#include "DataFormats/Common/interface/traits.h"

/**
Expand Down