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 /cpp/test/IceUtil/thread/StaticMutexTest.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 'cpp/test/IceUtil/thread/StaticMutexTest.cpp')
| -rw-r--r-- | cpp/test/IceUtil/thread/StaticMutexTest.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/cpp/test/IceUtil/thread/StaticMutexTest.cpp b/cpp/test/IceUtil/thread/StaticMutexTest.cpp index a22fcb53f47..29d481630b9 100644 --- a/cpp/test/IceUtil/thread/StaticMutexTest.cpp +++ b/cpp/test/IceUtil/thread/StaticMutexTest.cpp @@ -118,21 +118,13 @@ StaticMutexTest::run() } StaticMutex::TryLock lock2(staticMutex); -#if defined(__FreeBSD__) || defined(__linux) try { test(lock.tryAcquire() == false); } catch(const IceUtil::ThreadLockedException& ex) { - // - // pthread_mutex_trylock returns EDEADLK in FreeBSD's new threading implementation - // as well as in Fedora Core 5. - // } -#else - test(lock.tryAcquire() == false); -#endif lock2.release(); test(lock.tryAcquire() == true); test(lock.acquired()); |