summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2015-11-27 09:34:53 +0100
committerMurray Cumming <murrayc@murrayc.com>2015-11-27 09:34:53 +0100
commit39b8521eac1ff12888042e8f37500cc53005cf90 (patch)
tree3502e46ac0542f353e76dd7507f6a12e33e6267d
parentdc9e30902a2f3377ef607deb92ced881c224550b (diff)
downloadglibmm-39b8521eac1ff12888042e8f37500cc53005cf90.tar.gz
Dispatcher: Use std::mutex instead of Glib::Threads::Mutex.
-rw-r--r--glib/glibmm/dispatcher.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/glib/glibmm/dispatcher.cc b/glib/glibmm/dispatcher.cc
index 3ab3a2f5..198d5253 100644
--- a/glib/glibmm/dispatcher.cc
+++ b/glib/glibmm/dispatcher.cc
@@ -151,7 +151,7 @@ private:
long ref_count_;
Glib::RefPtr<MainContext> context_;
#ifdef G_OS_WIN32
- Glib::Threads::Mutex mutex_;
+ std::mutex mutex_;
std::list<DispatchNotifyData> notify_queue_;
HANDLE fd_receiver_;
#else
@@ -329,7 +329,7 @@ void DispatchNotifier::send_notification(Dispatcher* dispatcher)
{
#ifdef G_OS_WIN32
{
- const Threads::Mutex::Lock lock (mutex_);
+ const std::lock_guard<std::mutex> lock (mutex_);
const bool was_empty = notify_queue_.empty();
notify_queue_.push_back(DispatchNotifyData(dispatcher, this));
@@ -389,7 +389,7 @@ bool DispatchNotifier::pipe_io_handler(Glib::IOCondition)
#ifdef G_OS_WIN32
{
- const Threads::Mutex::Lock lock (mutex_);
+ const std::lock_guard<std::mutex> lock (mutex_);
// Should never be empty at this point, but let's allow for bogus
// notifications with no data available anyway; just to be safe.