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

Merge branch 'gcc9.egammaEvent-20190119' into 'master'

egammaEvent: Fix gcc9 warnings.

See merge request atlas/athena!20459
parents 44ee7f99 f89e97cc
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
*/ */
...@@ -33,7 +33,7 @@ namespace Analysis ...@@ -33,7 +33,7 @@ namespace Analysis
public: public:
ElectronAssociation() ; //!< constructor ElectronAssociation() ; //!< constructor
ElectronAssociation(const NameType& name) ; //!< constructor ElectronAssociation(const NameType& name) ; //!< constructor
~ElectronAssociation() ; //!< destructor ~ElectronAssociation() = default;
virtual JetAssociationBase* clone() const; virtual JetAssociationBase* clone() const;
//!< a clone method for the proper workings of the copy constructor //!< a clone method for the proper workings of the copy constructor
......
/* /*
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 #ifndef EGAMMAEVENT_ELECTRONCONSTITUENT_H
...@@ -54,7 +54,7 @@ namespace Analysis ...@@ -54,7 +54,7 @@ namespace Analysis
/** @brief constructor */ /** @brief constructor */
ElectronConstituent(NameType& name) ; ElectronConstituent(NameType& name) ;
/** @brief destructor */ /** @brief destructor */
~ElectronConstituent() ; ~ElectronConstituent() = default;
/** @brief method to set the name */ /** @brief method to set the name */
virtual void setName(NameType& name); virtual void setName(NameType& name);
......
/* /*
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 ...@@ -33,7 +33,7 @@ namespace Analysis
public: public:
PhotonAssociation() ; //!< constructor PhotonAssociation() ; //!< constructor
PhotonAssociation(const NameType& name) ; //!< constructor PhotonAssociation(const NameType& name) ; //!< constructor
~PhotonAssociation() ; //!< destructor ~PhotonAssociation() = default;
virtual JetAssociationBase* clone() const; virtual JetAssociationBase* clone() const;
//!< a clone method for the proper workings of the copy constructor //!< a clone method for the proper workings of the copy constructor
......
/* /*
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 ...@@ -15,9 +15,6 @@ namespace Analysis
this->setName(name); this->setName(name);
} }
ElectronAssociation::~ElectronAssociation()
{ }
JetAssociationBase* ElectronAssociation::clone() const JetAssociationBase* ElectronAssociation::clone() const
{ {
return new ElectronAssociation( *this ); return new ElectronAssociation( *this );
......
/* /*
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 ...@@ -25,9 +25,6 @@ namespace Analysis
ElectronConstituent::ElectronConstituent(NameType& name) ElectronConstituent::ElectronConstituent(NameType& name)
{ m_name = name; } { m_name = name; }
ElectronConstituent::~ElectronConstituent()
{ }
void ElectronConstituent::setName(NameType& name) {m_name = name;} void ElectronConstituent::setName(NameType& name) {m_name = name;}
......
/* /*
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 ...@@ -15,9 +15,6 @@ namespace Analysis
this->setName(name); this->setName(name);
} }
PhotonAssociation::~PhotonAssociation()
{ }
JetAssociationBase* PhotonAssociation::clone() const JetAssociationBase* PhotonAssociation::clone() const
{ {
return new PhotonAssociation( *this ); return new PhotonAssociation( *this );
......
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