summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-02-10 20:12:27 +0100
committerBenoit Foucher <benoit@zeroc.com>2017-02-10 20:12:27 +0100
commit13c51bb23397c3e6f36407086a59cd9673612ba9 (patch)
tree0d6a02b0ed8ebb601a61eccfbed9334a13f42fa8 /cpp
parentFixed build failure introduced with previous commit (diff)
downloadice-13c51bb23397c3e6f36407086a59cd9673612ba9.tar.bz2
ice-13c51bb23397c3e6f36407086a59cd9673612ba9.tar.xz
ice-13c51bb23397c3e6f36407086a59cd9673612ba9.zip
Another fix for the IceGrid/activation test
Diffstat (limited to '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 f526991f835..9efc046806d 100644
--- a/cpp/test/IceGrid/activation/AllTests.cpp
+++ b/cpp/test/IceGrid/activation/AllTests.cpp
@@ -257,7 +257,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
cout << "testing server disable... " << flush;
try
{
- int count = query->findAllObjectsByType("Test").size();
+ size_t count = query->findAllObjectsByType("Test").size();
test(admin->getServerState("server") == IceGrid::Inactive);
admin->enableServer("server", false);
@@ -270,7 +270,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
{
}
- test(static_cast<int>(query->findAllObjectsByType("Test").size()) == count - 1);
+ test(query->findAllObjectsByType("Test").size() == count - 1);
try
{
@@ -301,7 +301,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
{
}
test(admin->getServerState("server-manual") == IceGrid::Inactive);
- test(static_cast<int>(query->findAllObjectsByType("Test").size()) == count - 2);
+ test(query->findAllObjectsByType("Test").size() == count - 2);
test(admin->getServerState("server-always") == IceGrid::Active);
admin->enableServer("server-always", false);
@@ -324,7 +324,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
{
}
test(admin->getServerState("server-always") == IceGrid::Inactive);
- test(static_cast<int>(query->findAllObjectsByType("Test").size()) == count - 3);
+ test(query->findAllObjectsByType("Test").size() == count - 3);
test(admin->getServerState("server") == IceGrid::Inactive);
admin->enableServer("server", true);
@@ -346,7 +346,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
admin->stopServer("server");
test(admin->getServerState("server") == IceGrid::Inactive);
- test(static_cast<int>(query->findAllObjectsByType("Test").size()) == count - 2);
+ test(query->findAllObjectsByType("Test").size() == count - 2);
}
catch(const Ice::LocalException& ex)
{