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

Make gcc 4.8 happy and disable protected because of lambdas

Browse Source
This commit is contained in:
Patrick Niklaus 2016-03-19 00:01:43 +01:00
parent 08e56956d6
commit 1f853385d5
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/engine/api/base_api.hpp
View File

@ -45,7 +45,8 @@ class BaseAPI
return waypoints; return waypoints;
} }
protected: // FIXME gcc 4.8 doesn't support for lambdas to call protected member functions
// protected:
util::json::Object MakeWaypoint(const PhantomNode &phantom) const util::json::Object MakeWaypoint(const PhantomNode &phantom) const
{ {
return json::makeWaypoint(phantom.location, facade.GetNameForID(phantom.name_id), return json::makeWaypoint(phantom.location, facade.GetNameForID(phantom.name_id),

4
include/engine/api/match_api.hpp
View File

@ -48,7 +48,9 @@ class MatchAPI final : public RouteAPI
response.values["code"] = "ok"; response.values["code"] = "ok";
} }
protected: // FIXME gcc 4.8 doesn't support for lambdas to call protected member functions
// protected:
// FIXME this logic is a little backwards. We should change the output format of the // FIXME this logic is a little backwards. We should change the output format of the
// map_matching // map_matching
// routing algorithm to be easier to consume here. // routing algorithm to be easier to consume here.

3
include/engine/api/route_api.hpp
View File

@ -57,7 +57,8 @@ class RouteAPI : public BaseAPI
response.values["code"] = "ok"; response.values["code"] = "ok";
} }
protected: // FIXME gcc 4.8 doesn't support for lambdas to call protected member functions
// protected:
template <typename ForwardIter> template <typename ForwardIter>
util::json::Value MakeGeometry(ForwardIter begin, ForwardIter end) const util::json::Value MakeGeometry(ForwardIter begin, ForwardIter end) const
{ {

3
include/engine/api/table_api.hpp
View File

@ -68,7 +68,8 @@ class TableAPI final : public BaseAPI
response.values["code"] = "ok"; response.values["code"] = "ok";
} }
protected: // FIXME gcc 4.8 doesn't support for lambdas to call protected member functions
// protected:
virtual util::json::Array MakeWaypoints(const std::vector<PhantomNode> &phantoms) const virtual util::json::Array MakeWaypoints(const std::vector<PhantomNode> &phantoms) const
{ {
util::json::Array json_waypoints; util::json::Array json_waypoints;

4
include/engine/api/trip_api.hpp
View File

@ -47,7 +47,9 @@ class TripAPI final : public RouteAPI
response.values["code"] = "ok"; response.values["code"] = "ok";
} }
protected: // FIXME gcc 4.8 doesn't support for lambdas to call protected member functions
// protected:
// FIXME this logic is a little backwards. We should change the output format of the // FIXME this logic is a little backwards. We should change the output format of the
// trip plugin routing algorithm to be easier to consume here. // trip plugin routing algorithm to be easier to consume here.
util::json::Array MakeWaypoints(const std::vector<std::vector<NodeID>> &sub_trips, util::json::Array MakeWaypoints(const std::vector<std::vector<NodeID>> &sub_trips,