Skip to content

Commit

Permalink
Merge pull request #42145 from iarspider/fix-l1trigger_globalcalotrig…
Browse files Browse the repository at this point in the history
…ger-cpp20

Make L1Trigger/GlobalCaloTrigger compile with C++20
  • Loading branch information
cmsbuild authored Jun 30, 2023
2 parents 20fab37 + 68197bb commit fe01c0e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions L1Trigger/GlobalCaloTrigger/test/L1GctLutFromFile.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ template <int NAddressBits, int NDataBits>
class L1GctLutFromFile : public L1GctLut<NAddressBits, NDataBits> {
public:
static L1GctLutFromFile<NAddressBits, NDataBits>* setupLut(const std::string filename);
virtual ~L1GctLutFromFile<NAddressBits, NDataBits>();
virtual ~L1GctLutFromFile();

void readFromFile(const std::string filename);

protected:
L1GctLutFromFile<NAddressBits, NDataBits>();
L1GctLutFromFile();

virtual uint16_t value(const uint16_t lutAddress) const;

Expand All @@ -37,7 +37,7 @@ L1GctLutFromFile<NAddressBits, NDataBits>::L1GctLutFromFile()
: L1GctLut<NAddressBits, NDataBits>(), m_lutContents(1 << NAddressBits) {}

template <int NAddressBits, int NDataBits>
L1GctLutFromFile<NAddressBits, NDataBits>::~L1GctLutFromFile<NAddressBits, NDataBits>() {}
L1GctLutFromFile<NAddressBits, NDataBits>::~L1GctLutFromFile() {}

template <int NAddressBits, int NDataBits>
void L1GctLutFromFile<NAddressBits, NDataBits>::readFromFile(const std::string filename) {
Expand Down

0 comments on commit fe01c0e

Please sign in to comment.