diff options
Diffstat (limited to 'ACE')
| -rw-r--r-- | ACE/ChangeLog | 13 | ||||
| -rw-r--r-- | ACE/THANKS | 1 | ||||
| -rw-r--r-- | ACE/ace/Condition_T.cpp | 6 | ||||
| -rw-r--r-- | ACE/tests/Recursive_Condition_Test.cpp | 5 |
4 files changed, 20 insertions, 5 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index c76a6341f57..57ed1c5b39a 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,16 @@ +Sun Feb 21 16:28:47 UTC 2010 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * tests/Recursive_Condition_Test.cpp: Revised this test so that it + actually uses the ACE_Condition<> template, like it says in the + comments.. + +Sun Feb 21 16:20:35 UTC 2010 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/Condition_T.cpp (ACE_Condition<MUTEX>::wait): Changed the + call to mutex_.lock_ to mutex_.mutex() since lock_ is protected. + Thanks to Nick Meyer <nick dot meyer at sensis dot com> for + reporting this. + Sun Feb 21 09:24:38 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> * ChangeLogs/*: diff --git a/ACE/THANKS b/ACE/THANKS index 2d7ed2417a4..1542b91396b 100644 --- a/ACE/THANKS +++ b/ACE/THANKS @@ -2317,6 +2317,7 @@ Andrew Kaplan <alexande dot kaplan at tafcorp dot com> Alexander Mintz <alexande dot mintz at tafcorp dot com> Jennifer Kahng <jennifer dot kahng at lmco dot com> Trent Nadeau <Trent dot Nadeau at ngc dot com> +Nick Meyer <nick dot meyer at sensis dot com> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile diff --git a/ACE/ace/Condition_T.cpp b/ACE/ace/Condition_T.cpp index bc63d7411f2..7c97ac77765 100644 --- a/ACE/ace/Condition_T.cpp +++ b/ACE/ace/Condition_T.cpp @@ -87,7 +87,7 @@ ACE_Condition<MUTEX>::wait (void) { // ACE_TRACE ("ACE_Condition<MUTEX>::wait"); return ACE_OS::cond_wait (&this->cond_, - &this->mutex_.lock_); + &this->mutex_.mutex ()); } template <class MUTEX> int @@ -97,12 +97,12 @@ ACE_Condition<MUTEX>::wait (MUTEX &mutex, // ACE_TRACE ("ACE_Condition<MUTEX>::wait"); if (abstime == 0) return ACE_OS::cond_wait (&this->cond_, - &mutex.lock_); + &mutex.mutex ()); else { ACE_Time_Value tv = *abstime; return ACE_OS::cond_timedwait (&this->cond_, - &mutex.lock_, + &mutex.mutex (), &tv); } } diff --git a/ACE/tests/Recursive_Condition_Test.cpp b/ACE/tests/Recursive_Condition_Test.cpp index 6786b478681..e0e97c2b33c 100644 --- a/ACE/tests/Recursive_Condition_Test.cpp +++ b/ACE/tests/Recursive_Condition_Test.cpp @@ -68,8 +68,9 @@ private: // These are for the basic functionality tests. ACE_SYNCH_RECURSIVE_MUTEX mutex_; -ACE_SYNCH_RECURSIVE_CONDITION condition_(mutex_); -// Test driver sets this to non-zero before spawning and to zero for waiter. +ACE_Condition<ACE_SYNCH_RECURSIVE_MUTEX> condition_ (mutex_); +// Test driver sets this to non-zero before spawning and to zero for +// waiter. int protected_int = 0; static ACE_THR_FUNC_RETURN |