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

Merge branch 'gcc9.TileEvent-20181211' into 'master'

TileEvent: Fix gcc9 warnings.

See merge request atlas/athena!16674
parents baabe661 4361ccd6
No related branches found
No related tags found
No related merge requests found
/* /*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/ */
//*************************************************************************** //***************************************************************************
...@@ -38,12 +38,8 @@ public: ...@@ -38,12 +38,8 @@ public:
// with pyroot. // with pyroot.
TileBeamElem(const Identifier& id, const std::vector<uint32_t>& digits ); TileBeamElem(const Identifier& id, const std::vector<uint32_t>& digits );
TileBeamElem(const HWIdentifier& HWid, uint32_t digit ); TileBeamElem(const HWIdentifier& HWid, uint32_t digit );
/* Destructor */
~TileBeamElem() {}
/* Inline access methods */ /* Inline access methods */
inline int size(void) const { return m_digits.size(); } inline int size(void) const { return m_digits.size(); }
......
/* /*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/ */
//*************************************************************************** //***************************************************************************
...@@ -57,10 +57,6 @@ public: ...@@ -57,10 +57,6 @@ public:
/** @return a reference to a stl vector containing the sample values */ /** @return a reference to a stl vector containing the sample values */
const std::vector < float > & samples() const { return m_digits; } const std::vector < float > & samples() const { return m_digits; }
/* Destructor */
~TileDigits() { }
/* Inline access methods */ /* Inline access methods */
inline int NtimeSamples(void) const { return m_digits.size(); } inline int NtimeSamples(void) const { return m_digits.size(); }
......
...@@ -51,6 +51,8 @@ class TileRawChannel: public TileRawData { ...@@ -51,6 +51,8 @@ class TileRawChannel: public TileRawData {
float ped = 0.0); float ped = 0.0);
TileRawChannel(const Identifier& id, float amplitude, float time, float quality, float ped = 0.0); TileRawChannel(const Identifier& id, float amplitude, float time, float quality, float ped = 0.0);
TileRawChannel& operator=(const TileRawChannel&) = default;
/* Destructor */ /* Destructor */
~TileRawChannel() { ~TileRawChannel() {
......
/* /*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/ */
//*************************************************************************** //***************************************************************************
...@@ -46,7 +46,7 @@ public: ...@@ -46,7 +46,7 @@ public:
TileRawData(const Identifier& id); TileRawData(const Identifier& id);
/* Destructor */ /* Destructor */
virtual ~TileRawData() {} virtual ~TileRawData() = default;
/* Inline accessor methods: */ /* Inline accessor methods: */
inline Identifier identify(void) const { return adc_ID(); } inline Identifier identify(void) const { return adc_ID(); }
......
...@@ -54,7 +54,7 @@ template <typename TELEMENT> class TileRawDataCollection ...@@ -54,7 +54,7 @@ template <typename TELEMENT> class TileRawDataCollection
m_id(0), m_lvl1Id(0), m_lvl1Type(0), m_detEvType(0), m_rodBCID(0) { this->reserve(48); } m_id(0), m_lvl1Id(0), m_lvl1Type(0), m_detEvType(0), m_rodBCID(0) { this->reserve(48); }
// destructor // destructor
virtual ~TileRawDataCollection<TELEMENT> () { } virtual ~TileRawDataCollection<TELEMENT> () = default;
// clear everything for next event // clear everything for next event
virtual void clear (); virtual void clear ();
......
/* /*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/ */
//*************************************************************************** //***************************************************************************
...@@ -37,7 +37,7 @@ public: ...@@ -37,7 +37,7 @@ public:
TileTTL1(const Identifier& id, std::vector<float>&& digits ); TileTTL1(const Identifier& id, std::vector<float>&& digits );
~TileTTL1() {} ~TileTTL1() = default;
/* Access methods */ /* Access methods */
......
// This file's extension implies that it's C, but it's really -*- C++ -*-. // This file's extension implies that it's C, but it's really -*- C++ -*-.
/* /*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/ */
//*************************************************************************** //***************************************************************************
...@@ -63,7 +63,7 @@ public: ...@@ -63,7 +63,7 @@ public:
uint16_t quality); uint16_t quality);
/** @brief destructor */ /** @brief destructor */
~TileTTL1Cell() {} ~TileTTL1Cell() = default;
/** all set methods */ /** all set methods */
/** @brief set total tower energy*/ /** @brief set total tower energy*/
......
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