summaryrefslogtreecommitdiff
path: root/cppe/test/IceE/thread/AliveTest.cpp
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2005-07-06 13:08:23 +0000
committerDwayne Boone <dwayne@zeroc.com>2005-07-06 13:08:23 +0000
commit3030ac8c355435c4426c82019669c476f5c76088 (patch)
treec57f7c0a983c44847f93285f0676df49f21707b9 /cppe/test/IceE/thread/AliveTest.cpp
parentUse direct proxy for process object instead of indirect proxy (diff)
downloadice-3030ac8c355435c4426c82019669c476f5c76088.tar.bz2
ice-3030ac8c355435c4426c82019669c476f5c76088.tar.xz
ice-3030ac8c355435c4426c82019669c476f5c76088.zip
Renamed namespace back to Ice
Diffstat (limited to 'cppe/test/IceE/thread/AliveTest.cpp')
-rw-r--r--cppe/test/IceE/thread/AliveTest.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/cppe/test/IceE/thread/AliveTest.cpp b/cppe/test/IceE/thread/AliveTest.cpp
index b6ef24a42af..15a878e3a36 100644
--- a/cppe/test/IceE/thread/AliveTest.cpp
+++ b/cppe/test/IceE/thread/AliveTest.cpp
@@ -12,11 +12,11 @@
#include <TestCommon.h>
using namespace std;
-using namespace IceE;
+using namespace Ice;
static const string createTestName("thread alive");
-class CondVar : public IceE::Monitor<IceE::RecMutex>
+class CondVar : public Ice::Monitor<Ice::RecMutex>
{
public:
@@ -27,7 +27,7 @@ public:
void waitForSignal()
{
- IceE::Monitor<IceE::RecMutex>::Lock lock(*this);
+ Ice::Monitor<Ice::RecMutex>::Lock lock(*this);
while(!_done)
{
wait();
@@ -36,7 +36,7 @@ public:
void signal()
{
- IceE::Monitor<IceE::RecMutex>::Lock lock(*this);
+ Ice::Monitor<Ice::RecMutex>::Lock lock(*this);
_done = true;
notify();
}
@@ -62,7 +62,7 @@ public:
_childCreated.signal();
_parentReady.waitForSignal();
}
- catch(IceE::ThreadLockedException &)
+ catch(Ice::ThreadLockedException &)
{
}
}
@@ -90,7 +90,7 @@ AliveTest::run()
CondVar childCreated;
CondVar parentReady;
AliveTestThreadPtr t = new AliveTestThread(childCreated, parentReady);
- IceE::ThreadControl c = t->start();
+ Ice::ThreadControl c = t->start();
childCreated.waitForSignal();
test(c.isAlive());
parentReady.signal();