Skip to content
Snippets Groups Projects
Commit 2c557447 authored by Vakhtang Tsulaia's avatar Vakhtang Tsulaia
Browse files

Merge branch 'gcc10.TrigInDetAccelerationService-20200814' into 'master'

TrigInDetAccelerationService: Fix warning.

See merge request atlas/athena!35601
parents ffc8b1d3 888e9724
No related branches found
No related tags found
6 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!35601TrigInDetAccelerationService: Fix warning.
...@@ -61,7 +61,6 @@ class TrigInDetAccelerationSvc : public extends<AthService, ITrigInDetAccelerati ...@@ -61,7 +61,6 @@ class TrigInDetAccelerationSvc : public extends<AthService, ITrigInDetAccelerati
public: public:
PhiEtaHash(short phi, short eta, int hash) : m_phiIndex(phi), m_etaIndex(eta), m_hash(hash) {}; PhiEtaHash(short phi, short eta, int hash) : m_phiIndex(phi), m_etaIndex(eta), m_hash(hash) {};
PhiEtaHash(const PhiEtaHash& p) : m_phiIndex(p.m_phiIndex), m_etaIndex(p.m_etaIndex), m_hash(p.m_hash) {};
short m_phiIndex, m_etaIndex; short m_phiIndex, m_etaIndex;
int m_hash; int m_hash;
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment