diff options
| author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-08-05 07:40:52 +0000 |
|---|---|---|
| committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-08-05 07:40:52 +0000 |
| commit | c5924560b7e43eb17eb49ac9a78b3d8da7b35a53 (patch) | |
| tree | 2de0bdc530806b4fc9a0865b83cecb39402a5cfe | |
| parent | 8a61cbfb7f3f0248cd037407d048874169da2a76 (diff) | |
| download | ATCD-c5924560b7e43eb17eb49ac9a78b3d8da7b35a53.tar.gz | |
ChangeLogTag: Thu Aug 5 07:40:00 UTC 2010 Build CZar <buildczar at prismtech dot com>
Correct the syntax errors introduced by previous fix.
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_Thread.cpp | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 2a5066c1a6d..819dae97a2a 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Thu Aug 5 07:40:00 UTC 2010 Build CZar <buildczar at prismtech dot com> + + * ace/OS_NS_Thread.cpp: + Add the missing ; to the lines added by the fix below. + Wed Aug 4 14:16:46 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + Wed Aug 4 17:21:17 UTC 2010 Chris Cleeland <cleeland@ociweb.com> * bin/MakeProjectCreator/config/crosscompile.mpb: diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp index 7ed66013f5e..ab957b43500 100644 --- a/ACE/ace/OS_NS_Thread.cpp +++ b/ACE/ace/OS_NS_Thread.cpp @@ -1151,7 +1151,7 @@ ACE_OS::cond_broadcast (ACE_cond_t *cv) // consistent relative to each other. if (ACE_OS::thread_mutex_lock (&cv->waiters_lock_) != 0) { - return -1 + return -1; } bool have_waiters = false; @@ -1169,7 +1169,7 @@ ACE_OS::cond_broadcast (ACE_cond_t *cv) if (ACE_OS::thread_mutex_unlock (&cv->waiters_lock_) != 0) { // This is really bad, we have the lock but can't release it anymore - return -1 + return -1; } int result = 0; @@ -1316,7 +1316,7 @@ ACE_OS::cond_signal (ACE_cond_t *cv) return -1; bool const have_waiters = cv->waiters_ > 0; if (ACE_OS::thread_mutex_unlock (&cv->waiters_lock_) != 0) - return -1 + return -1; if (have_waiters) return ACE_OS::sema_post (&cv->sema_); @@ -1341,7 +1341,7 @@ ACE_OS::cond_wait (ACE_cond_t *cv, ++cv->waiters_; if (ACE_OS::thread_mutex_unlock (&cv->waiters_lock_) != 0) - return -1 + return -1; int result = 0; @@ -1442,7 +1442,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, // Prevent race conditions on the <waiters_> count. if (ACE_OS::thread_mutex_lock (&cv->waiters_lock_) != 0) - return -1 + return -1; ++cv->waiters_; |