diff --git a/generator/coastlines_generator.cpp b/generator/coastlines_generator.cpp index 90d5f4a793..9fbcb52ab5 100644 --- a/generator/coastlines_generator.cpp +++ b/generator/coastlines_generator.cpp @@ -294,7 +294,7 @@ public: while (true) { unique_lock lock(m_ctx.mutexTasks); - m_ctx.listCondVar.wait(lock, [this]{return (!m_ctx.listTasks.empty() || m_ctx.inWork == 0);}); + m_ctx.listCondVar.wait(lock, [&]{return (!m_ctx.listTasks.empty() || m_ctx.inWork == 0);}); if (m_ctx.listTasks.empty()) break; @@ -326,7 +326,7 @@ void CoastlineFeaturesGenerator::GetFeatures(vector & features) mutex featuresMutex; RegionInCellSplitter::Process( maxThreads, RegionInCellSplitter::kStartLevel, m_tree, - [&features, &featuresMutex, this](RegionInCellSplitter::TCell const & cell, DoDifference & cellData) + [&features, &featuresMutex](RegionInCellSplitter::TCell const & cell, DoDifference & cellData) { FeatureBuilder fb; fb.SetCoastCell(cell.ToInt64(RegionInCellSplitter::kHighLevel + 1)); diff --git a/generator/translator_country.hpp b/generator/translator_country.hpp index f5e4e57227..e8ccac85ba 100644 --- a/generator/translator_country.hpp +++ b/generator/translator_country.hpp @@ -64,5 +64,9 @@ protected: using TranslatorCountry::TranslatorCountry; OsmTagMixer m_osmTagMixer; + +private: + // Fix warning 'hides overloaded virtual function'. + void MergeInto(TranslatorCountry & other) const override { TranslatorInterface::MergeInto(other); } }; } // namespace generator diff --git a/generator/translator_world.hpp b/generator/translator_world.hpp index 6ca0ae7955..157a68aa70 100644 --- a/generator/translator_world.hpp +++ b/generator/translator_world.hpp @@ -62,5 +62,9 @@ protected: using TranslatorWorld::TranslatorWorld; OsmTagMixer m_osmTagMixer; + +private: + // Fix warning 'hides overloaded virtual function'. + void MergeInto(TranslatorWorld & other) const override { TranslatorInterface::MergeInto(other); } }; } // namespace generator