diff options
Diffstat (limited to 'cpp/test/IceGrid/update')
| -rw-r--r-- | cpp/test/IceGrid/update/AllTests.cpp | 18 | ||||
| -rw-r--r-- | cpp/test/IceGrid/update/Server.cpp | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/cpp/test/IceGrid/update/AllTests.cpp b/cpp/test/IceGrid/update/AllTests.cpp index 9512d42b4c3..67653d1252c 100644 --- a/cpp/test/IceGrid/update/AllTests.cpp +++ b/cpp/test/IceGrid/update/AllTests.cpp @@ -106,7 +106,7 @@ allTests(const Ice::CommunicatorPtr& communicator) adapter.serverLifetime = false; addProperty(server, "Server.Endpoints", "default"); ObjectDescriptor object; - object.id = communicator->stringToIdentity("test"); + object.id = Ice::stringToIdentity("test"); object.type = "::Test::TestIntf"; adapter.objects.push_back(object); server->adapters.push_back(adapter); @@ -145,7 +145,7 @@ allTests(const Ice::CommunicatorPtr& communicator) test(false); } - update.nodes[0].servers[0]->adapters[0].objects[0].id = communicator->stringToIdentity("test2"); + update.nodes[0].servers[0]->adapters[0].objects[0].id = Ice::stringToIdentity("test2"); try { admin->updateApplication(update); @@ -173,7 +173,7 @@ allTests(const Ice::CommunicatorPtr& communicator) adapter.serverLifetime = false; addProperty(server, "Server.Endpoints", "default"); object = ObjectDescriptor(); - object.id = communicator->stringToIdentity("${server}"); + object.id = Ice::stringToIdentity("${server}"); object.type = "::Test::TestIntf"; adapter.objects.push_back(object); server->adapters.push_back(adapter); @@ -400,7 +400,7 @@ allTests(const Ice::CommunicatorPtr& communicator) adapter.serverLifetime = false; adapter.registerProcess = false; object = ObjectDescriptor(); - object.id = communicator->stringToIdentity("test"); + object.id = Ice::stringToIdentity("test"); adapter.objects.push_back(object); info.descriptor->adapters.push_back(adapter); update = empty; @@ -423,7 +423,7 @@ allTests(const Ice::CommunicatorPtr& communicator) info = admin->getServerInfo("Server"); test(info.descriptor); object = ObjectDescriptor(); - object.id = communicator->stringToIdentity("test"); + object.id = Ice::stringToIdentity("test"); info.descriptor->adapters[0].objects.push_back(object); update = empty; update.nodes[0].servers.push_back(info.descriptor); @@ -445,7 +445,7 @@ allTests(const Ice::CommunicatorPtr& communicator) info = admin->getServerInfo("Server"); test(info.descriptor); object = ObjectDescriptor(); - object.id = communicator->stringToIdentity("test1"); + object.id = Ice::stringToIdentity("test1"); info.descriptor->adapters[0].allocatables.push_back(object); update = empty; update.nodes[0].servers.push_back(info.descriptor); @@ -463,7 +463,7 @@ allTests(const Ice::CommunicatorPtr& communicator) info = admin->getServerInfo("Server"); test(info.descriptor); object = ObjectDescriptor(); - object.id = communicator->stringToIdentity("test1"); + object.id = Ice::stringToIdentity("test1"); info.descriptor->adapters[0].allocatables.push_back(object); update = empty; update.nodes[0].servers.push_back(info.descriptor); @@ -485,7 +485,7 @@ allTests(const Ice::CommunicatorPtr& communicator) info = admin->getServerInfo("Server"); test(info.descriptor); object = ObjectDescriptor(); - object.id = communicator->stringToIdentity("test"); + object.id = Ice::stringToIdentity("test"); info.descriptor->adapters[0].allocatables.push_back(object); update = empty; update.nodes[0].servers.push_back(info.descriptor); @@ -503,7 +503,7 @@ allTests(const Ice::CommunicatorPtr& communicator) info = admin->getServerInfo("Server"); test(info.descriptor); object = ObjectDescriptor(); - object.id = communicator->stringToIdentity("test"); + object.id = Ice::stringToIdentity("test"); info.descriptor->adapters[0].allocatables.push_back(object); update = empty; update.nodes[0].servers.push_back(info.descriptor); diff --git a/cpp/test/IceGrid/update/Server.cpp b/cpp/test/IceGrid/update/Server.cpp index 2d7f88df87d..c86e876bbf9 100644 --- a/cpp/test/IceGrid/update/Server.cpp +++ b/cpp/test/IceGrid/update/Server.cpp @@ -33,7 +33,7 @@ Server::run(int argc, char* argv[]) Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Server"); Ice::ObjectPtr object = new TestI(properties); - adapter->add(object, communicator()->stringToIdentity(name)); + adapter->add(object, Ice::stringToIdentity(name)); shutdownOnInterrupt(); try |