diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2006-04-19 16:21:59 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2006-04-19 16:21:59 +0000 |
| commit | 770381e8f14f0dd8e5c8ed8f822b980cd70eb28f (patch) | |
| tree | c342a6346f6b59e8f1312840ca142357886468d9 /cppe/test/IceE/thread/MutexTest.cpp | |
| parent | removing client/server properties for IceSSL (diff) | |
| download | ice-770381e8f14f0dd8e5c8ed8f822b980cd70eb28f.tar.bz2 ice-770381e8f14f0dd8e5c8ed8f822b980cd70eb28f.tar.xz ice-770381e8f14f0dd8e5c8ed8f822b980cd70eb28f.zip | |
Added support for GCC 4.1
Diffstat (limited to 'cppe/test/IceE/thread/MutexTest.cpp')
| -rw-r--r-- | cppe/test/IceE/thread/MutexTest.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cppe/test/IceE/thread/MutexTest.cpp b/cppe/test/IceE/thread/MutexTest.cpp index e333ff788a8..17573b5382a 100644 --- a/cppe/test/IceE/thread/MutexTest.cpp +++ b/cppe/test/IceE/thread/MutexTest.cpp @@ -119,17 +119,17 @@ MutexTest::run() } Mutex::TryLock lock2(mutex); -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__linux) try { test(lock.tryAcquire() == false); } - catch(const IceUtil::ThreadSyscallException& ex) + catch(const IceUtil::ThreadLockedException&) { // - // 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 on Fedora Core 5. // - test(ex.error() == EDEADLK); } #else test(lock.tryAcquire() == false); |