From e706fb973f48b62fef9f178a5f0103259dd32a9b Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Fri, 9 May 2014 19:35:09 +0200 Subject: [PATCH] build fixes on GCC --- Extractor/ExtractionContainers.cpp | 8 ++++---- Extractor/ExtractorCallbacks.cpp | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Extractor/ExtractionContainers.cpp b/Extractor/ExtractionContainers.cpp index 3f46a1bd5..30d47fb50 100644 --- a/Extractor/ExtractionContainers.cpp +++ b/Extractor/ExtractionContainers.cpp @@ -200,8 +200,8 @@ void ExtractionContainers::PrepareData(const std::string &output_file_name, restrictions_iterator->restriction.toNode = way_start_and_end_iterator->firstStart; } - if (std::numeric_limits != restrictions_iterator->restriction.fromNode && - std::numeric_limits != restrictions_iterator->restriction.toNode) + if (std::numeric_limits::max() != restrictions_iterator->restriction.fromNode && + std::numeric_limits::max() != restrictions_iterator->restriction.toNode) { ++number_of_useable_restrictions; } @@ -221,8 +221,8 @@ void ExtractionContainers::PrepareData(const std::string &output_file_name, restrictions_iterator != restrictions_list.end(); ++restrictions_iterator) { - if (std::numeric_limits != restrictions_iterator->restriction.fromNode && - std::numeric_limits != restrictions_iterator->restriction.toNode) + if (std::numeric_limits::max() != restrictions_iterator->restriction.fromNode && + std::numeric_limits::max() != restrictions_iterator->restriction.toNode) { restrictions_out_stream.write((char *)&(restrictions_iterator->restriction), sizeof(TurnRestriction)); diff --git a/Extractor/ExtractorCallbacks.cpp b/Extractor/ExtractorCallbacks.cpp index b5764a952..8a019fb57 100644 --- a/Extractor/ExtractorCallbacks.cpp +++ b/Extractor/ExtractorCallbacks.cpp @@ -35,6 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include +#include #include #include @@ -64,7 +65,7 @@ void ExtractorCallbacks::ProcessWay(ExtractionWay &parsed_way) { if ((0 < parsed_way.speed) || (0 < parsed_way.duration)) { // Only true if the way is specified by the speed profile - if (UINT_MAX == parsed_way.id) + if (std::numeric_limits::max() == parsed_way.id) { SimpleLogger().Write(logDEBUG) << "found bogus way with id: " << parsed_way.id << " of size " << parsed_way.path.size();