summaryrefslogtreecommitdiff
path: root/cpp/test/IceUtil/thread/StaticMutexTest.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/test/IceUtil/thread/StaticMutexTest.cpp')
-rw-r--r--cpp/test/IceUtil/thread/StaticMutexTest.cpp8
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());