From e0f009b3b90da9f3f7212988c5f325246ea04faa Mon Sep 17 00:00:00 2001 From: Lauren Budorick Date: Mon, 29 Feb 2016 20:56:48 -0800 Subject: [PATCH] Fixes for gcc compiling, temporary hacks to remove later --- src/engine/api/json_factory.cpp | 2 +- src/extractor/turn_analysis.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/engine/api/json_factory.cpp b/src/engine/api/json_factory.cpp index 6bd49ac7d..23f4807d1 100644 --- a/src/engine/api/json_factory.cpp +++ b/src/engine/api/json_factory.cpp @@ -100,7 +100,7 @@ util::json::Object makeStepManeuver(const guidance::StepManeuver &maneuver) { util::json::Object step_maneuver; step_maneuver.values["type"] = detail::instructionTypeToString(maneuver.instruction.type); - if( isValidModifier( maneuver.instruction.type, maneuver.instruction.direction_modifier ) ) + if( guidance::isValidModifier( maneuver.instruction.type, maneuver.instruction.direction_modifier ) ) step_maneuver.values["modifier"] = detail::instructionModifierToString(maneuver.instruction.direction_modifier); step_maneuver.values["location"] = detail::coordinateToLonLat(maneuver.location); diff --git a/src/extractor/turn_analysis.cpp b/src/extractor/turn_analysis.cpp index b4d5c29e3..c45ea014c 100644 --- a/src/extractor/turn_analysis.cpp +++ b/src/extractor/turn_analysis.cpp @@ -47,6 +47,7 @@ using engine::guidance::isConflict; using engine::guidance::isSlightTurn; using engine::guidance::isSlightModifier; using engine::guidance::mirrorDirectionModifier; +using engine::guidance::canBeSuppressed; #define PRINT_DEBUG_CANDIDATES 0 std::vector