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

remove even more climits

Browse Source
This commit is contained in:
Dennis Luxen 2014-05-09 19:26:37 +02:00
parent 0c7f996de6
commit 8dc7afed4e
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Extractor/ExtractionContainers.cpp
View File

@ -37,6 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <stxxl/sort> #include <stxxl/sort>
#include <chrono> #include <chrono>
#include <limits>
ExtractionContainers::ExtractionContainers() 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; restrictions_iterator->restriction.toNode = way_start_and_end_iterator->firstStart;
} }
if (UINT_MAX != restrictions_iterator->restriction.fromNode && if (std::numeric_limits<unsigned::max> != restrictions_iterator->restriction.fromNode &&
UINT_MAX != restrictions_iterator->restriction.toNode) std::numeric_limits<unsigned::max> != restrictions_iterator->restriction.toNode)
{ {
++number_of_useable_restrictions; ++number_of_useable_restrictions;
} }
@ -220,8 +221,8 @@ void ExtractionContainers::PrepareData(const std::string &output_file_name,
restrictions_iterator != restrictions_list.end(); restrictions_iterator != restrictions_list.end();
++restrictions_iterator) ++restrictions_iterator)
{ {
if (UINT_MAX != restrictions_iterator->restriction.fromNode && if (std::numeric_limits<unsigned::max> != restrictions_iterator->restriction.fromNode &&
UINT_MAX != restrictions_iterator->restriction.toNode) std::numeric_limits<unsigned::max> != restrictions_iterator->restriction.toNode)
{ {
restrictions_out_stream.write((char *)&(restrictions_iterator->restriction), restrictions_out_stream.write((char *)&(restrictions_iterator->restriction),
sizeof(TurnRestriction)); sizeof(TurnRestriction));
@ -336,8 +337,8 @@ void ExtractionContainers::PrepareData(const std::string &output_file_name,
continue; continue;
} }
BOOST_ASSERT(edge_iterator->target == node_iterator->id); BOOST_ASSERT(edge_iterator->target == node_iterator->id);
if (edge_iterator->source_coordinate.lat != INT_MIN && if (edge_iterator->source_coordinate.lat != std::numeric_limits<int>::min() &&
edge_iterator->source_coordinate.lon != INT_MIN) edge_iterator->source_coordinate.lon != std::numeric_limits<int>::min())
{ {
BOOST_ASSERT(edge_iterator->speed != -1); BOOST_ASSERT(edge_iterator->speed != -1);
BOOST_ASSERT(edge_iterator->type >= 0); BOOST_ASSERT(edge_iterator->type >= 0);