Skip to content
Snippets Groups Projects
Commit 25e8e2aa authored by Scott Snyder's avatar Scott Snyder Committed by scott snyder
Browse files

TrkLinks: 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.
parent a1f91491
9 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!28528Revert 63f845ae,!27054Atr20369 210,!26342Monopole: Handle fractionally charged particles,!20488TrkLinks: Fix gcc9 warnings.
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRKTRACK_LINKTOXAODNEUTRALPARTICLE_H
......@@ -38,7 +38,7 @@ namespace Trk
LinkToXAODNeutralParticle( ElementLink<xAOD::NeutralParticleContainer>& link );
/** default destructor */
virtual ~LinkToXAODNeutralParticle();
virtual ~LinkToXAODNeutralParticle() = default;
/** dummy function to return 0 if TrackParameters are asked for */
const TrackParameters* parameters() const { return NULL; };
......@@ -49,9 +49,6 @@ namespace Trk
/** method to clone the LinkToXAODNeutralParticle object */
LinkToXAODNeutralParticle * clone() const ;
/** assignment operator */
Trk::LinkToXAODNeutralParticle& operator= ( const Trk::LinkToXAODNeutralParticle& rhs );
// This is here to make sure that the NeutralCollection typedef
// will make it into the dictionary.
// typedef NeutralCollection NeutralCollectionForDict;
......
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRKTRACK_LINKTOXAODTRACKPARTICLE_H
......@@ -38,9 +38,9 @@ namespace Trk
/** constructor with ElementLink */
LinkToXAODTrackParticle( ElementLink<xAOD::TrackParticleContainer>& link );
/** default destructor */
virtual ~LinkToXAODTrackParticle();
virtual ~LinkToXAODTrackParticle() = default;
/** return the track parameters of the track (to which the EL< TrackCollection > points) */
const TrackParameters* parameters() const;
......@@ -51,9 +51,6 @@ namespace Trk
/** method to clone the LinkToXAODTrackParticle object */
LinkToXAODTrackParticle * clone() const ;
/** assignment operator */
Trk::LinkToXAODTrackParticle& operator= ( const Trk::LinkToXAODTrackParticle& rhs );
// This is here to make sure that the TrackCollection typedef
// will make it into the dictionary.
// typedef TrackCollection TrackCollectionForDict;
......
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "TrkLinks/LinkToXAODNeutralParticle.h"
......@@ -15,9 +15,6 @@ namespace Trk
LinkToXAODNeutralParticle::LinkToXAODNeutralParticle ( ElementLink<xAOD::NeutralParticleContainer>& link ) : ElementLink<xAOD::NeutralParticleContainer> ( link )
{}
LinkToXAODNeutralParticle::~LinkToXAODNeutralParticle()
{}
const NeutralParameters* LinkToXAODNeutralParticle::neutralParameters() const
{
if ( isValid() )
......@@ -34,12 +31,4 @@ namespace Trk
return new LinkToXAODNeutralParticle ( *this );
}
Trk::LinkToXAODNeutralParticle& Trk::LinkToXAODNeutralParticle::operator= ( const Trk::LinkToXAODNeutralParticle& rhs )
{
if ( this!=&rhs )
{
ElementLink<xAOD::NeutralParticleContainer>::operator= ( rhs );
}
return *this;
}
}//end of namespace definitions
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "TrkLinks/LinkToXAODTrackParticle.h"
......@@ -15,9 +15,6 @@ namespace Trk
LinkToXAODTrackParticle::LinkToXAODTrackParticle ( ElementLink<xAOD::TrackParticleContainer>& link ) : ElementLink<xAOD::TrackParticleContainer> ( link )
{}
LinkToXAODTrackParticle::~LinkToXAODTrackParticle()
{}
const TrackParameters* LinkToXAODTrackParticle::parameters() const
{
if ( isValid() )
......@@ -34,12 +31,4 @@ namespace Trk
return new LinkToXAODTrackParticle ( *this );
}
Trk::LinkToXAODTrackParticle& Trk::LinkToXAODTrackParticle::operator= ( const Trk::LinkToXAODTrackParticle& rhs )
{
if ( this!=&rhs )
{
ElementLink<xAOD::TrackParticleContainer>::operator= ( rhs );
}
return *this;
}
}//end of namespace definitions
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