Skip to content

Commit

Permalink
fix windows build?
Browse files Browse the repository at this point in the history
  • Loading branch information
karenzshea committed Jan 2, 2018
1 parent 928d71f commit f54c5a4
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
15 changes: 6 additions & 9 deletions include/engine/api/match_parameters.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,7 @@ struct MatchParameters : public RouteParameters
}

template <typename... Args>
MatchParameters(std::vector<unsigned> timestamps_,
GapsType gaps_,
bool tidy_,
Args... args_)
MatchParameters(std::vector<unsigned> timestamps_, GapsType gaps_, bool tidy_, Args... args_)
: MatchParameters(std::move(timestamps_), gaps_, tidy_, {}, std::forward<Args>(args_)...)
{
}
Expand All @@ -94,12 +91,12 @@ struct MatchParameters : public RouteParameters

bool IsValid() const
{
const auto valid_waypoints = std::all_of(waypoints.begin(), waypoints.end(), [this](const auto &w) {
return w < coordinates.size();
});
const auto valid_waypoints =
std::all_of(waypoints.begin(), waypoints.end(), [this](const auto &w) {
return w < coordinates.size();
});
return RouteParameters::IsValid() &&
(timestamps.empty() || timestamps.size() == coordinates.size()) &&
valid_waypoints;
(timestamps.empty() || timestamps.size() == coordinates.size()) && valid_waypoints;
}
};
}
Expand Down
2 changes: 1 addition & 1 deletion include/engine/internal_route_result.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#include "util/guidance/entry_class.hpp"
#include "util/guidance/turn_bearing.hpp"
#include "util/guidance/turn_lanes.hpp"
#include "util/typedefs.hpp"
#include "util/integer_range.hpp"
#include "util/typedefs.hpp"

#include <vector>

Expand Down
1 change: 1 addition & 0 deletions src/engine/plugins/match.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include <memory>
#include <string>
#include <vector>
#include <set>

namespace osrm
{
Expand Down

0 comments on commit f54c5a4

Please sign in to comment.