From 9bccb6916dba4789ae8cd142e2ef462608bf66f9 Mon Sep 17 00:00:00 2001
From: scott snyder <scott.snyder@cern.ch>
Date: Thu, 18 Apr 2019 06:17:14 +0200
Subject: [PATCH] TrkTrack: 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.
---
Tracking/TrkEvent/TrkTrack/TrkTrack/LinkToTrack.h | 6 ++----
Tracking/TrkEvent/TrkTrack/src/LinkToTrack.cxx | 13 +------------
2 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/Tracking/TrkEvent/TrkTrack/TrkTrack/LinkToTrack.h b/Tracking/TrkEvent/TrkTrack/TrkTrack/LinkToTrack.h
index cb6f166ad4a..168c4741e67 100644
--- a/Tracking/TrkEvent/TrkTrack/TrkTrack/LinkToTrack.h
+++ b/Tracking/TrkEvent/TrkTrack/TrkTrack/LinkToTrack.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
*/
#ifndef TRKTRACK_LINKTOTRACK_H
@@ -27,7 +27,7 @@ namespace Trk
LinkToTrack( ElementLink<TrackCollection>& link );
/** default destructor */
- virtual ~LinkToTrack();
+ virtual ~LinkToTrack() = default;
/** return the track parameters of the track (to which the EL< TrackCollection > points) */
const TrackParameters* parameters() const;
@@ -38,8 +38,6 @@ namespace Trk
/** method to clone the LinkToTrack object */
LinkToTrack * clone() const ;
- /** assignment operator */
- Trk::LinkToTrack& operator= ( const Trk::LinkToTrack& rhs );
// This is here to make sure that the TrackCollection typedef
// will make it into the dictionary.
typedef TrackCollection TrackCollectionForDict;
diff --git a/Tracking/TrkEvent/TrkTrack/src/LinkToTrack.cxx b/Tracking/TrkEvent/TrkTrack/src/LinkToTrack.cxx
index 7f125f17fc8..96fba2032cb 100644
--- a/Tracking/TrkEvent/TrkTrack/src/LinkToTrack.cxx
+++ b/Tracking/TrkEvent/TrkTrack/src/LinkToTrack.cxx
@@ -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
*/
#include "TrkTrack/LinkToTrack.h"
@@ -15,9 +15,6 @@ namespace Trk
LinkToTrack::LinkToTrack ( ElementLink<TrackCollection>& link ) : ElementLink<TrackCollection> ( link )
{}
- LinkToTrack::~LinkToTrack()
- {}
-
const TrackParameters* LinkToTrack::parameters() const
{
if ( isValid() )
@@ -34,12 +31,4 @@ namespace Trk
return new LinkToTrack ( *this );
}
- Trk::LinkToTrack& Trk::LinkToTrack::operator= ( const Trk::LinkToTrack& rhs )
- {
- if ( this!=&rhs )
- {
- ElementLink<TrackCollection>::operator= ( rhs );
- }
- return *this;
- }
}//end of namespace definitions
--
GitLab