summaryrefslogtreecommitdiff
path: root/cppe/test/IceE/thread/MonitorMutexTest.cpp
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2006-04-19 16:21:59 +0000
committerDwayne Boone <dwayne@zeroc.com>2006-04-19 16:21:59 +0000
commit770381e8f14f0dd8e5c8ed8f822b980cd70eb28f (patch)
treec342a6346f6b59e8f1312840ca142357886468d9 /cppe/test/IceE/thread/MonitorMutexTest.cpp
parentremoving client/server properties for IceSSL (diff)
downloadice-770381e8f14f0dd8e5c8ed8f822b980cd70eb28f.tar.bz2
ice-770381e8f14f0dd8e5c8ed8f822b980cd70eb28f.tar.xz
ice-770381e8f14f0dd8e5c8ed8f822b980cd70eb28f.zip
Added support for GCC 4.1
Diffstat (limited to 'cppe/test/IceE/thread/MonitorMutexTest.cpp')
-rw-r--r--cppe/test/IceE/thread/MonitorMutexTest.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/cppe/test/IceE/thread/MonitorMutexTest.cpp b/cppe/test/IceE/thread/MonitorMutexTest.cpp
index 6d12a4f0981..3bbd50e7b97 100644
--- a/cppe/test/IceE/thread/MonitorMutexTest.cpp
+++ b/cppe/test/IceE/thread/MonitorMutexTest.cpp
@@ -108,8 +108,14 @@ MonitorMutexTest::run()
{
Monitor<Mutex>::Lock lock(monitor);
- Monitor<Mutex>::TryLock tlock(monitor);
- test(!tlock.acquired());
+ try
+ {
+ Monitor<Mutex>::TryLock tlock(monitor);
+ test(!tlock.acquired());
+ }
+ catch(const ThreadLockedException&)
+ {
+ }
// TEST: Start thread, try to acquire the mutex.
t = new MonitorMutexTestThread(monitor);