From c5d6c4e0eebe7897f85434b2cd7a9d42688a900d Mon Sep 17 00:00:00 2001
From: Walter Lampl <Walter.Lampl@cern.ch>
Date: Tue, 20 Oct 2020 14:08:05 +0200
Subject: [PATCH] simplify cleanup method of MuPatHitTool
---
.../MuonTrackSteeringTools/src/MuPatHitTool.cxx | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuPatHitTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuPatHitTool.cxx
index 20deda0f367a..8928243a3a88 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuPatHitTool.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuPatHitTool.cxx
@@ -76,22 +76,19 @@ MuPatHitTool::cleanUp() const
{
const std::lock_guard<std::mutex> lock(m_hitsMutex);
- std::for_each(m_hitsToBeDeleted.begin(), m_hitsToBeDeleted.end(), MuonDeleteObject<MuPatHit>());
+ for (auto ptr : m_hitsToBeDeleted) {
+ delete ptr;
+ }
m_hitsToBeDeleted.clear();
-
- // reset size of vector if its size increased
- if (m_hitsToBeDeleted.capacity() > arraySize) m_hitsToBeDeleted.reserve(arraySize);
}
{
const std::lock_guard<std::mutex> lock(m_parsMutex);
- std::for_each(m_parsToBeDeleted.begin(), m_parsToBeDeleted.end(),
- MuonDeleteObject<const Trk::TrackParameters>());
+ for (auto ptr : m_parsToBeDeleted) {
+ delete ptr;
+ }
m_parsToBeDeleted.clear();
-
- // reset size of vector if its size increased
- if (m_parsToBeDeleted.capacity() > arraySize) m_parsToBeDeleted.reserve(arraySize);
}
}
--
GitLab