From 3547772c2f2424e6b3f7d4b7414e939947e7c3f4 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 31 May 2011 16:17:36 +0200 Subject: [PATCH 1/1] Cosmetics: declare condition_t as friend of mutex_t. --- synchro.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/synchro.h b/synchro.h index 7b04f92..a2e86f3 100644 --- a/synchro.h +++ b/synchro.h @@ -9,10 +9,11 @@ public: ~mutex_t() { xbt_mutex_destroy(mutex); } void acquire() { xbt_mutex_acquire(mutex); } void release() { xbt_mutex_release(mutex); } - xbt_mutex_t get() { return mutex; } private: xbt_mutex_t mutex; + + friend class condition_t; }; class condition_t { @@ -21,9 +22,9 @@ public: ~condition_t() { xbt_cond_destroy(cond); } void broadcast() { xbt_cond_broadcast(cond); } void signal() { xbt_cond_signal(cond); } - void wait(mutex_t& mutex) { xbt_cond_wait(cond, mutex.get()); } + void wait(mutex_t& mutex) { xbt_cond_wait(cond, mutex.mutex); } void timedwait(mutex_t& mutex, double delay) { - xbt_cond_timedwait(cond, mutex.get(), delay); + xbt_cond_timedwait(cond, mutex.mutex, delay); } private: -- 2.39.5