diff options
| author | nobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-06-16 18:17:52 +0000 |
|---|---|---|
| committer | nobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-06-16 18:17:52 +0000 |
| commit | b507b0691a35ea9b7192e65ea0e435847ce4fd1d (patch) | |
| tree | 09ed4da2c283288cb50b892d6b428fe74cce5b5f /ace/OS.cpp | |
| parent | b2e62a6ef510b4560a3b9f0d69de1f3df4da4d3e (diff) | |
| download | ATCD-ami_phase2_end.tar.gz | |
This commit was manufactured by cvs2svn to create tagami_phase2_end
'ami_phase2_end'.
Diffstat (limited to 'ace/OS.cpp')
| -rw-r--r-- | ace/OS.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ace/OS.cpp b/ace/OS.cpp index b5fef535e14..425bcad3dbf 100644 --- a/ace/OS.cpp +++ b/ace/OS.cpp @@ -5244,12 +5244,12 @@ ACE_OS::rwlock_init (ACE_rwlock_t *rw, if (result == -1) { - // Save/restore errno. - ACE_Errno_Guard error (errno); + int error = errno; ACE_OS::mutex_destroy (&rw->lock_); ACE_OS::cond_destroy (&rw->waiting_readers_); ACE_OS::cond_destroy (&rw->waiting_writers_); ACE_OS::cond_destroy (&rw->waiting_important_writer_); + errno = error; } return result; # else @@ -5498,7 +5498,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, ACE_OS::thread_mutex_unlock (&cv->waiters_lock_); int result = 0; - ACE_Errno_Guard error (errno, 0); + int error = 0; int msec_timeout; if (timeout->sec () == 0 && timeout->usec () == 0) @@ -5648,6 +5648,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, // occur because that's the guarantee that we give to our callers. ACE_OS::mutex_lock (external_mutex); + errno = error; return result; # endif /* ACE_HAS_WTHREADS || ACE_HAS_VXWORKS || ACE_PSOS */ # else |