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

further climits madness

Browse Source
This commit is contained in:
Dennis Luxen 2014-05-09 19:41:36 +02:00
parent e706fb973f
commit 285bd4f542
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Extractor/PBFParser.cpp
View File

@ -47,6 +47,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <zlib.h> #include <zlib.h>
#include <functional> #include <functional>
#include <limits>
#include <thread> #include <thread>
PBFParser::PBFParser(const char *fileName, PBFParser::PBFParser(const char *fileName,
@ -355,11 +356,11 @@ inline void PBFParser::parseRelation(ParserThreadData *thread_data)
continue; continue;
} }
assert("via" == role); assert("via" == role);
if (UINT_MAX != currentRestrictionContainer.viaNode) if (std::numeric_limits<unsigned>::max() != currentRestrictionContainer.viaNode)
{ {
currentRestrictionContainer.viaNode = UINT_MAX; currentRestrictionContainer.viaNode = std::numeric_limits<unsigned>::max();
} }
assert(UINT_MAX == currentRestrictionContainer.viaNode); assert(std::numeric_limits<unsigned>::max() == currentRestrictionContainer.viaNode);
currentRestrictionContainer.restriction.viaNode = lastRef; currentRestrictionContainer.restriction.viaNode = lastRef;
break; break;
case 1: // way case 1: // way
@ -374,7 +375,7 @@ inline void PBFParser::parseRelation(ParserThreadData *thread_data)
} }
if ("via" == role) if ("via" == role)
{ {
assert(currentRestrictionContainer.restriction.toNode == UINT_MAX); assert(currentRestrictionContainer.restriction.toNode == std::numeric_limits<unsigned>::max());
currentRestrictionContainer.viaNode = lastRef; currentRestrictionContainer.viaNode = lastRef;
} }
break; break;