summaryrefslogtreecommitdiff
path: root/cppe/test/IceE/thread/StaticMutexTest.cpp
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2006-04-24 12:35:37 +0000
committerDwayne Boone <dwayne@zeroc.com>2006-04-24 12:35:37 +0000
commit9195cdf34bd084558bb1a196f0ea125e69de7df9 (patch)
treec0e37b67248b8c5c7118404003cfd65e285a9940 /cppe/test/IceE/thread/StaticMutexTest.cpp
parentComplete fix for bug 947 (diff)
downloadice-9195cdf34bd084558bb1a196f0ea125e69de7df9.tar.bz2
ice-9195cdf34bd084558bb1a196f0ea125e69de7df9.tar.xz
ice-9195cdf34bd084558bb1a196f0ea125e69de7df9.zip
Completed fix for bug 947
Diffstat (limited to 'cppe/test/IceE/thread/StaticMutexTest.cpp')
-rw-r--r--cppe/test/IceE/thread/StaticMutexTest.cpp8
1 files changed, 0 insertions, 8 deletions
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());