summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-05-23 17:40:03 +0100
committerCarl Hetherington <cth@carlh.net>2015-05-23 17:40:03 +0100
commitd5b1891594278bc6f609f9acc06b200a98103fd8 (patch)
tree7062443bf32c4aa8e6ccd88ff2b8a20a81b8b562 /src
parent689cbe443f7ed48c2306f4e9feacb0c30bc2ea4b (diff)
Rename mutex to avoid confusion.
Diffstat (limited to 'src')
-rw-r--r--src/lib/signaller.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/signaller.h b/src/lib/signaller.h
index 4ef9b38b3..661a171ec 100644
--- a/src/lib/signaller.h
+++ b/src/lib/signaller.h
@@ -89,7 +89,7 @@ class Signaller
public:
/* Can be called from any thread */
virtual ~Signaller () {
- boost::mutex::scoped_lock lm (_mutex);
+ boost::mutex::scoped_lock lm (_signaller_mutex);
for (std::list<WrapperBase*>::iterator i = _wrappers.begin(); i != _wrappers.end(); ++i) {
(*i)->invalidate ();
}
@@ -104,7 +104,7 @@ public:
signal_manager->emit (boost::bind (&Wrapper<T>::signal, w));
}
- boost::mutex::scoped_lock lm (_mutex);
+ boost::mutex::scoped_lock lm (_signaller_mutex);
/* Clean up finished Wrappers */
std::list<WrapperBase*>::iterator i = _wrappers.begin ();
@@ -124,7 +124,7 @@ public:
private:
/* Protect _wrappers */
- boost::mutex _mutex;
+ boost::mutex _signaller_mutex;
std::list<WrapperBase*> _wrappers;
};