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

Fixes ODR Violation in Graph Loader, closes #3308

Browse Source
This commit is contained in:
Daniel J. Hofmann 2016-11-14 23:56:14 +01:00 committed by Patrick Niklaus
parent 3235f30a98
commit 8f6dd805e5
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/util/graph_loader.hpp
View File

@ -32,8 +32,8 @@ namespace util
* The since the restrictions reference nodes using their external node id, * The since the restrictions reference nodes using their external node id,
* we need to renumber it to the new internal id. * we need to renumber it to the new internal id.
*/ */
unsigned loadRestrictionsFromFile(std::istream &input_stream, inline unsigned loadRestrictionsFromFile(std::istream &input_stream,
std::vector<extractor::TurnRestriction> &restriction_list) std::vector<extractor::TurnRestriction> &restriction_list)
{ {
const FingerPrint fingerprint_valid = FingerPrint::GetValid(); const FingerPrint fingerprint_valid = FingerPrint::GetValid();
FingerPrint fingerprint_loaded; FingerPrint fingerprint_loaded;
@ -62,10 +62,10 @@ unsigned loadRestrictionsFromFile(std::istream &input_stream,
* - list of traffic lights * - list of traffic lights
* - nodes indexed by their internal (non-osm) id * - nodes indexed by their internal (non-osm) id
*/ */
NodeID loadNodesFromFile(std::istream &input_stream, inline NodeID loadNodesFromFile(std::istream &input_stream,
std::vector<NodeID> &barrier_node_list, std::vector<NodeID> &barrier_node_list,
std::vector<NodeID> &traffic_light_node_list, std::vector<NodeID> &traffic_light_node_list,
std::vector<extractor::QueryNode> &node_array) std::vector<extractor::QueryNode> &node_array)
{ {
const FingerPrint fingerprint_valid = FingerPrint::GetValid(); const FingerPrint fingerprint_valid = FingerPrint::GetValid();
FingerPrint fingerprint_loaded; FingerPrint fingerprint_loaded;
@ -109,8 +109,8 @@ NodeID loadNodesFromFile(std::istream &input_stream,
/** /**
* Reads a .osrm file and produces the edges. * Reads a .osrm file and produces the edges.
*/ */
NodeID loadEdgesFromFile(std::istream &input_stream, inline NodeID loadEdgesFromFile(std::istream &input_stream,
std::vector<extractor::NodeBasedEdge> &edge_list) std::vector<extractor::NodeBasedEdge> &edge_list)
{ {
EdgeID m; EdgeID m;
input_stream.read(reinterpret_cast<char *>(&m), sizeof(unsigned)); input_stream.read(reinterpret_cast<char *>(&m), sizeof(unsigned));