From 49e2a4ec07c0ae16679c8d7919e9b9182f32fdba Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Sat, 19 Mar 2016 00:01:43 +0100 Subject: [PATCH] Make gcc 4.8 happy and disable protected because of lambdas --- include/engine/api/base_api.hpp | 3 ++- include/engine/api/match_api.hpp | 4 +++- include/engine/api/route_api.hpp | 3 ++- include/engine/api/table_api.hpp | 3 ++- include/engine/api/trip_api.hpp | 4 +++- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/include/engine/api/base_api.hpp b/include/engine/api/base_api.hpp index 48ad42004..8cac72b55 100644 --- a/include/engine/api/base_api.hpp +++ b/include/engine/api/base_api.hpp @@ -45,7 +45,8 @@ class BaseAPI 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 { return json::makeWaypoint(phantom.location, facade.GetNameForID(phantom.name_id), diff --git a/include/engine/api/match_api.hpp b/include/engine/api/match_api.hpp index 0b4d9e9d4..7ce4fa27f 100644 --- a/include/engine/api/match_api.hpp +++ b/include/engine/api/match_api.hpp @@ -48,7 +48,9 @@ class MatchAPI final : public RouteAPI 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 // map_matching // routing algorithm to be easier to consume here. diff --git a/include/engine/api/route_api.hpp b/include/engine/api/route_api.hpp index 9210a36f9..d61da8a23 100644 --- a/include/engine/api/route_api.hpp +++ b/include/engine/api/route_api.hpp @@ -57,7 +57,8 @@ class RouteAPI : public BaseAPI response.values["code"] = "ok"; } - protected: + // FIXME gcc 4.8 doesn't support for lambdas to call protected member functions + // protected: template util::json::Value MakeGeometry(ForwardIter begin, ForwardIter end) const { diff --git a/include/engine/api/table_api.hpp b/include/engine/api/table_api.hpp index 590050267..ac683c9dd 100644 --- a/include/engine/api/table_api.hpp +++ b/include/engine/api/table_api.hpp @@ -68,7 +68,8 @@ class TableAPI final : public BaseAPI 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 &phantoms) const { util::json::Array json_waypoints; diff --git a/include/engine/api/trip_api.hpp b/include/engine/api/trip_api.hpp index c7086bc36..aea7676fa 100644 --- a/include/engine/api/trip_api.hpp +++ b/include/engine/api/trip_api.hpp @@ -47,7 +47,9 @@ class TripAPI final : public RouteAPI 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 // trip plugin routing algorithm to be easier to consume here. util::json::Array MakeWaypoints(const std::vector> &sub_trips,