gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[generator] Fixed warnings.

Browse source
This commit is contained in:
Maksim Andrianov 2019-08-27 15:26:06 +03:00 • committed by gmoryes
parent ccc15eaf4a
commit 4d6b881baa
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
generator/coastlines_generator.cpp
View file

@ -294,7 +294,7 @@ public:
while (true)
{
unique_lock<mutex> 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<FeatureBuilder> & 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));

4
generator/translator_country.hpp
View file

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

4
generator/translator_world.hpp
View file

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