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

fixing ticket 20. stxxl should not complain any more. also, there should be no compiler warnings.

Browse Source
This commit is contained in:
Dennis Luxen
2011-01-14 16:54:42 +00:00
parent 46a690dfc2
commit e32ba24b6a
11 changed files with 286 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Contractor/Contractor.h
+4 -4
View File
@@ -54,7 +54,7 @@ public:
private:
struct _EdgeData {
int distance;
unsigned distance;
unsigned originalEdges : 29;
bool shortcut : 1;
bool forward : 1;
@@ -250,15 +250,15 @@ public:
}
//merge edges (s,t) and (t,s) into bidirectional edge
if ( forwardEdge.data.distance == backwardEdge.data.distance ) {
if ( forwardEdge.data.distance != std::numeric_limits< int >::max() ) {
if ( (int)forwardEdge.data.distance != std::numeric_limits< int >::max() ) {
forwardEdge.data.backward = true;
edges[edge++] = forwardEdge;
}
} else { //insert seperate edges
if ( forwardEdge.data.distance != std::numeric_limits< int >::max() ) {
if ( (int)forwardEdge.data.distance != std::numeric_limits< int >::max() ) {
edges[edge++] = forwardEdge;
}
if ( backwardEdge.data.distance != std::numeric_limits< int >::max() ) {
if ( (int)backwardEdge.data.distance != std::numeric_limits< int >::max() ) {
edges[edge++] = backwardEdge;
}
}