From 13afbfe90da58d99df830e130bdbcca1af2f5c02 Mon Sep 17 00:00:00 2001 From: Markus Frank <markus.frank@cern.ch> Date: Wed, 25 Mar 2015 14:39:19 +0000 Subject: [PATCH] Fix compilation warnings stdc++11 --- DDCore/src/plugins/Compact2Objects.cpp | 6 +++--- DDCore/src/plugins/GeometryWalk.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/DDCore/src/plugins/Compact2Objects.cpp b/DDCore/src/plugins/Compact2Objects.cpp index b0196cd7c..b0ad9709c 100644 --- a/DDCore/src/plugins/Compact2Objects.cpp +++ b/DDCore/src/plugins/Compact2Objects.cpp @@ -562,9 +562,9 @@ template <> void Converter<Readout>::operator()(xml_h e) const { // need to put things back to a string, because we can only set segmentation values via string std::stringstream theValueString; std::vector<std::string> elements = DD4hep::DDSegmentation::splitString(theString); - for (std::vector<std::string>::const_iterator it = elements.begin(); it != elements.end(); ++it) { - if (it->empty()) continue; - double theDouble = DD4hep::Geometry::_toDouble((*it)); + for (std::vector<std::string>::const_iterator j = elements.begin(); j != elements.end(); ++j) { + if ((*j).empty()) continue; + double theDouble = DD4hep::Geometry::_toDouble((*j)); theValueString << " " << theDouble; } printout(DEBUG, "Compact", "++ Converted this string structure: %s.", theValueString.str().c_str()); diff --git a/DDCore/src/plugins/GeometryWalk.cpp b/DDCore/src/plugins/GeometryWalk.cpp index 57d502927..6d866f9f4 100644 --- a/DDCore/src/plugins/GeometryWalk.cpp +++ b/DDCore/src/plugins/GeometryWalk.cpp @@ -112,8 +112,8 @@ void GeometryWalk::walk(DetElement e, VolIDs ids) const { /// Action routine to execute the test long GeometryWalk::run(LCDD& lcdd,int argc,char** argv) { cout << "++ Processing plugin....GeometryWalker.." << endl; - for(int i=1; i<argc;++i) { - string name = argv[i]+1; + for(int in=1; in < argc; ++in) { + string name = argv[in]+1; if ( name == "all" || name == "All" || name == "ALL" ) { const _C& children = lcdd.world().children(); for (_C::const_iterator i=children.begin(); i!=children.end(); ++i) { -- GitLab