summaryrefslogtreecommitdiff
path: root/cpp/test/IceGrid/activation/AllTests.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2017-01-11 16:15:49 -0500
committerBernard Normier <bernard@zeroc.com>2017-01-11 16:15:49 -0500
commitf6a5299766fe3db2273afd78f145486b091513ed (patch)
tree87eead6b9fa33e43f7b863093fd410167d9cb23a /cpp/test/IceGrid/activation/AllTests.cpp
parentFixed Glacier2/router IE browser test failure (diff)
downloadice-f6a5299766fe3db2273afd78f145486b091513ed.tar.bz2
ice-f6a5299766fe3db2273afd78f145486b091513ed.tar.xz
ice-f6a5299766fe3db2273afd78f145486b091513ed.zip
Moved UniquePtr to IceInternal
Removed ctor and assignment operator from UniquePtr
Diffstat (limited to 'cpp/test/IceGrid/activation/AllTests.cpp')
-rw-r--r--cpp/test/IceGrid/activation/AllTests.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/test/IceGrid/activation/AllTests.cpp b/cpp/test/IceGrid/activation/AllTests.cpp
index 8176830298e..8892c284746 100644
--- a/cpp/test/IceGrid/activation/AllTests.cpp
+++ b/cpp/test/IceGrid/activation/AllTests.cpp
@@ -79,7 +79,7 @@ public:
private:
Ice::ObjectPrx _proxy;
- IceUtil::UniquePtr<Ice::LocalException> _exception;
+ IceInternal::UniquePtr<Ice::LocalException> _exception;
bool _finished;
int _nRepetitions;
};
@@ -414,7 +414,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
}
for(p = threads.begin(); p != threads.end(); ++p)
{
- IceUtil::UniquePtr<Ice::LocalException> ex((*p)->waitUntilFinished());
+ IceInternal::UniquePtr<Ice::LocalException> ex((*p)->waitUntilFinished());
test(dynamic_cast<Ice::NoEndpointException*>(ex.get()));
}
threads.resize(0);
@@ -430,7 +430,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
}
for(p = threads.begin(); p != threads.end(); ++p)
{
- IceUtil::UniquePtr<Ice::LocalException> ex((*p)->waitUntilFinished());
+ IceInternal::UniquePtr<Ice::LocalException> ex((*p)->waitUntilFinished());
test(dynamic_cast<Ice::NoEndpointException*>(ex.get()));
}
threads.resize(0);
@@ -446,7 +446,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
}
for(p = threads.begin(); p != threads.end(); ++p)
{
- IceUtil::UniquePtr<Ice::LocalException> ex((*p)->waitUntilFinished());
+ IceInternal::UniquePtr<Ice::LocalException> ex((*p)->waitUntilFinished());
test(dynamic_cast<Ice::NoEndpointException*>(ex.get()));
}
threads.resize(0);
@@ -499,7 +499,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
}
for(p = threads.begin(); p != threads.end(); ++p)
{
- IceUtil::UniquePtr<Ice::LocalException> ex((*p)->waitUntilFinished());
+ IceInternal::UniquePtr<Ice::LocalException> ex((*p)->waitUntilFinished());
test(dynamic_cast<Ice::NoEndpointException*>(ex.get()));
}
admin->stopServer("server-activation-timeout");