summaryrefslogtreecommitdiff
path: root/libs/pbd/pbd/signals.h
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2012-07-24 21:43:05 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2012-07-24 21:43:05 +0000
commit1cdf02ae2f3515857880c45be3e22274d281c2cf (patch)
treeb39682a801c37aa76c2e0771078aa759709af354 /libs/pbd/pbd/signals.h
parente284a533492de02366f70e608b8dfbd04a3dbcaf (diff)
remove use of boost::thread/boost::mutex; bump glibmm requirement to 2.30 in order to pick up Glib::Threads::Mutex which can be used statically, use that to replace boost::mutex; add required inclusion of <cerrno> in a couple of places
git-svn-id: svn://localhost/ardour2/branches/3.0@13076 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/pbd/pbd/signals.h')
-rw-r--r--libs/pbd/pbd/signals.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/libs/pbd/pbd/signals.h b/libs/pbd/pbd/signals.h
index dc53b31f94..69c52f57cf 100644
--- a/libs/pbd/pbd/signals.h
+++ b/libs/pbd/pbd/signals.h
@@ -21,13 +21,13 @@
#define __pbd_signals_h__
#include <list>
-#include <glibmm/thread.h>
+#include <map>
+#include <glibmm/threads.h>
#include <boost/noncopyable.hpp>
#include <boost/bind.hpp>
#include <boost/bind/protect.hpp>
#include <boost/function.hpp>
-#include <boost/thread/mutex.hpp>
#include <boost/enable_shared_from_this.hpp>
#include <boost/optional.hpp>
@@ -44,7 +44,7 @@ public:
virtual void disconnect (boost::shared_ptr<Connection>) = 0;
protected:
- boost::mutex _mutex;
+ Glib::Threads::Mutex _mutex;
};
class Connection : public boost::enable_shared_from_this<Connection>
@@ -54,7 +54,7 @@ public:
void disconnect ()
{
- boost::mutex::scoped_lock lm (_mutex);
+ Glib::Threads::Mutex::Lock lm (_mutex);
if (_signal) {
_signal->disconnect (shared_from_this ());
_signal = 0;
@@ -63,12 +63,12 @@ public:
void signal_going_away ()
{
- boost::mutex::scoped_lock lm (_mutex);
+ Glib::Threads::Mutex::Lock lm (_mutex);
_signal = 0;
}
private:
- boost::mutex _mutex;
+ Glib::Threads::Mutex _mutex;
SignalBase* _signal;
};
@@ -147,7 +147,7 @@ class ScopedConnectionList : public boost::noncopyable
one from another.
*/
- Glib::Mutex _lock;
+ Glib::Threads::Mutex _lock;
typedef std::list<ScopedConnection*> ConnectionList;
ConnectionList _list;