Merge branch 'const.TrkTrackCollectionMerger-20190513' into 'master'

TrkTrackCollectionMerger: ToolHandle constness fix.

See merge request atlas/athena!23387

Tracking/TrkAlgorithms/TrkTrackCollectionMerger/TrkTrackCollectionMerger/TrackCollectionMerger.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -65,7 +65,7 @@ namespace Trk {
       ///////////////////////////////////////////////////////////////////
 
       /** @brief A routine that merges the track collections. */
-      StatusCode    mergeTrack(const TrackCollection* trackCol, TrackCollection* outputCol) const;
+      StatusCode    mergeTrack(const TrackCollection* trackCol, TrackCollection* outputCol);
 
       MsgStream&    dumptools(MsgStream&    out) const;
       MsgStream&    dumpevent(MsgStream&    out) const;

Tracking/TrkAlgorithms/TrkTrackCollectionMerger/src/TrackCollectionMerger.cxx

@@ -199,7 +199,7 @@ std::ostream& Trk::operator <<
 // Merge track collections and remove duplicates
 ///////////////////////////////////////////////////////////////////
 
-StatusCode Trk::TrackCollectionMerger::mergeTrack(const TrackCollection* trackCol, TrackCollection* outputCol) const
+StatusCode Trk::TrackCollectionMerger::mergeTrack(const TrackCollection* trackCol, TrackCollection* outputCol)
 {
   // loop over forward track, accept them and add them imto association tool
   if(trackCol && trackCol->size()) {