diff options
author | Arsentiy Milchakov <a.milchakov@corp.mail.ru> | 2016-07-05 13:14:46 +0300 |
---|---|---|
committer | Arsentiy Milchakov <a.milchakov@corp.mail.ru> | 2016-07-05 13:14:46 +0300 |
commit | 00c41b1753b06152fd67c758d463d1916a52209e (patch) | |
tree | 389a735e4e9ff191a723478bea4764291a42d9ce | |
parent | fb87588b3efeb0fedb4bad06172ed5171ff36906 (diff) |
review changes
-rw-r--r-- | indexer/osm_editor.cpp | 3 | ||||
-rw-r--r-- | indexer/osm_editor.hpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/indexer/osm_editor.cpp b/indexer/osm_editor.cpp index 5f420d07ac..243b3097c0 100644 --- a/indexer/osm_editor.cpp +++ b/indexer/osm_editor.cpp @@ -32,7 +32,6 @@ #include "std/algorithm.hpp" #include "std/chrono.hpp" #include "std/future.hpp" -#include "std/mutex.hpp" #include "std/target_os.hpp" #include "std/tuple.hpp" #include "std/unordered_map.hpp" @@ -342,7 +341,7 @@ void Editor::ClearAllLocalEdits() void Editor::OnMapDeregistered(platform::LocalCountryFile const & localFile) { // TODO: to add some synchronization mechanism for whole Editor class - lock_guard<mutex> g(m_mapDeregisteredMtx); + lock_guard<mutex> g(m_mapDeregisteredMutex); using TFeaturePair = decltype(m_features)::value_type; // Cannot search by MwmId because country already removed. So, search by country name. diff --git a/indexer/osm_editor.hpp b/indexer/osm_editor.hpp index 2d5ed2b31d..e545470051 100644 --- a/indexer/osm_editor.hpp +++ b/indexer/osm_editor.hpp @@ -219,7 +219,7 @@ private: /// Notes to be sent to osm. shared_ptr<editor::Notes> m_notes; // Mutex which locks OnMapDeregistered method - mutex m_mapDeregisteredMtx; + mutex m_mapDeregisteredMutex; }; // class Editor string DebugPrint(Editor::FeatureStatus fs); |