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

review changes

Browse source
This commit is contained in:
Arsentiy Milchakov 2016-07-05 13:14:46 +03:00
parent fb87588b3e
commit 00c41b1753
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
indexer/osm_editor.cpp
View file

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

2
indexer/osm_editor.hpp
View file

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