[glibmm] Dispatcher: Use std::mutex instead of Glib::Threads::Mutex.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] Dispatcher: Use std::mutex instead of Glib::Threads::Mutex.
- Date: Fri, 27 Nov 2015 08:36:12 +0000 (UTC)
commit 39b8521eac1ff12888042e8f37500cc53005cf90
Author: Murray Cumming <murrayc murrayc com>
Date: Fri Nov 27 09:34:53 2015 +0100
Dispatcher: Use std::mutex instead of Glib::Threads::Mutex.
glib/glibmm/dispatcher.cc | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/glib/glibmm/dispatcher.cc b/glib/glibmm/dispatcher.cc
index 3ab3a2f..198d525 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.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]