diff --git a/Reconstruction/egamma/egammaEvent/egammaEvent/ElectronAssociation.h b/Reconstruction/egamma/egammaEvent/egammaEvent/ElectronAssociation.h index f75e87015810a4243395a4f9534a56a4a8a6054d..dc358d5ad9db0f3ab18e76da0ce4c363c23d9e39 100755 --- a/Reconstruction/egamma/egammaEvent/egammaEvent/ElectronAssociation.h +++ b/Reconstruction/egamma/egammaEvent/egammaEvent/ElectronAssociation.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 */ @@ -33,7 +33,7 @@ namespace Analysis public: ElectronAssociation() ; //!< constructor ElectronAssociation(const NameType& name) ; //!< constructor - ~ElectronAssociation() ; //!< destructor + ~ElectronAssociation() = default; virtual JetAssociationBase* clone() const; //!< a clone method for the proper workings of the copy constructor diff --git a/Reconstruction/egamma/egammaEvent/egammaEvent/ElectronConstituent.h b/Reconstruction/egamma/egammaEvent/egammaEvent/ElectronConstituent.h index 5f7cbceb80f49e21ced3c34bb04b4ef01f683e82..32d69b282fbb757c668344097c8b33472faf885c 100755 --- a/Reconstruction/egamma/egammaEvent/egammaEvent/ElectronConstituent.h +++ b/Reconstruction/egamma/egammaEvent/egammaEvent/ElectronConstituent.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 */ #ifndef EGAMMAEVENT_ELECTRONCONSTITUENT_H @@ -54,7 +54,7 @@ namespace Analysis /** @brief constructor */ ElectronConstituent(NameType& name) ; /** @brief destructor */ - ~ElectronConstituent() ; + ~ElectronConstituent() = default; /** @brief method to set the name */ virtual void setName(NameType& name); diff --git a/Reconstruction/egamma/egammaEvent/egammaEvent/PhotonAssociation.h b/Reconstruction/egamma/egammaEvent/egammaEvent/PhotonAssociation.h index 7fd03d6aca085654e839239bfd37438daf2ffba5..ac1b99120c4819735fdcded17881be09b843bc9d 100755 --- a/Reconstruction/egamma/egammaEvent/egammaEvent/PhotonAssociation.h +++ b/Reconstruction/egamma/egammaEvent/egammaEvent/PhotonAssociation.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 */ @@ -33,7 +33,7 @@ namespace Analysis public: PhotonAssociation() ; //!< constructor PhotonAssociation(const NameType& name) ; //!< constructor - ~PhotonAssociation() ; //!< destructor + ~PhotonAssociation() = default; virtual JetAssociationBase* clone() const; //!< a clone method for the proper workings of the copy constructor diff --git a/Reconstruction/egamma/egammaEvent/src/ElectronAssociation.cxx b/Reconstruction/egamma/egammaEvent/src/ElectronAssociation.cxx index 450eeb64ba818cf763ca0074709acc891c4b6265..32e6219242b59222b53df26b1aa409a958b0a535 100755 --- a/Reconstruction/egamma/egammaEvent/src/ElectronAssociation.cxx +++ b/Reconstruction/egamma/egammaEvent/src/ElectronAssociation.cxx @@ -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 */ @@ -15,9 +15,6 @@ namespace Analysis this->setName(name); } - ElectronAssociation::~ElectronAssociation() - { } - JetAssociationBase* ElectronAssociation::clone() const { return new ElectronAssociation( *this ); diff --git a/Reconstruction/egamma/egammaEvent/src/ElectronConstituent.cxx b/Reconstruction/egamma/egammaEvent/src/ElectronConstituent.cxx index dc3bbad1ca32d2552f36ae1235b22c9e252b6bf4..e6ba596cc7989a9d25179c15aead83414fd52a2e 100755 --- a/Reconstruction/egamma/egammaEvent/src/ElectronConstituent.cxx +++ b/Reconstruction/egamma/egammaEvent/src/ElectronConstituent.cxx @@ -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 */ /*************************************************************************** @@ -25,9 +25,6 @@ namespace Analysis ElectronConstituent::ElectronConstituent(NameType& name) { m_name = name; } - ElectronConstituent::~ElectronConstituent() - { } - void ElectronConstituent::setName(NameType& name) {m_name = name;} diff --git a/Reconstruction/egamma/egammaEvent/src/PhotonAssociation.cxx b/Reconstruction/egamma/egammaEvent/src/PhotonAssociation.cxx index 49bf3008c5e6364db17ca07fffb6a0a94794f78b..bed3a26158391361f70658d106d85ad4ffb33361 100755 --- a/Reconstruction/egamma/egammaEvent/src/PhotonAssociation.cxx +++ b/Reconstruction/egamma/egammaEvent/src/PhotonAssociation.cxx @@ -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 */ @@ -15,9 +15,6 @@ namespace Analysis this->setName(name); } - PhotonAssociation::~PhotonAssociation() - { } - JetAssociationBase* PhotonAssociation::clone() const { return new PhotonAssociation( *this );