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

fix coverity issues

Browse Source
This commit is contained in:
Dennis Luxen 2014-05-01 14:31:48 +02:00
parent a45d274847
commit a45508a96b
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Contractor/EdgeBasedGraphFactory.h
View File

@ -110,10 +110,10 @@ public:
private: private:
struct NodeBasedEdgeData { struct NodeBasedEdgeData {
NodeBasedEdgeData() { NodeBasedEdgeData() : distance(INVALID_EDGE_WEIGHT), edgeBasedNodeID(SPECIAL_NODEID), nameID(std::numeric_limits<unsigned>::max()),
//TODO: proper c'tor type(std::numeric_limits<short>::max()), isAccessRestricted(false), shortcut(false), forward(false), backward(false),
edgeBasedNodeID = UINT_MAX; roundabout(false), ignore_in_grid(false), contraFlow(false)
} { }
int distance; int distance;
unsigned edgeBasedNodeID; unsigned edgeBasedNodeID;

21
DataStructures/StaticGraph.h
View File

@ -108,21 +108,16 @@ public:
unsigned v = GetTarget(eid); unsigned v = GetTarget(eid);
EdgeData & data = GetEdgeData(eid); EdgeData & data = GetEdgeData(eid);
if(data.shortcut) { if(data.shortcut) {
unsigned eid2 = FindEdgeInEitherDirection(u, data.id); const EdgeID first_edge_id = FindEdgeInEitherDirection(u, data.id);
if(eid2 == UINT_MAX) { if (SPECIAL_EDGEID == first_edge_id)
SimpleLogger().Write(logWARNING) << {
"cannot find first segment of edge (" << SimpleLogger().Write(logWARNING) << "cannot find first segment of edge (" << u << "," << data.id << "," << v << "), eid: " << eid;
u << "," << data.id << "," << v << "), eid: " << eid;
data.shortcut = false;
BOOST_ASSERT(false); BOOST_ASSERT(false);
} }
eid2 = FindEdgeInEitherDirection(data.id, v); const EdgeID second_edge_id = FindEdgeInEitherDirection(data.id, v);
if(eid2 == UINT_MAX) { if (SPECIAL_EDGEID == second_edge_id)
SimpleLogger().Write(logWARNING) << {
"cannot find second segment of edge (" << SimpleLogger().Write(logWARNING) << "cannot find second segment of edge (" << u << "," << data.id << "," << v << "), eid: " << eid;
u << "," << data.id << "," << v << "), eid2: " << eid2;
data.shortcut = false;
BOOST_ASSERT(false); BOOST_ASSERT(false);
} }
} }