From 797b10863ebfd78f6f1fb6a1d9add160f0a8e873 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Mon, 13 May 2019 15:28:30 +0200
Subject: [PATCH] TrkTrackCollectionMerger: ToolHandle constness fix.
Make mergeTrack() non-const, to avoid calling a non-const method through
a const ToolHandle.
---
.../TrkTrackCollectionMerger/TrackCollectionMerger.h | 4 ++--
.../TrkTrackCollectionMerger/src/TrackCollectionMerger.cxx | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Tracking/TrkAlgorithms/TrkTrackCollectionMerger/TrkTrackCollectionMerger/TrackCollectionMerger.h b/Tracking/TrkAlgorithms/TrkTrackCollectionMerger/TrkTrackCollectionMerger/TrackCollectionMerger.h
index 5d0ac579a66..1873ba93245 100644
--- a/Tracking/TrkAlgorithms/TrkTrackCollectionMerger/TrkTrackCollectionMerger/TrackCollectionMerger.h
+++ b/Tracking/TrkAlgorithms/TrkTrackCollectionMerger/TrkTrackCollectionMerger/TrackCollectionMerger.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
*/
///////////////////////////////////////////////////////////////////
@@ -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;
diff --git a/Tracking/TrkAlgorithms/TrkTrackCollectionMerger/src/TrackCollectionMerger.cxx b/Tracking/TrkAlgorithms/TrkTrackCollectionMerger/src/TrackCollectionMerger.cxx
index ffc442ccace..9fe7bdaced0 100644
--- a/Tracking/TrkAlgorithms/TrkTrackCollectionMerger/src/TrackCollectionMerger.cxx
+++ b/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()) {
--
GitLab