From ee68458b3405bcbfca5490a99c6e92d2cad4b5b5 Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Wed, 14 Dec 2016 04:52:06 +0100
Subject: [PATCH] DV const fixes. (InDetOverlay-00-07-01)
* Tagging InDetOverlay-00-07-01.
* DV const fixes.
Former-commit-id: 1aca8ba1b0f311690aae476dce50586d6176558b
---
.../InDetRawAlgs/InDetOverlay/src/InDetOverlay.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/InnerDetector/InDetRawAlgs/InDetOverlay/src/InDetOverlay.cxx b/InnerDetector/InDetRawAlgs/InDetOverlay/src/InDetOverlay.cxx
index 0a189eabd2d..57dca7bb69e 100755
--- a/InnerDetector/InDetRawAlgs/InDetOverlay/src/InDetOverlay.cxx
+++ b/InnerDetector/InDetRawAlgs/InDetOverlay/src/InDetOverlay.cxx
@@ -99,7 +99,7 @@ namespace Overlay {
{
const Identifier ident = (*firstData)->identify();
const unsigned int word = (*firstData)->getWord();
- SCT3_RawData* oldData = dynamic_cast<SCT3_RawData*>(*firstData);
+ const SCT3_RawData* oldData = dynamic_cast<const SCT3_RawData*>(*firstData);
std::vector<int> errorHit=oldData->getErrorCondensedHit();
SCT3_RawData * newData=new SCT3_RawData(ident,word, &errorHit);
copy_coll->push_back (newData );
@@ -126,11 +126,11 @@ namespace Overlay {
typedef std::multimap<int, const SCT_RDO_TYPE*> StripMap;
void fillStripMap(StripMap *sm, const InDetRawDataCollection<SCT_RDORawData> &rdo_coll, const std::string& collectionName, InDetOverlay *parent) {
- for(InDetRawDataCollection<SCT_RDORawData>::const_iterator i=rdo_coll.begin(); i!=rdo_coll.end(); ++i) {
- const SCT_RDO_TYPE *rdo = dynamic_cast<const SCT_RDO_TYPE*>(&**i);
+ for (const SCT_RDORawData* elt : rdo_coll) {
+ const SCT_RDO_TYPE *rdo = dynamic_cast<const SCT_RDO_TYPE*>(elt);
if(!rdo) {
std::ostringstream os;
- os<<"mergeCollection<SCT_RDORawData>(): wrong datum format for the '"<<collectionName<<"' collection. Only SCT3_RawData are produced by SCT_RodDecoder and supported by overlay. For the supplied datum typeid(datum).name() = "<<typeid(**i).name();
+ os<<"mergeCollection<SCT_RDORawData>(): wrong datum format for the '"<<collectionName<<"' collection. Only SCT3_RawData are produced by SCT_RodDecoder and supported by overlay. For the supplied datum typeid(datum).name() = "<<typeid(*elt).name();
throw std::runtime_error(os.str());
}
--
GitLab