From 8dc7afed4e7f9eea8ed83bd21b47c2a3c6d77e7b Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Fri, 9 May 2014 19:26:37 +0200 Subject: [PATCH] remove even more climits --- Extractor/ExtractionContainers.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Extractor/ExtractionContainers.cpp b/Extractor/ExtractionContainers.cpp index 5e0613bcc..3f46a1bd5 100644 --- a/Extractor/ExtractionContainers.cpp +++ b/Extractor/ExtractionContainers.cpp @@ -37,6 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include +#include ExtractionContainers::ExtractionContainers() { @@ -199,8 +200,8 @@ void ExtractionContainers::PrepareData(const std::string &output_file_name, restrictions_iterator->restriction.toNode = way_start_and_end_iterator->firstStart; } - if (UINT_MAX != restrictions_iterator->restriction.fromNode && - UINT_MAX != restrictions_iterator->restriction.toNode) + if (std::numeric_limits != restrictions_iterator->restriction.fromNode && + std::numeric_limits != restrictions_iterator->restriction.toNode) { ++number_of_useable_restrictions; } @@ -220,8 +221,8 @@ void ExtractionContainers::PrepareData(const std::string &output_file_name, restrictions_iterator != restrictions_list.end(); ++restrictions_iterator) { - if (UINT_MAX != restrictions_iterator->restriction.fromNode && - UINT_MAX != restrictions_iterator->restriction.toNode) + if (std::numeric_limits != restrictions_iterator->restriction.fromNode && + std::numeric_limits != restrictions_iterator->restriction.toNode) { restrictions_out_stream.write((char *)&(restrictions_iterator->restriction), sizeof(TurnRestriction)); @@ -336,8 +337,8 @@ void ExtractionContainers::PrepareData(const std::string &output_file_name, continue; } BOOST_ASSERT(edge_iterator->target == node_iterator->id); - if (edge_iterator->source_coordinate.lat != INT_MIN && - edge_iterator->source_coordinate.lon != INT_MIN) + if (edge_iterator->source_coordinate.lat != std::numeric_limits::min() && + edge_iterator->source_coordinate.lon != std::numeric_limits::min()) { BOOST_ASSERT(edge_iterator->speed != -1); BOOST_ASSERT(edge_iterator->type >= 0);