diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-09-01 10:31:09 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-09-01 10:31:09 +0100 |
| commit | 4685843ba4194d8b59ed6eb1335ae27052178726 (patch) | |
| tree | cbed9c6712b2dfa9d7c155751dad4b2908d21092 /src/lib/server_finder.cc | |
| parent | c5c005aec1393fc606db035ee71b8d831c370ab1 (diff) | |
Fix duplicate name of _mutex in ExceptionStore and some of its children.
Diffstat (limited to 'src/lib/server_finder.cc')
| -rw-r--r-- | src/lib/server_finder.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/server_finder.cc b/src/lib/server_finder.cc index 1727016e6..315d8d79d 100644 --- a/src/lib/server_finder.cc +++ b/src/lib/server_finder.cc @@ -168,7 +168,7 @@ ServerFinder::handle_accept (boost::system::error_code ec, shared_ptr<Socket> so if (!server_found (ip) && xml->optional_number_child<int>("Version").get_value_or (0) == SERVER_LINK_VERSION) { ServerDescription sd (ip, xml->number_child<int> ("Threads")); { - boost::mutex::scoped_lock lm (_mutex); + boost::mutex::scoped_lock lm (_servers_mutex); _servers.push_back (sd); } emit (boost::bind (boost::ref (ServersListChanged))); @@ -180,7 +180,7 @@ ServerFinder::handle_accept (boost::system::error_code ec, shared_ptr<Socket> so bool ServerFinder::server_found (string ip) const { - boost::mutex::scoped_lock lm (_mutex); + boost::mutex::scoped_lock lm (_servers_mutex); list<ServerDescription>::const_iterator i = _servers.begin(); while (i != _servers.end() && i->host_name() != ip) { ++i; @@ -209,7 +209,7 @@ ServerFinder::drop () list<ServerDescription> ServerFinder::servers () const { - boost::mutex::scoped_lock lm (_mutex); + boost::mutex::scoped_lock lm (_servers_mutex); return _servers; } @@ -218,7 +218,7 @@ ServerFinder::config_changed (Config::Property what) { if (what == Config::USE_ANY_SERVERS || what == Config::SERVERS) { { - boost::mutex::scoped_lock lm (_mutex); + boost::mutex::scoped_lock lm (_servers_mutex); _servers.clear (); } ServersListChanged (); |