diff options
Diffstat (limited to 'cppe')
| -rw-r--r-- | cppe/test/IceE/thread/MutexTest.cpp | 8 | ||||
| -rw-r--r-- | cppe/test/IceE/thread/StaticMutexTest.cpp | 8 |
2 files changed, 0 insertions, 16 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()); diff --git a/cppe/test/IceE/thread/StaticMutexTest.cpp b/cppe/test/IceE/thread/StaticMutexTest.cpp index 8b265330cbb..6e37bbb19d0 100644 --- a/cppe/test/IceE/thread/StaticMutexTest.cpp +++ b/cppe/test/IceE/thread/StaticMutexTest.cpp @@ -123,21 +123,13 @@ StaticMutexTest::run() // Under WinCE tryAcquire() does not do recursion checks. // #ifndef _WIN32_WCE -#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 Fedora Core 5. - // } -#else - test(lock.tryAcquire() == false); -#endif lock2.release(); test(lock.tryAcquire() == true); test(lock.acquired()); |