From 684dc00e7098e3a33dbea66bc4efdce214700766 Mon Sep 17 00:00:00 2001 From: Lev Dragunov Date: Thu, 24 Sep 2015 15:25:22 +0300 Subject: [PATCH] Routing generator warning fixes. --- .../osrm-backend/data_structures/edge_based_node_data.hpp | 4 ++-- generator/routing_generator.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/3party/osrm/osrm-backend/data_structures/edge_based_node_data.hpp b/3party/osrm/osrm-backend/data_structures/edge_based_node_data.hpp index dbcadfe01b..c5fb938678 100644 --- a/3party/osrm/osrm-backend/data_structures/edge_based_node_data.hpp +++ b/3party/osrm/osrm-backend/data_structures/edge_based_node_data.hpp @@ -84,11 +84,11 @@ inline bool SaveNodeDataToFile(std::string const & filename, NodeDataVectorT con if (!stream.is_open()) return false; - uint32_t count = data.size(); + uint32_t count = static_cast(data.size()); stream.write((char*)&count, sizeof(count)); for (auto d : data) { - uint32_t pc = d.m_segments.size(); + uint32_t pc = static_cast(d.m_segments.size()); stream.write((char*)&pc, sizeof(pc)); stream.write((char*)d.m_segments.data(), sizeof(NodeData::SegmentInfo) * pc); } diff --git a/generator/routing_generator.cpp b/generator/routing_generator.cpp index e9ce5a3326..a699e4110f 100644 --- a/generator/routing_generator.cpp +++ b/generator/routing_generator.cpp @@ -91,7 +91,7 @@ void FindCrossNodes(osrm::NodeDataVectorT const & nodeData, gen::OsmID2FeatureID }); }); - for (size_t nodeId = 0; nodeId < nodeData.size(); ++nodeId) + for (WritedNodeID nodeId = 0; nodeId < nodeData.size(); ++nodeId) { auto const & data = nodeData[nodeId]; @@ -250,7 +250,7 @@ void BuildRoutingIndex(string const & baseDir, string const & countryName, strin uint32_t found = 0, all = 0, multiple = 0, equal = 0, moreThan1Seg = 0, stored = 0; - for (size_t nodeId = 0; nodeId < nodeData.size(); ++nodeId) + for (WritedNodeID nodeId = 0; nodeId < nodeData.size(); ++nodeId) { auto const & data = nodeData[nodeId];