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

Force correct type deduction for irange on windows

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
include/engine/api/route_api.hpp
+2 -2
View File
@@ -82,7 +82,7 @@ class RouteAPI : public BaseAPI
legs.reserve(number_of_legs);
leg_geometries.reserve(number_of_legs);
for (auto idx : util::irange(0UL, number_of_legs))
for (auto idx : util::irange<std::size_t>(0UL, number_of_legs))
{
const auto &phantoms = segment_end_coordinates[idx];
const auto &path_data = unpacked_path_segments[idx];
@@ -155,7 +155,7 @@ class RouteAPI : public BaseAPI
}
std::vector<util::json::Value> step_geometries;
for (const auto idx : util::irange(0UL, legs.size()))
for (const auto idx : util::irange<std::size_t>(0UL, legs.size()))
{
auto &leg_geometry = leg_geometries[idx];
std::transform(
include/engine/api/table_api.hpp
+1 -1
View File
@@ -103,7 +103,7 @@ class TableAPI final : public BaseAPI
std::size_t number_of_columns) const
{
util::json::Array json_table;
for (const auto row : util::irange<std::size_t>(0, number_of_rows))
for (const auto row : util::irange<std::size_t>(0UL, number_of_rows))
{
util::json::Array json_row;
auto row_begin_iterator = values.begin() + (row * number_of_columns);
include/engine/api/trip_api.hpp
+2 -2
View File
@@ -77,10 +77,10 @@ class TripAPI final : public RouteAPI
};
std::vector<TripIndex> input_idx_to_trip_idx(parameters.coordinates.size());
for (auto sub_trip_index : util::irange(0u, static_cast<unsigned>(sub_trips.size())))
for (auto sub_trip_index : util::irange<unsigned>(0u, sub_trips.size()))
{
for (auto point_index :
util::irange(0u, static_cast<unsigned>(sub_trips[sub_trip_index].size())))
util::irange<unsigned>(0u, sub_trips[sub_trip_index].size()))
{
input_idx_to_trip_idx[sub_trips[sub_trip_index][point_index]] =
TripIndex{sub_trip_index, point_index};