diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2006-04-24 12:35:37 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2006-04-24 12:35:37 +0000 |
| commit | 9195cdf34bd084558bb1a196f0ea125e69de7df9 (patch) | |
| tree | c0e37b67248b8c5c7118404003cfd65e285a9940 /cppe/test/IceE/thread/MutexTest.cpp | |
| parent | Complete fix for bug 947 (diff) | |
| download | ice-9195cdf34bd084558bb1a196f0ea125e69de7df9.tar.bz2 ice-9195cdf34bd084558bb1a196f0ea125e69de7df9.tar.xz ice-9195cdf34bd084558bb1a196f0ea125e69de7df9.zip | |
Completed fix for bug 947
Diffstat (limited to 'cppe/test/IceE/thread/MutexTest.cpp')
| -rw-r--r-- | cppe/test/IceE/thread/MutexTest.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/cppe/test/IceE/thread/MutexTest.cpp b/cppe/test/IceE/thread/MutexTest.cpp index 17573b5382a..be575d22d61 100644 --- a/cppe/test/IceE/thread/MutexTest.cpp +++ b/cppe/test/IceE/thread/MutexTest.cpp @@ -119,21 +119,13 @@ MutexTest::run() } Mutex::TryLock lock2(mutex); -#if defined(__FreeBSD__) || defined(__linux) try { test(lock.tryAcquire() == false); } catch(const IceUtil::ThreadLockedException&) { - // - // pthread_mutex_trylock returns EDEADLK in FreeBSD's new threading implementation - // as well as on Fedora Core 5. - // } -#else - test(lock.tryAcquire() == false); -#endif lock2.release(); test(lock.tryAcquire() == true); test(lock.acquired()); |