From 3d98cc5b372b9db59d17ec0517f0e1d7bcaef961 Mon Sep 17 00:00:00 2001 From: Vladimir Byko-Ianko Date: Tue, 19 Dec 2017 14:05:07 +0300 Subject: [PATCH] Review fixes. --- generator/generator_tests/generator_tests.pro | 4 ++-- map/transit/transit_reader.cpp | 4 +++- map/transit/transit_reader.hpp | 4 +++- transit/transit_tests/CMakeLists.txt | 2 +- transit/transit_tests/transit_tests.pro | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/generator/generator_tests/generator_tests.pro b/generator/generator_tests/generator_tests.pro index 46f78f3377..c25e43cafa 100644 --- a/generator/generator_tests/generator_tests.pro +++ b/generator/generator_tests/generator_tests.pro @@ -6,8 +6,8 @@ TEMPLATE = app ROOT_DIR = ../.. DEPENDENCIES = generator_tests_support platform_tests_support generator drape_frontend routing \ search storage ugc indexer drape map traffic routing_common transit platform editor \ - coding base freetype expat jansson protobuf osrm stats_client \ - geometry minizip succinct pugixml tess2 gflags oauthcpp stb_image sdf_image icu + geometry coding base freetype expat jansson protobuf osrm stats_client \ + minizip succinct pugixml tess2 gflags oauthcpp stb_image sdf_image icu include($$ROOT_DIR/common.pri) diff --git a/map/transit/transit_reader.cpp b/map/transit/transit_reader.cpp index 2b9d844dde..110c307ac6 100644 --- a/map/transit/transit_reader.cpp +++ b/map/transit/transit_reader.cpp @@ -16,7 +16,8 @@ using namespace routing; using namespace std; // ReadTransitTask -------------------------------------------------------------------------------- -void ReadTransitTask::Init(uint64_t id, MwmSet::MwmId const & mwmId, unique_ptr && transitInfo) +void ReadTransitTask::Init(uint64_t id, MwmSet::MwmId const & mwmId, + unique_ptr transitInfo) { m_id = id; m_mwmId = mwmId; @@ -30,6 +31,7 @@ void ReadTransitTask::Init(uint64_t id, MwmSet::MwmId const & mwmId, unique_ptr< m_loadSubset = true; m_transitInfo = move(transitInfo); } + m_success = false; } void ReadTransitTask::Do() diff --git a/map/transit/transit_reader.hpp b/map/transit/transit_reader.hpp index d8129fcd3d..3318570811 100644 --- a/map/transit/transit_reader.hpp +++ b/map/transit/transit_reader.hpp @@ -9,6 +9,7 @@ #include "base/thread_pool.hpp" #include +#include #include #include #include @@ -53,7 +54,8 @@ public: : m_index(index), m_readFeaturesFn(readFeaturesFn) {} - void Init(uint64_t id, MwmSet::MwmId const & mwmId, std::unique_ptr && transitInfo = nullptr); + void Init(uint64_t id, MwmSet::MwmId const & mwmId, + std::unique_ptr transitInfo = nullptr); uint64_t GetId() const { return m_id; } bool GetSuccess() const { return m_success; } diff --git a/transit/transit_tests/CMakeLists.txt b/transit/transit_tests/CMakeLists.txt index cd91b26a72..917cbf3b56 100644 --- a/transit/transit_tests/CMakeLists.txt +++ b/transit/transit_tests/CMakeLists.txt @@ -15,8 +15,8 @@ omim_link_libraries( indexer transit platform - geometry coding + geometry base jansson stats_client diff --git a/transit/transit_tests/transit_tests.pro b/transit/transit_tests/transit_tests.pro index 1d899472e0..eb4356b5ae 100644 --- a/transit/transit_tests/transit_tests.pro +++ b/transit/transit_tests/transit_tests.pro @@ -6,7 +6,7 @@ CONFIG -= app_bundle TEMPLATE = app ROOT_DIR = ../.. -DEPENDENCIES = transit indexer platform geometry coding base \ +DEPENDENCIES = transit indexer platform coding geometry base \ jansson stats_client macx-*: LIBS *= "-framework IOKit" "-framework SystemConfiguration"