Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArsentiy Milchakov <milcars@mapswithme.com>2018-08-15 19:19:20 +0300
committermpimenov <mpimenov@users.noreply.github.com>2018-08-22 16:48:46 +0300
commit92824ab302b88fa6dbff89d49252c2cfe484b6ee (patch)
tree2bb6f1297ebcb2a3ee262998001c5a898700b54f /indexer
parent2b842cb5581a592bb2fc1d95ded460b52a26f2b6 (diff)
[editor] synchronization based on shared pointers. The editor is thread-safe for read operations now.
Diffstat (limited to 'indexer')
-rw-r--r--indexer/data_source.cpp2
-rw-r--r--indexer/feature_source.cpp4
-rw-r--r--indexer/feature_source.hpp4
3 files changed, 5 insertions, 5 deletions
diff --git a/indexer/data_source.cpp b/indexer/data_source.cpp
index 7056d8539f..30b290fb69 100644
--- a/indexer/data_source.cpp
+++ b/indexer/data_source.cpp
@@ -59,7 +59,7 @@ public:
// Need to do it on a per-mwm basis, because Drape relies on features in a sorted order.
// Touched (created, edited) features reading.
auto f = [&](uint32_t i) { m_fn(i, *src); };
- src->ForEachInRectAndScale(cov.GetRect(), scale, f);
+ src->ForEachAdditionalFeature(cov.GetRect(), scale, f);
}
private:
diff --git a/indexer/feature_source.cpp b/indexer/feature_source.cpp
index 254065a0a6..1231d0541b 100644
--- a/indexer/feature_source.cpp
+++ b/indexer/feature_source.cpp
@@ -52,7 +52,7 @@ bool FeatureSource::GetModifiedFeature(uint32_t index, FeatureType & feature) co
return false;
}
-void FeatureSource::ForEachInRectAndScale(m2::RectD const & rect, int scale,
- function<void(uint32_t)> const & fn) const
+void FeatureSource::ForEachAdditionalFeature(m2::RectD const & rect, int scale,
+ function<void(uint32_t)> const & fn) const
{
}
diff --git a/indexer/feature_source.hpp b/indexer/feature_source.hpp
index 6e22f4d939..af0dce2843 100644
--- a/indexer/feature_source.hpp
+++ b/indexer/feature_source.hpp
@@ -41,8 +41,8 @@ public:
virtual bool GetModifiedFeature(uint32_t index, FeatureType & feature) const;
- virtual void ForEachInRectAndScale(m2::RectD const & rect, int scale,
- std::function<void(uint32_t)> const & fn) const;
+ virtual void ForEachAdditionalFeature(m2::RectD const & rect, int scale,
+ std::function<void(uint32_t)> const & fn) const;
protected:
MwmSet::MwmHandle const & m_handle;