diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2006-04-19 00:30:06 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2006-04-19 00:30:06 +0000 |
| commit | 5fe818e133abbf3feee85ba8dd726c71861f2cdc (patch) | |
| tree | 86ee705e94bac8a2e7ab9d7de1511b6e818b1244 /cpp/test/IceUtil/thread/StaticMutexTest.cpp | |
| parent | fixing copyright (diff) | |
| download | ice-5fe818e133abbf3feee85ba8dd726c71861f2cdc.tar.bz2 ice-5fe818e133abbf3feee85ba8dd726c71861f2cdc.tar.xz ice-5fe818e133abbf3feee85ba8dd726c71861f2cdc.zip | |
Fix for FC5
Diffstat (limited to 'cpp/test/IceUtil/thread/StaticMutexTest.cpp')
| -rw-r--r-- | cpp/test/IceUtil/thread/StaticMutexTest.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/test/IceUtil/thread/StaticMutexTest.cpp b/cpp/test/IceUtil/thread/StaticMutexTest.cpp index 4bf1174eb7e..a22fcb53f47 100644 --- a/cpp/test/IceUtil/thread/StaticMutexTest.cpp +++ b/cpp/test/IceUtil/thread/StaticMutexTest.cpp @@ -118,17 +118,17 @@ StaticMutexTest::run() } StaticMutex::TryLock lock2(staticMutex); -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__linux) try { test(lock.tryAcquire() == false); } - catch(const IceUtil::ThreadSyscallException& ex) + catch(const IceUtil::ThreadLockedException& ex) { // - // pthread_mutex_trylock returns EDEADLK in FreeBSD's new threading implementation. + // pthread_mutex_trylock returns EDEADLK in FreeBSD's new threading implementation + // as well as in Fedora Core 5. // - test(ex.error() == EDEADLK); } #else test(lock.tryAcquire() == false); |