Force correct type deduction for irange on windows

This commit is contained in:
Patrick Niklaus
2016-04-12 12:42:16 +02:00
parent 621ed970da
commit 7416653874
12 changed files with 45 additions and 33 deletions
+1 -1
View File
@@ -626,7 +626,7 @@ Contractor::WriteContractedGraph(unsigned max_node_id,
int number_of_used_edges = 0;
util::StaticGraph<EdgeData>::EdgeArrayEntry current_edge;
for (const auto edge : util::irange<std::size_t>(0, contracted_edge_list.size()))
for (const auto edge : util::irange<std::size_t>(0UL, contracted_edge_list.size()))
{
// some self-loops are required for oneway handling. Need to assertthat we only keep these
// (TODO)
+1 -1
View File
@@ -168,7 +168,7 @@ Status MatchPlugin::HandleRequest(const api::MatchParameters &parameters,
}
std::vector<InternalRouteResult> sub_routes(sub_matchings.size());
for (auto index : util::irange(0UL, sub_matchings.size()))
for (auto index : util::irange<std::size_t>(0UL, sub_matchings.size()))
{
BOOST_ASSERT(sub_matchings[index].nodes.size() > 1);
+1 -1
View File
@@ -544,7 +544,7 @@ void Extractor::BuildRTree(std::vector<EdgeBasedNode> node_based_edge_list,
// Filter node based edges based on startpoint
auto out_iter = node_based_edge_list.begin();
auto in_iter = node_based_edge_list.begin();
for (auto index : util::irange<std::size_t>(0, node_is_startpoint.size()))
for (auto index : util::irange<std::size_t>(0UL, node_is_startpoint.size()))
{
BOOST_ASSERT(in_iter != node_based_edge_list.end());
if (node_is_startpoint[index])