kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Review fixes.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2017-12-19 14:05:07 +03:00 • committed by Yuri Gorshenin
parent 6c68fefaf8
commit 3d98cc5b37
5 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
generator/generator_tests/generator_tests.pro
View file

@ -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)

4
map/transit/transit_reader.cpp
View file

@ -16,7 +16,8 @@ using namespace routing;
using namespace std;
// ReadTransitTask --------------------------------------------------------------------------------
void ReadTransitTask::Init(uint64_t id, MwmSet::MwmId const & mwmId, unique_ptr<TransitDisplayInfo> && transitInfo)
void ReadTransitTask::Init(uint64_t id, MwmSet::MwmId const & mwmId,
unique_ptr<TransitDisplayInfo> 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()

4
map/transit/transit_reader.hpp
View file

@ -9,6 +9,7 @@
#include "base/thread_pool.hpp"
#include <condition_variable>
#include <cstdint>
#include <functional>
#include <map>
#include <memory>
@ -53,7 +54,8 @@ public:
: m_index(index), m_readFeaturesFn(readFeaturesFn)
{}
void Init(uint64_t id, MwmSet::MwmId const & mwmId, std::unique_ptr<TransitDisplayInfo> && transitInfo = nullptr);
void Init(uint64_t id, MwmSet::MwmId const & mwmId,
std::unique_ptr<TransitDisplayInfo> transitInfo = nullptr);
uint64_t GetId() const { return m_id; }
bool GetSuccess() const { return m_success; }

2
transit/transit_tests/CMakeLists.txt
View file

@ -15,8 +15,8 @@ omim_link_libraries(
indexer
transit
platform
geometry
coding
geometry
base
jansson
stats_client

2
transit/transit_tests/transit_tests.pro
View file

@ -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"