[glibmm] Dispatcher: Fix the build on win32.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] Dispatcher: Fix the build on win32.
- Date: Mon, 30 Jan 2012 10:57:14 +0000 (UTC)
commit 2e36b3288f2e6b144bd9505b7e99c4480f64ee88
Author: TS <t sailer alumni ethz ch>
Date: Mon Jan 30 11:56:56 2012 +0100
Dispatcher: Fix the build on win32.
* glib/glibmm/dispatcher.cc: Mention the new Threads:: namespace in the
ifdefed win32 code.
ChangeLog | 7 +++++++
glib/glibmm/dispatcher.cc | 6 +++---
2 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index fc23bd8..730a080 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-01-30 TS <t sailer alumni ethz ch>
+
+ Dispatcher: Fix the build on win32.
+
+ * glib/glibmm/dispatcher.cc: Mention the new Threads:: namespace in the
+ ifdefed win32 code.
+
2011-12-08 Haikel Guemar <karlthered gmail com>
thread.h: Move calls to deprecated glib functions into thread.cc.
diff --git a/glib/glibmm/dispatcher.cc b/glib/glibmm/dispatcher.cc
index 4640236..dcb3b2c 100644
--- a/glib/glibmm/dispatcher.cc
+++ b/glib/glibmm/dispatcher.cc
@@ -142,7 +142,7 @@ private:
long ref_count_;
Glib::RefPtr<MainContext> context_;
#ifdef G_OS_WIN32
- Glib::Mutex mutex_;
+ Glib::Threads::Mutex mutex_;
std::list<DispatchNotifyData> notify_queue_;
HANDLE fd_receiver_;
#else
@@ -289,7 +289,7 @@ void DispatchNotifier::send_notification(Dispatcher* dispatcher)
{
#ifdef G_OS_WIN32
{
- const Mutex::Lock lock (mutex_);
+ const Threads::Mutex::Lock lock (mutex_);
const bool was_empty = notify_queue_.empty();
notify_queue_.push_back(DispatchNotifyData(dispatcher, this));
@@ -337,7 +337,7 @@ bool DispatchNotifier::pipe_io_handler(Glib::IOCondition)
#ifdef G_OS_WIN32
{
- const Mutex::Lock lock (mutex_);
+ const Threads::Mutex::Lock 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]