From e70adbb1cb022cc9d4df922e3f75f3e575ae45bd Mon Sep 17 00:00:00 2001 From: DennisOSRM Date: Sun, 6 Jan 2013 12:59:36 +0100 Subject: [PATCH] Using const-refs instead of copies when iterating vectors --- DataStructures/NNGrid.h | 6 +++--- Descriptors/GPXDescriptor.h | 2 +- Descriptors/JSONDescriptor.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/DataStructures/NNGrid.h b/DataStructures/NNGrid.h index 9f280bc14..1ee131317 100644 --- a/DataStructures/NNGrid.h +++ b/DataStructures/NNGrid.h @@ -179,7 +179,7 @@ public: double dist = std::numeric_limits::max(); double r, tmpDist; - BOOST_FOREACH(_GridEdge candidate, candidates) { + BOOST_FOREACH(const _GridEdge & candidate, candidates) { if(candidate.belongsToTinyComponent && ignoreTinyComponents) continue; r = 0.; @@ -266,7 +266,7 @@ public: } _Coordinate tmp; double dist = (std::numeric_limits::max)(); - BOOST_FOREACH(_GridEdge candidate, candidates) { + BOOST_FOREACH(const _GridEdge & candidate, candidates) { double r = 0.; double tmpDist = ComputeDistance(startCoord, candidate.startCoord, candidate.targetCoord, tmp, &r); if(tmpDist < dist) { @@ -312,7 +312,7 @@ private: cellMap.insert(insertionVector.begin(), insertionVector.end()); } - inline bool DoubleEpsilonCompare(const double d1, const double d2) { + inline bool DoubleEpsilonCompare(const double d1, const double d2) const { return (std::fabs(d1 - d2) < FLT_EPSILON); } diff --git a/Descriptors/GPXDescriptor.h b/Descriptors/GPXDescriptor.h index 2b9021ba5..17a3f9226 100644 --- a/Descriptors/GPXDescriptor.h +++ b/Descriptors/GPXDescriptor.h @@ -46,7 +46,7 @@ public: convertInternalLatLonToString(phantomNodes.startPhantom.location.lon, tmp); reply.content += "lon=\"" + tmp + "\">"; - BOOST_FOREACH(_PathData pathData, rawRoute.computedShortestPath) { + BOOST_FOREACH(const _PathData & pathData, rawRoute.computedShortestPath) { sEngine.GetCoordinatesForNodeID(pathData.node, current); convertInternalLatLonToString(current.lat, tmp); diff --git a/Descriptors/JSONDescriptor.h b/Descriptors/JSONDescriptor.h index e1f93d1e9..5cd24877b 100644 --- a/Descriptors/JSONDescriptor.h +++ b/Descriptors/JSONDescriptor.h @@ -246,7 +246,7 @@ public: reply.content += "}"; } - void GetRouteNames(std::vector & shortestSegments, std::vector & alternativeSegments, SearchEngineT &sEngine, RouteNames & routeNames) { + void GetRouteNames(std::vector & shortestSegments, std::vector & alternativeSegments, const SearchEngineT &sEngine, RouteNames & routeNames) { /*** extract names for both alternatives ***/ Segment shortestSegment1, shortestSegment2;