Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

fix pedantic warnings

Browse Source
This commit is contained in:
Moritz Kobitzsch 2017-08-01 11:26:21 +02:00
parent 7620d419c6
commit 917a36eaee
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/extractor/extraction_containers.cpp
View File

@ -765,7 +765,7 @@ void ExtractionContainers::PrepareRestrictions()
// translate the turn from one segment onto another into a node restriction (the ways can only // translate the turn from one segment onto another into a node restriction (the ways can only
// be connected at a single location) // be connected at a single location)
auto const get_node_restriction_from_OSM_ids = [&]( auto const get_node_restriction_from_OSM_ids = [&](
auto const from_id, auto const to_id, const OSMNodeID via_node = MAX_OSM_NODEID) { auto const from_id, auto const to_id, const OSMNodeID via_node) {
auto const from_segment_itr = referenced_ways.find(from_id); auto const from_segment_itr = referenced_ways.find(from_id);
if (from_segment_itr->second.way_id != from_id) if (from_segment_itr->second.way_id != from_id)
{ {
@ -792,9 +792,9 @@ void ExtractionContainers::PrepareRestrictions()
auto const &external = external_type.AsWayRestriction(); auto const &external = external_type.AsWayRestriction();
// check if we were able to resolve all the involved ways // check if we were able to resolve all the involved ways
auto const from_restriction = auto const from_restriction =
get_node_restriction_from_OSM_ids(external.from, external.via); get_node_restriction_from_OSM_ids(external.from, external.via, MAX_OSM_NODEID);
auto const to_restriction = auto const to_restriction =
get_node_restriction_from_OSM_ids(external.via, external.to); get_node_restriction_from_OSM_ids(external.via, external.to, MAX_OSM_NODEID);
// failed to translate either of the involved nodes? // failed to translate either of the involved nodes?
if (!from_restriction.Valid() || !to_restriction.Valid()) if (!from_restriction.Valid() || !to_restriction.Valid())

2
src/extractor/restriction_parser.cpp
View File

@ -128,7 +128,7 @@ RestrictionParser::TryParse(const osmium::Relation &relation) const
restriction_container.is_only = is_only_restriction; restriction_container.is_only = is_only_restriction;
boost::optional<std::uint64_t> from = boost::none, via = boost::none, to = boost::none; boost::optional<std::uint64_t> from = boost::none, via = boost::none, to = boost::none;
bool is_node_restriction; bool is_node_restriction = true;
for (const auto &member : relation.members()) for (const auto &member : relation.members())
{ {