Make gcc 4.8 happy and disable protected because of lambdas
This commit is contained in:
		
							parent
							
								
									08e56956d6
								
							
						
					
					
						commit
						1f853385d5
					
				| @ -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), | ||||
|  | ||||
| @ -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.
 | ||||
|  | ||||
| @ -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 <typename ForwardIter> | ||||
|     util::json::Value MakeGeometry(ForwardIter begin, ForwardIter end) const | ||||
|     { | ||||
|  | ||||
| @ -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<PhantomNode> &phantoms) const | ||||
|     { | ||||
|         util::json::Array json_waypoints; | ||||
|  | ||||
| @ -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<std::vector<NodeID>> &sub_trips, | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user