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

build fixes on GCC

Browse Source
This commit is contained in:
Dennis Luxen 2014-05-09 19:35:09 +02:00
parent 8dc7afed4e
commit e706fb973f
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Extractor/ExtractionContainers.cpp
View File

@ -200,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 (std::numeric_limits<unsigned::max> != restrictions_iterator->restriction.fromNode && if (std::numeric_limits<unsigned>::max() != restrictions_iterator->restriction.fromNode &&
std::numeric_limits<unsigned::max> != restrictions_iterator->restriction.toNode) std::numeric_limits<unsigned>::max() != restrictions_iterator->restriction.toNode)
{ {
++number_of_useable_restrictions; ++number_of_useable_restrictions;
} }
@ -221,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 (std::numeric_limits<unsigned::max> != restrictions_iterator->restriction.fromNode && if (std::numeric_limits<unsigned>::max() != restrictions_iterator->restriction.fromNode &&
std::numeric_limits<unsigned::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));

3
Extractor/ExtractorCallbacks.cpp
View File

@ -35,6 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <osrm/Coordinate.h> #include <osrm/Coordinate.h>
#include <limits>
#include <string> #include <string>
#include <vector> #include <vector>
@ -64,7 +65,7 @@ void ExtractorCallbacks::ProcessWay(ExtractionWay &parsed_way)
{ {
if ((0 < parsed_way.speed) || (0 < parsed_way.duration)) if ((0 < parsed_way.speed) || (0 < parsed_way.duration))
{ // Only true if the way is specified by the speed profile { // Only true if the way is specified by the speed profile
if (UINT_MAX == parsed_way.id) if (std::numeric_limits<unsigned>::max() == parsed_way.id)
{ {
SimpleLogger().Write(logDEBUG) << "found bogus way with id: " << parsed_way.id SimpleLogger().Write(logDEBUG) << "found bogus way with id: " << parsed_way.id
<< " of size " << parsed_way.path.size(); << " of size " << parsed_way.path.size();