From bbd1e26948c3cc2482b1a98451af11f6ad9a760c Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Thu, 12 Jun 2014 20:55:06 +0200
Subject: [PATCH] Iterator fix. (MuonSegment-01-00-05)
* Tagging MuonSegment-01-00-05.
* src/MuonSegment.cxx: Don't assume that
DataVector<T>::const_iterator is the same as
std::vector<T*>::const_iterator.
---
.../MuonRecEvent/MuonSegment/src/MuonSegment.cxx | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonSegment/src/MuonSegment.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonSegment/src/MuonSegment.cxx
index e82668f7cc8..7191e3f0282 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonSegment/src/MuonSegment.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonSegment/src/MuonSegment.cxx
@@ -153,10 +153,9 @@ void MuonSegment::copyMeasurementsToROTs() const
// std::cout<<"copyMeasurementsToROTs :"<<this<<" with measurements: "<<containedMeasurements().size()<<std::endl;
m_cachedRots = new std::vector<const Trk::RIO_OnTrack*>;
m_cachedRots->reserve(containedMeasurements().size());
- DataVector<const Trk::MeasurementBase>::const_iterator rotIter = containedMeasurements().begin();
- for (; rotIter!=containedMeasurements().end(); ++rotIter){
+ for (const Trk::MeasurementBase* m : containedMeasurements()) {
// cast to RIO_OnTrack
- const Trk::RIO_OnTrack* rot = dynamic_cast<const Trk::RIO_OnTrack*>(*rotIter);
+ const Trk::RIO_OnTrack* rot = dynamic_cast<const Trk::RIO_OnTrack*>(m);
if( rot ) m_cachedRots->push_back(rot);
}
//std::cout<<"copyMeasurementsToROTs :"<<this<<" with rots: "<<m_cachedRots->size()<<std::endl;
--
GitLab