From 4361ccd6aa710561f41f1a8a8b3d90eb766b3f81 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Tue, 11 Dec 2018 11:38:15 +0100
Subject: [PATCH] TileEvent: Fix gcc9 warnings.
In C++11, implicit declarations of copy and assignment are deprecated if the
class has a user defined destructor or copy or assignment. gcc9 now warns
about this by default.
Adjust to avoid the warning.
---
TileCalorimeter/TileEvent/TileEvent/TileBeamElem.h | 8 ++------
TileCalorimeter/TileEvent/TileEvent/TileDigits.h | 6 +-----
TileCalorimeter/TileEvent/TileEvent/TileRawChannel.h | 2 ++
TileCalorimeter/TileEvent/TileEvent/TileRawData.h | 4 ++--
.../TileEvent/TileEvent/TileRawDataCollection.h | 2 +-
TileCalorimeter/TileEvent/TileEvent/TileTTL1.h | 4 ++--
TileCalorimeter/TileEvent/TileEvent/TileTTL1Cell.h | 4 ++--
7 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/TileCalorimeter/TileEvent/TileEvent/TileBeamElem.h b/TileCalorimeter/TileEvent/TileEvent/TileBeamElem.h
index ce8fdbb1c47..07cc8299030 100755
--- a/TileCalorimeter/TileEvent/TileEvent/TileBeamElem.h
+++ b/TileCalorimeter/TileEvent/TileEvent/TileBeamElem.h
@@ -1,5 +1,5 @@
/*
- 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:
// with pyroot.
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 int size(void) const { return m_digits.size(); }
diff --git a/TileCalorimeter/TileEvent/TileEvent/TileDigits.h b/TileCalorimeter/TileEvent/TileEvent/TileDigits.h
index 34fd7acdad6..11c82723c20 100755
--- a/TileCalorimeter/TileEvent/TileEvent/TileDigits.h
+++ b/TileCalorimeter/TileEvent/TileEvent/TileDigits.h
@@ -1,5 +1,5 @@
/*
- 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:
/** @return a reference to a stl vector containing the sample values */
const std::vector < float > & samples() const { return m_digits; }
- /* Destructor */
-
- ~TileDigits() { }
-
/* Inline access methods */
inline int NtimeSamples(void) const { return m_digits.size(); }
diff --git a/TileCalorimeter/TileEvent/TileEvent/TileRawChannel.h b/TileCalorimeter/TileEvent/TileEvent/TileRawChannel.h
index f652c5d4aa0..a8f6b90a13b 100755
--- a/TileCalorimeter/TileEvent/TileEvent/TileRawChannel.h
+++ b/TileCalorimeter/TileEvent/TileEvent/TileRawChannel.h
@@ -51,6 +51,8 @@ class TileRawChannel: public TileRawData {
float ped = 0.0);
TileRawChannel(const Identifier& id, float amplitude, float time, float quality, float ped = 0.0);
+ TileRawChannel& operator=(const TileRawChannel&) = default;
+
/* Destructor */
~TileRawChannel() {
diff --git a/TileCalorimeter/TileEvent/TileEvent/TileRawData.h b/TileCalorimeter/TileEvent/TileEvent/TileRawData.h
index 299d207e773..1c4dc0099a2 100755
--- a/TileCalorimeter/TileEvent/TileEvent/TileRawData.h
+++ b/TileCalorimeter/TileEvent/TileEvent/TileRawData.h
@@ -1,5 +1,5 @@
/*
- 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:
TileRawData(const Identifier& id);
/* Destructor */
- virtual ~TileRawData() {}
+ virtual ~TileRawData() = default;
/* Inline accessor methods: */
inline Identifier identify(void) const { return adc_ID(); }
diff --git a/TileCalorimeter/TileEvent/TileEvent/TileRawDataCollection.h b/TileCalorimeter/TileEvent/TileEvent/TileRawDataCollection.h
index 64301b013e8..69bcb22ebd4 100755
--- a/TileCalorimeter/TileEvent/TileEvent/TileRawDataCollection.h
+++ b/TileCalorimeter/TileEvent/TileEvent/TileRawDataCollection.h
@@ -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); }
// destructor
- virtual ~TileRawDataCollection<TELEMENT> () { }
+ virtual ~TileRawDataCollection<TELEMENT> () = default;
// clear everything for next event
virtual void clear ();
diff --git a/TileCalorimeter/TileEvent/TileEvent/TileTTL1.h b/TileCalorimeter/TileEvent/TileEvent/TileTTL1.h
index 3ff6d177864..6b5a69e2388 100755
--- a/TileCalorimeter/TileEvent/TileEvent/TileTTL1.h
+++ b/TileCalorimeter/TileEvent/TileEvent/TileTTL1.h
@@ -1,5 +1,5 @@
/*
- 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:
TileTTL1(const Identifier& id, std::vector<float>&& digits );
- ~TileTTL1() {}
+ ~TileTTL1() = default;
/* Access methods */
diff --git a/TileCalorimeter/TileEvent/TileEvent/TileTTL1Cell.h b/TileCalorimeter/TileEvent/TileEvent/TileTTL1Cell.h
index 0e8196373a9..94afe137b39 100755
--- a/TileCalorimeter/TileEvent/TileEvent/TileTTL1Cell.h
+++ b/TileCalorimeter/TileEvent/TileEvent/TileTTL1Cell.h
@@ -1,7 +1,7 @@
// 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:
uint16_t quality);
/** @brief destructor */
- ~TileTTL1Cell() {}
+ ~TileTTL1Cell() = default;
/** all set methods */
/** @brief set total tower energy*/
--
GitLab