From 0229aba43f90dd9d12ba68a5dc6b69f6f166a274 Mon Sep 17 00:00:00 2001 From: Daria Volvenkova Date: Tue, 11 Apr 2017 12:49:36 +0300 Subject: [PATCH] Fixed compilation of benchmark tools. --- map/benchmark_tools.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/map/benchmark_tools.cpp b/map/benchmark_tools.cpp index 6ed66a76e0..e0bc586cfe 100644 --- a/map/benchmark_tools.cpp +++ b/map/benchmark_tools.cpp @@ -101,7 +101,7 @@ void RunGraphicsBenchmark(Framework * framework) auto scenarioElem = json_array_get(scenariosNode, i); if (scenarioElem == nullptr) return; - my::FromJSONObject(scenarioElem, "name", handle->m_scenariosToRun[i].m_name); + FromJSONObject(scenarioElem, "name", handle->m_scenariosToRun[i].m_name); json_t * stepsNode = json_object_get(scenarioElem, "steps"); if (stepsNode != nullptr && json_is_array(stepsNode)) { @@ -114,11 +114,11 @@ void RunGraphicsBenchmark(Framework * framework) if (stepElem == nullptr) return; string actionType; - my::FromJSONObject(stepElem, "actionType", actionType); + FromJSONObject(stepElem, "actionType", actionType); if (actionType == "waitForTime") { json_int_t timeInSeconds = 0; - my::FromJSONObject(stepElem, "time", timeInSeconds); + FromJSONObject(stepElem, "time", timeInSeconds); scenario.push_back(std::unique_ptr( new ScenarioManager::WaitForTimeAction(seconds(timeInSeconds)))); } @@ -128,10 +128,10 @@ void RunGraphicsBenchmark(Framework * framework) if (centerNode == nullptr) return; double x = 0.0, y = 0.0; - my::FromJSONObject(centerNode, "x", x); - my::FromJSONObject(centerNode, "y", y); + FromJSONObject(centerNode, "x", x); + FromJSONObject(centerNode, "y", y); json_int_t zoomLevel = -1; - my::FromJSONObject(stepElem, "zoomLevel", zoomLevel); + FromJSONObject(stepElem, "zoomLevel", zoomLevel); m2::PointD const pt(x, y); points.push_back(pt); scenario.push_back(std::unique_ptr(