From a984a4cbf26d1d6c80cb3b72ea54b202538b3546 Mon Sep 17 00:00:00 2001 From: scott snyder <scott.snyder@cern.ch> Date: Fri, 29 Mar 2019 15:25:46 +0100 Subject: [PATCH] TrigParticleTPCnv: 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. --- .../TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBjet_p1.h | 4 ++-- .../TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBjet_p2.h | 4 ++-- .../TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphys_p1.h | 4 ++-- .../TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphys_p2.h | 4 ++-- .../TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphys_p3.h | 4 ++-- .../TrigParticleTPCnv/TrigParticleTPCnv/TrigElectron_p1.h | 4 ++-- .../TrigParticleTPCnv/TrigParticleTPCnv/TrigElectron_p2.h | 4 ++-- .../TrigParticleTPCnv/TrigParticleTPCnv/TrigElectron_p3.h | 4 ++-- .../TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bjet_p1.h | 4 ++-- .../TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bjet_p2.h | 4 ++-- .../TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bjet_p3.h | 4 ++-- .../TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bphys_p1.h | 4 ++-- .../TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bphys_p2.h | 4 ++-- .../TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bphys_p3.h | 4 ++-- .../TrigParticleTPCnv/TrigParticleTPCnv/TrigPhoton_p1.h | 4 ++-- .../TrigParticleTPCnv/TrigParticleTPCnv/TrigPhoton_p2.h | 4 ++-- .../TrigParticleTPCnv/TrigParticleTPCnv/TrigPhoton_p3.h | 4 ++-- .../TrigParticleTPCnv/TrigParticleTPCnv/TrigTau_p3.h | 4 ++-- 18 files changed, 36 insertions(+), 36 deletions(-) diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBjet_p1.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBjet_p1.h index ffaed9dea20..7f783422907 100644 --- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBjet_p1.h +++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBjet_p1.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /********************************************************************************** @@ -25,7 +25,7 @@ class TrigEFBjet_p1 public: TrigEFBjet_p1() {} - virtual ~TrigEFBjet_p1(){} + virtual ~TrigEFBjet_p1() = default; //private: diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBjet_p2.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBjet_p2.h index 66e06a249f1..9eae3ec1756 100644 --- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBjet_p2.h +++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBjet_p2.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /********************************************************************************** @@ -32,7 +32,7 @@ class TrigEFBjet_p2 { m_xChi2(0.0), m_xSv(0.0), m_xmvtx(0.0), m_xevtx(0.0), m_xnvtx(0.0) {} - virtual ~TrigEFBjet_p2(){} + virtual ~TrigEFBjet_p2() = default; //private: diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphys_p1.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphys_p1.h index 878e64c32de..87e08686e50 100644 --- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphys_p1.h +++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphys_p1.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /********************************************************************************** @@ -27,7 +27,7 @@ class TrigEFBphys_p1 public: TrigEFBphys_p1() {} - virtual ~TrigEFBphys_p1(){} + virtual ~TrigEFBphys_p1() = default; enum pType_p1{PHIKK=0, DSPHIPI=1, BMUMU=2, BMUMUX=3, JPSIEE=4, JPSIMUMU=5, MULTIMU=6, BKMUMU=7, BDKSTMUMU=8, BSPHIMUMU=9, LBLMUMU=10, BCDSMUMU=11}; diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphys_p2.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphys_p2.h index 648a14e80d8..0bee99eae40 100644 --- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphys_p2.h +++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphys_p2.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /********************************************************************************** @@ -29,7 +29,7 @@ class TrigEFBphys_p2 public: TrigEFBphys_p2() {} - virtual ~TrigEFBphys_p2(){} + virtual ~TrigEFBphys_p2() = default; enum pType_p1{PHIKK=0, DSPHIPI=1, BMUMU=2, BMUMUX=3, JPSIEE=4, JPSIMUMU=5, MULTIMU=6, BKMUMU=7, BDKSTMUMU=8, BSPHIMUMU=9, LBLMUMU=10, BCDSMUMU=11}; diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphys_p3.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphys_p3.h index e65bfc83c32..b7ecfd5e360 100644 --- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphys_p3.h +++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphys_p3.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /********************************************************************************** @@ -29,7 +29,7 @@ class TrigEFBphys_p3 public: TrigEFBphys_p3() {} - virtual ~TrigEFBphys_p3(){} + virtual ~TrigEFBphys_p3() = default; //private: diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigElectron_p1.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigElectron_p1.h index 1f3d57375ab..1b85c77e82d 100644 --- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigElectron_p1.h +++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigElectron_p1.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /********************************************************************************** @@ -28,7 +28,7 @@ class TrigElectron_p1 public: TrigElectron_p1() {} - virtual ~TrigElectron_p1() {} + virtual ~TrigElectron_p1() = default; friend class TrigElectronCnv_p1; //private: diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigElectron_p2.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigElectron_p2.h index 2d811b86ffd..1964f246afc 100644 --- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigElectron_p2.h +++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigElectron_p2.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /********************************************************************************** @@ -49,7 +49,7 @@ class TrigElectron_p2 m_cl_e_frac_S2(-999.9), m_cl_e_frac_S3(-999.9) {} - virtual ~TrigElectron_p2() {} + virtual ~TrigElectron_p2() = default; friend class TrigElectronCnv_p2; //private: diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigElectron_p3.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigElectron_p3.h index cfb11912e2f..500e2c7bd09 100644 --- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigElectron_p3.h +++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigElectron_p3.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /********************************************************************************** @@ -38,7 +38,7 @@ class TrigElectron_p3 m_tr_nr_trt_hits(-999), m_tr_nr_trt_hithresh_hits(-999) {} - virtual ~TrigElectron_p3() {} + virtual ~TrigElectron_p3() = default; friend class TrigElectronCnv_p3; //private: diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bjet_p1.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bjet_p1.h index 7acdec4535d..0d9b9070b9c 100644 --- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bjet_p1.h +++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bjet_p1.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /********************************************************************************** @@ -25,7 +25,7 @@ class TrigL2Bjet_p1 public: TrigL2Bjet_p1() {} - virtual ~TrigL2Bjet_p1(){} + virtual ~TrigL2Bjet_p1() = default; //private: diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bjet_p2.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bjet_p2.h index d8403114c4e..a35d0cf3e27 100644 --- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bjet_p2.h +++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bjet_p2.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /********************************************************************************** @@ -32,7 +32,7 @@ class TrigL2Bjet_p2 { m_xChi2(0.0), m_xSv(0.0), m_xmvtx(0.0), m_xevtx(0.0), m_xnvtx(0.0) {} - virtual ~TrigL2Bjet_p2(){} + virtual ~TrigL2Bjet_p2() = default; //private: diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bjet_p3.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bjet_p3.h index 26ca71ea6dc..445644f8fc6 100644 --- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bjet_p3.h +++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bjet_p3.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /********************************************************************************** @@ -29,7 +29,7 @@ class TrigL2Bjet_p3 { TrigL2Bjet_p3() : m_valid(0), m_roiID(0), m_P4PtEtaPhiM(0) {} - virtual ~TrigL2Bjet_p3(){} + virtual ~TrigL2Bjet_p3() = default; //private: diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bphys_p1.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bphys_p1.h index b59550a8efb..e2035597673 100644 --- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bphys_p1.h +++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bphys_p1.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /********************************************************************************** @@ -27,7 +27,7 @@ class TrigL2Bphys_p1 public: TrigL2Bphys_p1() {} - virtual ~TrigL2Bphys_p1(){} + virtual ~TrigL2Bphys_p1() = default; enum pType_p1{PHIKK=0, DSPHIPI=1, BMUMU=2, BMUMUX=3, JPSIEE=4, JPSIMUMU=5, MULTIMU=6, BKMUMU=7, BDKSTMUMU=8, BSPHIMUMU=9, LBLMUMU=10, BCDSMUMU=11}; diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bphys_p2.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bphys_p2.h index 912fd60e424..99e0e6b9600 100644 --- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bphys_p2.h +++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bphys_p2.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /********************************************************************************** @@ -29,7 +29,7 @@ class TrigL2Bphys_p2 public: TrigL2Bphys_p2() {} - virtual ~TrigL2Bphys_p2(){} + virtual ~TrigL2Bphys_p2() = default; enum pType_p1{PHIKK=0, DSPHIPI=1, BMUMU=2, BMUMUX=3, JPSIEE=4, JPSIMUMU=5, MULTIMU=6, BKMUMU=7, BDKSTMUMU=8, BSPHIMUMU=9, LBLMUMU=10, BCDSMUMU=11}; diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bphys_p3.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bphys_p3.h index e341f549c9f..27cb790320b 100644 --- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bphys_p3.h +++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2Bphys_p3.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /********************************************************************************** @@ -28,7 +28,7 @@ class TrigL2Bphys_p3 public: TrigL2Bphys_p3() {} - virtual ~TrigL2Bphys_p3(){} + virtual ~TrigL2Bphys_p3() = default; //private: diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigPhoton_p1.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigPhoton_p1.h index def92803c0f..28f47491d18 100644 --- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigPhoton_p1.h +++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigPhoton_p1.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /********************************************************************************** @@ -27,7 +27,7 @@ class TrigPhoton_p1 public: TrigPhoton_p1() {} - virtual ~TrigPhoton_p1(){} + virtual ~TrigPhoton_p1() = default; //private: diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigPhoton_p2.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigPhoton_p2.h index 6df3ff3e217..da196003ed2 100644 --- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigPhoton_p2.h +++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigPhoton_p2.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /********************************************************************************** @@ -45,7 +45,7 @@ class TrigPhoton_p2 m_valid(false) {} - virtual ~TrigPhoton_p2(){} + virtual ~TrigPhoton_p2() = default; //private: diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigPhoton_p3.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigPhoton_p3.h index 287e3181326..15389d86eb1 100644 --- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigPhoton_p3.h +++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigPhoton_p3.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /********************************************************************************** @@ -35,7 +35,7 @@ class TrigPhoton_p3 m_valid(false) {} - virtual ~TrigPhoton_p3(){} + virtual ~TrigPhoton_p3() = default; //private: diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigTau_p3.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigTau_p3.h index 3c3c52d4660..9ccab113973 100644 --- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigTau_p3.h +++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigTau_p3.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /********************************************************************************** @@ -40,7 +40,7 @@ class TrigTau_p3 m_p4PtEtaPhiM() {}; - ~TrigTau_p3() {}; + ~TrigTau_p3() = default; //private: -- GitLab