diff options
Diffstat (limited to 'cpp/test/Ice')
68 files changed, 145 insertions, 147 deletions
diff --git a/cpp/test/Ice/acm/Server.cpp b/cpp/test/Ice/acm/Server.cpp index 4797c8607c2..d2af92e45f8 100644 --- a/cpp/test/Ice/acm/Server.cpp +++ b/cpp/test/Ice/acm/Server.cpp @@ -21,7 +21,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); communicator->getProperties()->setProperty("TestAdapter.ACM.Timeout", "0"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - Ice::Identity id = communicator->stringToIdentity("communicator"); + Ice::Identity id = Ice::stringToIdentity("communicator"); adapter->add(ICE_MAKE_SHARED(RemoteCommunicatorI), id); adapter->activate(); diff --git a/cpp/test/Ice/acm/TestI.cpp b/cpp/test/Ice/acm/TestI.cpp index 42e0f119cd1..98f07a1b93a 100644 --- a/cpp/test/Ice/acm/TestI.cpp +++ b/cpp/test/Ice/acm/TestI.cpp @@ -104,7 +104,7 @@ RemoteCommunicatorI::shutdown(const Ice::Current& current) RemoteObjectAdapterI::RemoteObjectAdapterI(const Ice::ObjectAdapterPtr& adapter) : _adapter(adapter), _testIntf(ICE_UNCHECKED_CAST(TestIntfPrx, _adapter->add(ICE_MAKE_SHARED(TestI), - adapter->getCommunicator()->stringToIdentity("test")))) + stringToIdentity("test")))) { _adapter->activate(); } diff --git a/cpp/test/Ice/admin/AllTests.cpp b/cpp/test/Ice/admin/AllTests.cpp index da880fc0ced..bbe87980315 100644 --- a/cpp/test/Ice/admin/AllTests.cpp +++ b/cpp/test/Ice/admin/AllTests.cpp @@ -225,7 +225,7 @@ allTests(const Ice::CommunicatorPtr& communicator) Ice::CommunicatorPtr com = Ice::initialize(init); test(!com->getAdmin()); - Ice::Identity id = com->stringToIdentity("test-admin"); + Ice::Identity id = stringToIdentity("test-admin"); try { com->createAdmin(0, id); diff --git a/cpp/test/Ice/admin/Server.cpp b/cpp/test/Ice/admin/Server.cpp index 57157d58363..c18d954e2ef 100644 --- a/cpp/test/Ice/admin/Server.cpp +++ b/cpp/test/Ice/admin/Server.cpp @@ -20,7 +20,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0) + " -t 10000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - Ice::Identity id = communicator->stringToIdentity("factory"); + Ice::Identity id = Ice::stringToIdentity("factory"); adapter->add(ICE_MAKE_SHARED(RemoteCommunicatorFactoryI), id); adapter->activate(); TEST_READY diff --git a/cpp/test/Ice/ami/Collocated.cpp b/cpp/test/Ice/ami/Collocated.cpp index 73396d57834..0f9abd96355 100644 --- a/cpp/test/Ice/ami/Collocated.cpp +++ b/cpp/test/Ice/ami/Collocated.cpp @@ -27,10 +27,10 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) TestIntfControllerIPtr testController = ICE_MAKE_SHARED(TestIntfControllerI, adapter); - adapter->add(ICE_MAKE_SHARED(TestIntfI), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(TestIntfI), Ice::stringToIdentity("test")); //adapter->activate(); // Collocated test doesn't need to activate the OA - adapter2->add(testController, communicator->stringToIdentity("testController")); + adapter2->add(testController, Ice::stringToIdentity("testController")); //adapter2->activate(); // Collocated test doesn't need to activate the OA void allTests(const Ice::CommunicatorPtr&, bool); diff --git a/cpp/test/Ice/ami/Server.cpp b/cpp/test/Ice/ami/Server.cpp index adf27fd04f2..7c0ebd03b42 100644 --- a/cpp/test/Ice/ami/Server.cpp +++ b/cpp/test/Ice/ami/Server.cpp @@ -27,10 +27,10 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) TestIntfControllerIPtr testController = ICE_MAKE_SHARED(TestIntfControllerI, adapter); - adapter->add(ICE_MAKE_SHARED(TestIntfI), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(TestIntfI), Ice::stringToIdentity("test")); adapter->activate(); - adapter2->add(testController, communicator->stringToIdentity("testController")); + adapter2->add(testController, Ice::stringToIdentity("testController")); adapter2->activate(); TEST_READY diff --git a/cpp/test/Ice/background/Server.cpp b/cpp/test/Ice/background/Server.cpp index 201b7610d5d..3f13ca8fbb3 100644 --- a/cpp/test/Ice/background/Server.cpp +++ b/cpp/test/Ice/background/Server.cpp @@ -31,7 +31,7 @@ public: { _controller->checkCallPause(current); Ice::CommunicatorPtr communicator = current.adapter->getCommunicator(); - response(current.adapter->createDirectProxy(communicator->stringToIdentity("dummy"))); + response(current.adapter->createDirectProxy(Ice::stringToIdentity("dummy"))); } virtual void @@ -51,7 +51,7 @@ public: { _controller->checkCallPause(current); Ice::CommunicatorPtr communicator = current.adapter->getCommunicator(); - response->ice_response(current.adapter->createDirectProxy(communicator->stringToIdentity("dummy"))); + response->ice_response(current.adapter->createDirectProxy(Ice::stringToIdentity("dummy"))); } virtual void @@ -132,12 +132,12 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) ConfigurationPtr configuration = plugin->getConfiguration(); BackgroundControllerIPtr backgroundController = ICE_MAKE_SHARED(BackgroundControllerI, adapter, configuration); - adapter->add(ICE_MAKE_SHARED(BackgroundI, backgroundController), communicator->stringToIdentity("background")); - adapter->add(ICE_MAKE_SHARED(LocatorI, backgroundController), communicator->stringToIdentity("locator")); - adapter->add(ICE_MAKE_SHARED(RouterI, backgroundController), communicator->stringToIdentity("router")); + adapter->add(ICE_MAKE_SHARED(BackgroundI, backgroundController), Ice::stringToIdentity("background")); + adapter->add(ICE_MAKE_SHARED(LocatorI, backgroundController), Ice::stringToIdentity("locator")); + adapter->add(ICE_MAKE_SHARED(RouterI, backgroundController), Ice::stringToIdentity("router")); adapter->activate(); - adapter2->add(backgroundController, communicator->stringToIdentity("backgroundController")); + adapter2->add(backgroundController, Ice::stringToIdentity("backgroundController")); adapter2->activate(); communicator->waitForShutdown(); diff --git a/cpp/test/Ice/binding/AllTests.cpp b/cpp/test/Ice/binding/AllTests.cpp index e2f8a0e24a4..7b840621ab2 100644 --- a/cpp/test/Ice/binding/AllTests.cpp +++ b/cpp/test/Ice/binding/AllTests.cpp @@ -987,7 +987,7 @@ allTests(const Ice::CommunicatorPtr& communicator) // Ensure the published endpoints are actually valid. On // Fedora, binding to "localhost" with IPv6 only works but // resolving localhost don't return the IPv6 adress. - Ice::ObjectPrxPtr prx = oa->createProxy(serverCommunicator->stringToIdentity("dummy")); + Ice::ObjectPrxPtr prx = oa->createProxy(Ice::stringToIdentity("dummy")); try { prx->ice_collocationOptimized(false)->ice_ping(); diff --git a/cpp/test/Ice/binding/Server.cpp b/cpp/test/Ice/binding/Server.cpp index 6e182cf26e4..431e7dfe3f2 100644 --- a/cpp/test/Ice/binding/Server.cpp +++ b/cpp/test/Ice/binding/Server.cpp @@ -20,7 +20,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0) + ":udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - Ice::Identity id = communicator->stringToIdentity("communicator"); + Ice::Identity id = Ice::stringToIdentity("communicator"); adapter->add(ICE_MAKE_SHARED(RemoteCommunicatorI), id); adapter->activate(); diff --git a/cpp/test/Ice/binding/TestI.cpp b/cpp/test/Ice/binding/TestI.cpp index 28c29b774c6..2f2904303c7 100644 --- a/cpp/test/Ice/binding/TestI.cpp +++ b/cpp/test/Ice/binding/TestI.cpp @@ -69,7 +69,7 @@ RemoteObjectAdapterI::RemoteObjectAdapterI(const Ice::ObjectAdapterPtr& adapter) _adapter(adapter), _testIntf(ICE_UNCHECKED_CAST(TestIntfPrx, _adapter->add(ICE_MAKE_SHARED(TestI), - adapter->getCommunicator()->stringToIdentity("test")))) + stringToIdentity("test")))) { _adapter->activate(); } diff --git a/cpp/test/Ice/checksum/Server.cpp b/cpp/test/Ice/checksum/Server.cpp index 534567b0a15..42d986b2dbf 100644 --- a/cpp/test/Ice/checksum/Server.cpp +++ b/cpp/test/Ice/checksum/Server.cpp @@ -20,7 +20,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0) + " -t 10000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(ChecksumI), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(ChecksumI), Ice::stringToIdentity("test")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/custom/Collocated.cpp b/cpp/test/Ice/custom/Collocated.cpp index d5e5cd467d0..5f17fb0c7e4 100644 --- a/cpp/test/Ice/custom/Collocated.cpp +++ b/cpp/test/Ice/custom/Collocated.cpp @@ -22,9 +22,9 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(TestIntfI, communicator), communicator->stringToIdentity("test")); - adapter->add(ICE_MAKE_SHARED(Test1::WstringClassI), communicator->stringToIdentity("wstring1")); - adapter->add(ICE_MAKE_SHARED(Test2::WstringClassI), communicator->stringToIdentity("wstring2")); + adapter->add(ICE_MAKE_SHARED(TestIntfI, communicator), Ice::stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(Test1::WstringClassI), Ice::stringToIdentity("wstring1")); + adapter->add(ICE_MAKE_SHARED(Test2::WstringClassI), Ice::stringToIdentity("wstring2")); Test::TestIntfPrxPtr allTests(const Ice::CommunicatorPtr&); allTests(communicator); diff --git a/cpp/test/Ice/custom/Server.cpp b/cpp/test/Ice/custom/Server.cpp index 51c6b4c4cd5..be7e8adf81b 100644 --- a/cpp/test/Ice/custom/Server.cpp +++ b/cpp/test/Ice/custom/Server.cpp @@ -22,9 +22,9 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(TestIntfI, communicator), communicator->stringToIdentity("test")); - adapter->add(ICE_MAKE_SHARED(Test1::WstringClassI), communicator->stringToIdentity("wstring1")); - adapter->add(ICE_MAKE_SHARED(Test2::WstringClassI), communicator->stringToIdentity("wstring2")); + adapter->add(ICE_MAKE_SHARED(TestIntfI, communicator), Ice::stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(Test1::WstringClassI), Ice::stringToIdentity("wstring1")); + adapter->add(ICE_MAKE_SHARED(Test2::WstringClassI), Ice::stringToIdentity("wstring2")); adapter->activate(); TEST_READY diff --git a/cpp/test/Ice/custom/ServerAMD.cpp b/cpp/test/Ice/custom/ServerAMD.cpp index e2b635f2665..954a2035ab2 100644 --- a/cpp/test/Ice/custom/ServerAMD.cpp +++ b/cpp/test/Ice/custom/ServerAMD.cpp @@ -22,9 +22,9 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(TestIntfI,communicator), communicator->stringToIdentity("test")); - adapter->add(ICE_MAKE_SHARED(Test1::WstringClassI), communicator->stringToIdentity("wstring1")); - adapter->add(ICE_MAKE_SHARED(Test2::WstringClassI), communicator->stringToIdentity("wstring2")); + adapter->add(ICE_MAKE_SHARED(TestIntfI,communicator), Ice::stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(Test1::WstringClassI), Ice::stringToIdentity("wstring1")); + adapter->add(ICE_MAKE_SHARED(Test2::WstringClassI), Ice::stringToIdentity("wstring2")); adapter->activate(); TEST_READY diff --git a/cpp/test/Ice/dispatcher/Collocated.cpp b/cpp/test/Ice/dispatcher/Collocated.cpp index b08e2440643..05592f5a8ed 100644 --- a/cpp/test/Ice/dispatcher/Collocated.cpp +++ b/cpp/test/Ice/dispatcher/Collocated.cpp @@ -28,10 +28,10 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) TestIntfControllerIPtr testController = ICE_MAKE_SHARED(TestIntfControllerI, adapter); - adapter->add(ICE_MAKE_SHARED(TestIntfI), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(TestIntfI), Ice::stringToIdentity("test")); //adapter->activate(); // Don't activate OA to ensure collocation is used. - adapter2->add(testController, communicator->stringToIdentity("testController")); + adapter2->add(testController, Ice::stringToIdentity("testController")); //adapter2->activate(); // Don't activate OA to ensure collocation is used. void allTests(const Ice::CommunicatorPtr&); diff --git a/cpp/test/Ice/dispatcher/Server.cpp b/cpp/test/Ice/dispatcher/Server.cpp index bdc490dd4eb..08dc9b75e17 100644 --- a/cpp/test/Ice/dispatcher/Server.cpp +++ b/cpp/test/Ice/dispatcher/Server.cpp @@ -28,10 +28,10 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) TestIntfControllerIPtr testController = ICE_MAKE_SHARED(TestIntfControllerI, adapter); - adapter->add(ICE_MAKE_SHARED(TestIntfI), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(TestIntfI), Ice::stringToIdentity("test")); adapter->activate(); - adapter2->add(testController, communicator->stringToIdentity("testController")); + adapter2->add(testController, Ice::stringToIdentity("testController")); adapter2->activate(); TEST_READY diff --git a/cpp/test/Ice/echo/Server.cpp b/cpp/test/Ice/echo/Server.cpp index e1d56838839..9d80f8833a9 100644 --- a/cpp/test/Ice/echo/Server.cpp +++ b/cpp/test/Ice/echo/Server.cpp @@ -52,7 +52,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); BlobjectIPtr blob = ICE_MAKE_SHARED(BlobjectI); adapter->addDefaultServant(blob, ""); - adapter->add(ICE_MAKE_SHARED(EchoI, blob), communicator->stringToIdentity("__echo")); + adapter->add(ICE_MAKE_SHARED(EchoI, blob), Ice::stringToIdentity("__echo")); adapter->activate(); TEST_READY diff --git a/cpp/test/Ice/enums/Server.cpp b/cpp/test/Ice/enums/Server.cpp index e01c6c9c1eb..45dec2632e4 100644 --- a/cpp/test/Ice/enums/Server.cpp +++ b/cpp/test/Ice/enums/Server.cpp @@ -20,7 +20,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(TestIntfI), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(TestIntfI), Ice::stringToIdentity("test")); adapter->activate(); TEST_READY diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp index 18cd9d7539b..3f047784a12 100644 --- a/cpp/test/Ice/exceptions/AllTests.cpp +++ b/cpp/test/Ice/exceptions/AllTests.cpp @@ -306,7 +306,7 @@ public: } catch(const Ice::ObjectNotExistException& ex) { - Ice::Identity id = _communicator->stringToIdentity("does not exist"); + Ice::Identity id = Ice::stringToIdentity("does not exist"); test(ex.id == id); } catch(...) @@ -563,10 +563,10 @@ allTests(const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter1.Endpoints", localOAEndpoint); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter1"); Ice::ObjectPtr obj = ICE_MAKE_SHARED(EmptyI); - adapter->add(obj, communicator->stringToIdentity("x")); + adapter->add(obj, Ice::stringToIdentity("x")); try { - adapter->add(obj, communicator->stringToIdentity("x")); + adapter->add(obj, Ice::stringToIdentity("x")); test(false); } catch(const Ice::AlreadyRegisteredException& ex) @@ -580,7 +580,7 @@ allTests(const Ice::CommunicatorPtr& communicator) try { - adapter->add(obj, communicator->stringToIdentity("")); + adapter->add(obj, Ice::stringToIdentity("")); } catch(const Ice::IllegalIdentityException& ex) { @@ -594,7 +594,7 @@ allTests(const Ice::CommunicatorPtr& communicator) try { - adapter->add(0, communicator->stringToIdentity("x")); + adapter->add(0, Ice::stringToIdentity("x")); } catch(const Ice::IllegalServantException& ex) { @@ -605,10 +605,10 @@ allTests(const Ice::CommunicatorPtr& communicator) } } - adapter->remove(communicator->stringToIdentity("x")); + adapter->remove(Ice::stringToIdentity("x")); try { - adapter->remove(communicator->stringToIdentity("x")); + adapter->remove(Ice::stringToIdentity("x")); test(false); } catch(const Ice::NotRegisteredException& ex) @@ -1010,7 +1010,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "catching object not exist exception... " << flush; - Ice::Identity id = communicator->stringToIdentity("does not exist"); + Ice::Identity id = Ice::stringToIdentity("does not exist"); try { ThrowerPrxPtr thrower2 = ICE_UNCHECKED_CAST(ThrowerPrx, thrower->ice_identity(id)); @@ -1568,7 +1568,7 @@ allTests(const Ice::CommunicatorPtr& communicator) { #ifdef ICE_CPP11_MAPPING - id = communicator->stringToIdentity("does not exist"); + id = Ice::stringToIdentity("does not exist"); shared_ptr<ThrowerPrx> thrower2 = Ice::uncheckedCast<ThrowerPrx>(thrower->ice_identity(id)); auto f = thrower2->throwAasAAsync(1); try @@ -1584,7 +1584,7 @@ allTests(const Ice::CommunicatorPtr& communicator) test(false); } #else - id = communicator->stringToIdentity("does not exist"); + id = Ice::stringToIdentity("does not exist"); ThrowerPrx thrower2 = ThrowerPrx::uncheckedCast(thrower->ice_identity(id)); CallbackPtr cb = new Callback(communicator); Callback_Thrower_throwAasAPtr callback = diff --git a/cpp/test/Ice/exceptions/Collocated.cpp b/cpp/test/Ice/exceptions/Collocated.cpp index e5aa2de376a..063bbd25e1a 100644 --- a/cpp/test/Ice/exceptions/Collocated.cpp +++ b/cpp/test/Ice/exceptions/Collocated.cpp @@ -22,7 +22,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = ICE_MAKE_SHARED(ThrowerI); - adapter->add(object, communicator->stringToIdentity("thrower")); + adapter->add(object, Ice::stringToIdentity("thrower")); ThrowerPrxPtr allTests(const Ice::CommunicatorPtr&); allTests(communicator); diff --git a/cpp/test/Ice/exceptions/Server.cpp b/cpp/test/Ice/exceptions/Server.cpp index e0cd7903ed5..2a95948c06a 100644 --- a/cpp/test/Ice/exceptions/Server.cpp +++ b/cpp/test/Ice/exceptions/Server.cpp @@ -27,9 +27,9 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) Ice::ObjectAdapterPtr adapter2 = communicator->createObjectAdapter("TestAdapter2"); Ice::ObjectAdapterPtr adapter3 = communicator->createObjectAdapter("TestAdapter3"); Ice::ObjectPtr object = ICE_MAKE_SHARED(ThrowerI); - adapter->add(object, communicator->stringToIdentity("thrower")); - adapter2->add(object, communicator->stringToIdentity("thrower")); - adapter3->add(object, communicator->stringToIdentity("thrower")); + adapter->add(object, Ice::stringToIdentity("thrower")); + adapter2->add(object, Ice::stringToIdentity("thrower")); + adapter3->add(object, Ice::stringToIdentity("thrower")); adapter->activate(); adapter2->activate(); adapter3->activate(); diff --git a/cpp/test/Ice/exceptions/ServerAMD.cpp b/cpp/test/Ice/exceptions/ServerAMD.cpp index 99dee0dec94..528b0e7ee03 100644 --- a/cpp/test/Ice/exceptions/ServerAMD.cpp +++ b/cpp/test/Ice/exceptions/ServerAMD.cpp @@ -27,9 +27,9 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) Ice::ObjectAdapterPtr adapter2 = communicator->createObjectAdapter("TestAdapter2"); Ice::ObjectAdapterPtr adapter3 = communicator->createObjectAdapter("TestAdapter3"); Ice::ObjectPtr object = ICE_MAKE_SHARED(ThrowerI); - adapter->add(object, communicator->stringToIdentity("thrower")); - adapter2->add(object, communicator->stringToIdentity("thrower")); - adapter3->add(object, communicator->stringToIdentity("thrower")); + adapter->add(object, Ice::stringToIdentity("thrower")); + adapter2->add(object, Ice::stringToIdentity("thrower")); + adapter3->add(object, Ice::stringToIdentity("thrower")); adapter->activate(); adapter2->activate(); adapter3->activate(); diff --git a/cpp/test/Ice/facets/AllTests.cpp b/cpp/test/Ice/facets/AllTests.cpp index 923bb4e437b..5b542de8a85 100644 --- a/cpp/test/Ice/facets/AllTests.cpp +++ b/cpp/test/Ice/facets/AllTests.cpp @@ -60,20 +60,20 @@ allTests(const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("FacetExceptionTestAdapter.Endpoints", localOAEndpoint); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("FacetExceptionTestAdapter"); Ice::ObjectPtr obj = ICE_MAKE_SHARED(EmptyI); - adapter->add(obj, communicator->stringToIdentity("d")); - adapter->addFacet(obj, communicator->stringToIdentity("d"), "facetABCD"); + adapter->add(obj, Ice::stringToIdentity("d")); + adapter->addFacet(obj, Ice::stringToIdentity("d"), "facetABCD"); try { - adapter->addFacet(obj, communicator->stringToIdentity("d"), "facetABCD"); + adapter->addFacet(obj, Ice::stringToIdentity("d"), "facetABCD"); test(false); } catch(const Ice::AlreadyRegisteredException&) { } - adapter->removeFacet(communicator->stringToIdentity("d"), "facetABCD"); + adapter->removeFacet(Ice::stringToIdentity("d"), "facetABCD"); try { - adapter->removeFacet(communicator->stringToIdentity("d"), "facetABCD"); + adapter->removeFacet(Ice::stringToIdentity("d"), "facetABCD"); test(false); } catch(const Ice::NotRegisteredException&) @@ -84,25 +84,25 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "testing removeAllFacets... " << flush; Ice::ObjectPtr obj1 = ICE_MAKE_SHARED(EmptyI); Ice::ObjectPtr obj2 = ICE_MAKE_SHARED(EmptyI); - adapter->addFacet(obj1, communicator->stringToIdentity("id1"), "f1"); - adapter->addFacet(obj2, communicator->stringToIdentity("id1"), "f2"); + adapter->addFacet(obj1, Ice::stringToIdentity("id1"), "f1"); + adapter->addFacet(obj2, Ice::stringToIdentity("id1"), "f2"); Ice::ObjectPtr obj3 = ICE_MAKE_SHARED(EmptyI); - adapter->addFacet(obj1, communicator->stringToIdentity("id2"), "f1"); - adapter->addFacet(obj2, communicator->stringToIdentity("id2"), "f2"); - adapter->addFacet(obj3, communicator->stringToIdentity("id2"), ""); - Ice::FacetMap fm = adapter->removeAllFacets(communicator->stringToIdentity("id1")); + adapter->addFacet(obj1, Ice::stringToIdentity("id2"), "f1"); + adapter->addFacet(obj2, Ice::stringToIdentity("id2"), "f2"); + adapter->addFacet(obj3, Ice::stringToIdentity("id2"), ""); + Ice::FacetMap fm = adapter->removeAllFacets(Ice::stringToIdentity("id1")); test(fm.size() == 2); test(fm["f1"] == obj1); test(fm["f2"] == obj2); try { - adapter->removeAllFacets(communicator->stringToIdentity("id1")); + adapter->removeAllFacets(Ice::stringToIdentity("id1")); test(false); } catch(const Ice::NotRegisteredException&) { } - fm = adapter->removeAllFacets(communicator->stringToIdentity("id2")); + fm = adapter->removeAllFacets(Ice::stringToIdentity("id2")); test(fm.size() == 3); test(fm["f1"] == obj1); test(fm["f2"] == obj2); diff --git a/cpp/test/Ice/facets/Collocated.cpp b/cpp/test/Ice/facets/Collocated.cpp index 9dbf1bb6b2f..21460a5806c 100644 --- a/cpp/test/Ice/facets/Collocated.cpp +++ b/cpp/test/Ice/facets/Collocated.cpp @@ -22,12 +22,12 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr d = ICE_MAKE_SHARED(DI); - adapter->add(d, communicator->stringToIdentity("d")); - adapter->addFacet(d, communicator->stringToIdentity("d"), "facetABCD"); + adapter->add(d, Ice::stringToIdentity("d")); + adapter->addFacet(d, Ice::stringToIdentity("d"), "facetABCD"); Ice::ObjectPtr f = ICE_MAKE_SHARED(FI); - adapter->addFacet(f, communicator->stringToIdentity("d"), "facetEF"); + adapter->addFacet(f, Ice::stringToIdentity("d"), "facetEF"); Ice::ObjectPtr h = ICE_MAKE_SHARED(HI, communicator); - adapter->addFacet(h, communicator->stringToIdentity("d"), "facetGH"); + adapter->addFacet(h, Ice::stringToIdentity("d"), "facetGH"); GPrxPtr allTests(const Ice::CommunicatorPtr&); allTests(communicator); diff --git a/cpp/test/Ice/facets/Server.cpp b/cpp/test/Ice/facets/Server.cpp index b9bff160667..92d0b838bd5 100644 --- a/cpp/test/Ice/facets/Server.cpp +++ b/cpp/test/Ice/facets/Server.cpp @@ -21,12 +21,12 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr d = ICE_MAKE_SHARED(DI); - adapter->add(d, communicator->stringToIdentity("d")); - adapter->addFacet(d, communicator->stringToIdentity("d"), "facetABCD"); + adapter->add(d, Ice::stringToIdentity("d")); + adapter->addFacet(d, Ice::stringToIdentity("d"), "facetABCD"); Ice::ObjectPtr f = ICE_MAKE_SHARED(FI); - adapter->addFacet(f, communicator->stringToIdentity("d"), "facetEF"); + adapter->addFacet(f, Ice::stringToIdentity("d"), "facetEF"); Ice::ObjectPtr h = ICE_MAKE_SHARED(HI, communicator); - adapter->addFacet(h, communicator->stringToIdentity("d"), "facetGH"); + adapter->addFacet(h, Ice::stringToIdentity("d"), "facetGH"); TEST_READY adapter->activate(); communicator->waitForShutdown(); diff --git a/cpp/test/Ice/faultTolerance/Server.cpp b/cpp/test/Ice/faultTolerance/Server.cpp index ab727d372de..c731d007786 100644 --- a/cpp/test/Ice/faultTolerance/Server.cpp +++ b/cpp/test/Ice/faultTolerance/Server.cpp @@ -53,7 +53,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter.Endpoints", endpts.str()); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = ICE_MAKE_SHARED(TestI); - adapter->add(object, communicator->stringToIdentity("test")); + adapter->add(object, Ice::stringToIdentity("test")); adapter->activate(); communicator->waitForShutdown(); return EXIT_SUCCESS; diff --git a/cpp/test/Ice/hold/Server.cpp b/cpp/test/Ice/hold/Server.cpp index 3d1db1b74a4..261d83d4660 100644 --- a/cpp/test/Ice/hold/Server.cpp +++ b/cpp/test/Ice/hold/Server.cpp @@ -26,7 +26,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter1.ThreadPool.SizeWarn", "0"); communicator->getProperties()->setProperty("TestAdapter1.ThreadPool.Serialize", "0"); Ice::ObjectAdapterPtr adapter1 = communicator->createObjectAdapter("TestAdapter1"); - adapter1->add(ICE_MAKE_SHARED(HoldI, timer, adapter1), communicator->stringToIdentity("hold")); + adapter1->add(ICE_MAKE_SHARED(HoldI, timer, adapter1), Ice::stringToIdentity("hold")); communicator->getProperties()->setProperty("TestAdapter2.Endpoints", getTestEndpoint(communicator, 1) + ":udp"); communicator->getProperties()->setProperty("TestAdapter2.ThreadPool.Size", "5"); @@ -34,7 +34,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter2.ThreadPool.SizeWarn", "0"); communicator->getProperties()->setProperty("TestAdapter2.ThreadPool.Serialize", "1"); Ice::ObjectAdapterPtr adapter2 = communicator->createObjectAdapter("TestAdapter2"); - adapter2->add(ICE_MAKE_SHARED(HoldI, timer, adapter2), communicator->stringToIdentity("hold")); + adapter2->add(ICE_MAKE_SHARED(HoldI, timer, adapter2), Ice::stringToIdentity("hold")); adapter1->activate(); adapter2->activate(); diff --git a/cpp/test/Ice/impl/Server.cpp b/cpp/test/Ice/impl/Server.cpp index b2f397730e5..91cb3580b0d 100644 --- a/cpp/test/Ice/impl/Server.cpp +++ b/cpp/test/Ice/impl/Server.cpp @@ -22,7 +22,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) string endpt = getTestEndpoint(communicator, 0); communicator->getProperties()->setProperty("TestAdapter.Endpoints", endpt + ":udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), Ice::stringToIdentity("test")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/impl/ServerAMD.cpp b/cpp/test/Ice/impl/ServerAMD.cpp index d9488a27456..88a22188406 100644 --- a/cpp/test/Ice/impl/ServerAMD.cpp +++ b/cpp/test/Ice/impl/ServerAMD.cpp @@ -22,7 +22,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) string endpt = getTestEndpoint(communicator, 0); communicator->getProperties()->setProperty("TestAdapter.Endpoints", endpt + ":udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), Ice::stringToIdentity("test")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/info/Server.cpp b/cpp/test/Ice/info/Server.cpp index 5d811ef4609..47c8bbb3332 100644 --- a/cpp/test/Ice/info/Server.cpp +++ b/cpp/test/Ice/info/Server.cpp @@ -20,7 +20,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(TestI), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(TestI), Ice::stringToIdentity("test")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/inheritance/Collocated.cpp b/cpp/test/Ice/inheritance/Collocated.cpp index f0ff2a1e25f..0f640de9b8b 100644 --- a/cpp/test/Ice/inheritance/Collocated.cpp +++ b/cpp/test/Ice/inheritance/Collocated.cpp @@ -22,7 +22,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = ICE_MAKE_SHARED(InitialI, adapter); - adapter->add(object, communicator->stringToIdentity("initial")); + adapter->add(object, Ice::stringToIdentity("initial")); InitialPrxPtr allTests(const Ice::CommunicatorPtr&); allTests(communicator); diff --git a/cpp/test/Ice/inheritance/Server.cpp b/cpp/test/Ice/inheritance/Server.cpp index abb805c10ca..8ec0c761076 100644 --- a/cpp/test/Ice/inheritance/Server.cpp +++ b/cpp/test/Ice/inheritance/Server.cpp @@ -21,7 +21,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = ICE_MAKE_SHARED(InitialI, adapter); - adapter->add(object, communicator->stringToIdentity("initial")); + adapter->add(object, Ice::stringToIdentity("initial")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/location/AllTests.cpp b/cpp/test/Ice/location/AllTests.cpp index 2a6966a80a6..cf48eb18b51 100644 --- a/cpp/test/Ice/location/AllTests.cpp +++ b/cpp/test/Ice/location/AllTests.cpp @@ -707,7 +707,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const string& ref) registry->addObject(adapter->add(ICE_MAKE_SHARED(HelloI), id)); adapter->activate(); - HelloPrxPtr helloPrx = ICE_CHECKED_CAST(HelloPrx, communicator->stringToProxy(communicator->identityToString(id))); + HelloPrxPtr helloPrx = ICE_CHECKED_CAST(HelloPrx, communicator->stringToProxy(identityToString(id))); test(!helloPrx->ice_getConnection()); adapter->deactivate(); diff --git a/cpp/test/Ice/location/Server.cpp b/cpp/test/Ice/location/Server.cpp index 8bb0485c07f..fb2f29a2226 100644 --- a/cpp/test/Ice/location/Server.cpp +++ b/cpp/test/Ice/location/Server.cpp @@ -37,16 +37,16 @@ run(int, char**, const Ice::CommunicatorPtr& communicator, // 'servers' created with the server manager interface. // ServerLocatorRegistryPtr registry = ICE_MAKE_SHARED(ServerLocatorRegistry); - registry->addObject(adapter->createProxy(communicator->stringToIdentity("ServerManager"))); + registry->addObject(adapter->createProxy(Ice::stringToIdentity("ServerManager"))); Ice::ObjectPtr object = ICE_MAKE_SHARED(ServerManagerI, registry, initData); - adapter->add(object, communicator->stringToIdentity("ServerManager")); + adapter->add(object, Ice::stringToIdentity("ServerManager")); Ice::LocatorRegistryPrxPtr registryPrx = ICE_UNCHECKED_CAST(Ice::LocatorRegistryPrx, - adapter->add(registry, communicator->stringToIdentity("registry"))); + adapter->add(registry, Ice::stringToIdentity("registry"))); Ice::LocatorPtr locator = ICE_MAKE_SHARED(ServerLocator, registry, registryPrx); - adapter->add(locator, communicator->stringToIdentity("locator")); + adapter->add(locator, Ice::stringToIdentity("locator")); adapter->activate(); TEST_READY diff --git a/cpp/test/Ice/location/TestI.cpp b/cpp/test/Ice/location/TestI.cpp index 833d660a159..80e391b2a8d 100644 --- a/cpp/test/Ice/location/TestI.cpp +++ b/cpp/test/Ice/location/TestI.cpp @@ -69,9 +69,9 @@ ServerManagerI::startServer(const Ice::Current&) adapter2->setLocator(ICE_UNCHECKED_CAST(Ice::LocatorPrx, locator)); Ice::ObjectPtr object = ICE_MAKE_SHARED(TestI, adapter, adapter2, _registry); - _registry->addObject(adapter->add(object, serverCommunicator->stringToIdentity("test"))); - _registry->addObject(adapter->add(object, serverCommunicator->stringToIdentity("test2"))); - adapter->add(object, serverCommunicator->stringToIdentity("test3")); + _registry->addObject(adapter->add(object, Ice::stringToIdentity("test"))); + _registry->addObject(adapter->add(object, Ice::stringToIdentity("test2"))); + adapter->add(object, Ice::stringToIdentity("test3")); adapter->activate(); adapter2->activate(); @@ -93,7 +93,7 @@ TestI::TestI(const Ice::ObjectAdapterPtr& adapter, const ServerLocatorRegistryPtr& registry) : _adapter1(adapter), _adapter2(adapter2), _registry(registry) { - _registry->addObject(_adapter1->add(ICE_MAKE_SHARED(HelloI), _adapter1->getCommunicator()->stringToIdentity("hello"))); + _registry->addObject(_adapter1->add(ICE_MAKE_SHARED(HelloI), Ice::stringToIdentity("hello"))); } void @@ -106,19 +106,19 @@ HelloPrxPtr TestI::getHello(const Ice::Current&) { return ICE_UNCHECKED_CAST(HelloPrx, _adapter1->createIndirectProxy( - _adapter1->getCommunicator()->stringToIdentity("hello"))); + Ice::stringToIdentity("hello"))); } HelloPrxPtr TestI::getReplicatedHello(const Ice::Current&) { - return ICE_UNCHECKED_CAST(HelloPrx, _adapter1->createProxy(_adapter1->getCommunicator()->stringToIdentity("hello"))); + return ICE_UNCHECKED_CAST(HelloPrx, _adapter1->createProxy(Ice::stringToIdentity("hello"))); } void TestI::migrateHello(const Ice::Current&) { - const Ice::Identity id = _adapter1->getCommunicator()->stringToIdentity("hello"); + const Ice::Identity id = Ice::stringToIdentity("hello"); try { _registry->addObject(_adapter2->add(_adapter1->remove(id), id)); diff --git a/cpp/test/Ice/metrics/Collocated.cpp b/cpp/test/Ice/metrics/Collocated.cpp index 3bfed32f91a..dd314954612 100644 --- a/cpp/test/Ice/metrics/Collocated.cpp +++ b/cpp/test/Ice/metrics/Collocated.cpp @@ -22,12 +22,12 @@ run(int, char**, const Ice::CommunicatorPtr& communicator, const CommunicatorObs { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(MetricsI), communicator->stringToIdentity("metrics")); + adapter->add(ICE_MAKE_SHARED(MetricsI), Ice::stringToIdentity("metrics")); //adapter->activate(); // Don't activate OA to ensure collocation is used. communicator->getProperties()->setProperty("ControllerAdapter.Endpoints", "default -p 12011"); Ice::ObjectAdapterPtr controllerAdapter = communicator->createObjectAdapter("ControllerAdapter"); - controllerAdapter->add(ICE_MAKE_SHARED(ControllerI, adapter), communicator->stringToIdentity("controller")); + controllerAdapter->add(ICE_MAKE_SHARED(ControllerI, adapter), Ice::stringToIdentity("controller")); //controllerAdapter->activate(); // Don't activate OA to ensure collocation is used. MetricsPrxPtr allTests(const Ice::CommunicatorPtr&, const CommunicatorObserverIPtr&); diff --git a/cpp/test/Ice/metrics/Server.cpp b/cpp/test/Ice/metrics/Server.cpp index 069f288c645..e5daf413204 100644 --- a/cpp/test/Ice/metrics/Server.cpp +++ b/cpp/test/Ice/metrics/Server.cpp @@ -20,12 +20,12 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(MetricsI), communicator->stringToIdentity("metrics")); + adapter->add(ICE_MAKE_SHARED(MetricsI), Ice::stringToIdentity("metrics")); adapter->activate(); communicator->getProperties()->setProperty("ControllerAdapter.Endpoints", "default -p 12011"); Ice::ObjectAdapterPtr controllerAdapter = communicator->createObjectAdapter("ControllerAdapter"); - controllerAdapter->add(ICE_MAKE_SHARED(ControllerI, adapter), communicator->stringToIdentity("controller")); + controllerAdapter->add(ICE_MAKE_SHARED(ControllerI, adapter), Ice::stringToIdentity("controller")); controllerAdapter->activate(); TEST_READY diff --git a/cpp/test/Ice/metrics/ServerAMD.cpp b/cpp/test/Ice/metrics/ServerAMD.cpp index 1d53c859792..40aee438374 100644 --- a/cpp/test/Ice/metrics/ServerAMD.cpp +++ b/cpp/test/Ice/metrics/ServerAMD.cpp @@ -20,12 +20,12 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(MetricsI), communicator->stringToIdentity("metrics")); + adapter->add(ICE_MAKE_SHARED(MetricsI), Ice::stringToIdentity("metrics")); adapter->activate(); communicator->getProperties()->setProperty("ControllerAdapter.Endpoints", "default -p 12011"); Ice::ObjectAdapterPtr controllerAdapter = communicator->createObjectAdapter("ControllerAdapter"); - controllerAdapter->add(ICE_MAKE_SHARED(ControllerI, adapter), communicator->stringToIdentity("controller")); + controllerAdapter->add(ICE_MAKE_SHARED(ControllerI, adapter), Ice::stringToIdentity("controller")); controllerAdapter->activate(); TEST_READY diff --git a/cpp/test/Ice/networkProxy/Server.cpp b/cpp/test/Ice/networkProxy/Server.cpp index d8c103dc721..07dac51360a 100644 --- a/cpp/test/Ice/networkProxy/Server.cpp +++ b/cpp/test/Ice/networkProxy/Server.cpp @@ -37,7 +37,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = ICE_MAKE_SHARED(TestI); - adapter->add(object, communicator->stringToIdentity("test")); + adapter->add(object, Ice::stringToIdentity("test")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/objects/Collocated.cpp b/cpp/test/Ice/objects/Collocated.cpp index 9686c6ca559..6443ed13252 100644 --- a/cpp/test/Ice/objects/Collocated.cpp +++ b/cpp/test/Ice/objects/Collocated.cpp @@ -134,9 +134,9 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(InitialI, adapter), communicator->stringToIdentity("initial")); - adapter->add(ICE_MAKE_SHARED(TestIntfI), communicator->stringToIdentity("test")); - adapter->add(ICE_MAKE_SHARED(UnexpectedObjectExceptionTestI), communicator->stringToIdentity("uoet")); + adapter->add(ICE_MAKE_SHARED(InitialI, adapter), Ice::stringToIdentity("initial")); + adapter->add(ICE_MAKE_SHARED(TestIntfI), Ice::stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(UnexpectedObjectExceptionTestI), Ice::stringToIdentity("uoet")); InitialPrxPtr allTests(const Ice::CommunicatorPtr&); InitialPrxPtr initial = allTests(communicator); // We must call shutdown even in the collocated case for cyclic dependency cleanup diff --git a/cpp/test/Ice/objects/Server.cpp b/cpp/test/Ice/objects/Server.cpp index 47ef551c54f..c63b2d7c415 100644 --- a/cpp/test/Ice/objects/Server.cpp +++ b/cpp/test/Ice/objects/Server.cpp @@ -68,10 +68,10 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(InitialI, adapter), communicator->stringToIdentity("initial")); - adapter->add(ICE_MAKE_SHARED(TestIntfI), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(InitialI, adapter), Ice::stringToIdentity("initial")); + adapter->add(ICE_MAKE_SHARED(TestIntfI), Ice::stringToIdentity("test")); - adapter->add(ICE_MAKE_SHARED(UnexpectedObjectExceptionTestI), communicator->stringToIdentity("uoet")); + adapter->add(ICE_MAKE_SHARED(UnexpectedObjectExceptionTestI), Ice::stringToIdentity("uoet")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/operations/Collocated.cpp b/cpp/test/Ice/operations/Collocated.cpp index 58cec8483b4..cfce947446d 100644 --- a/cpp/test/Ice/operations/Collocated.cpp +++ b/cpp/test/Ice/operations/Collocated.cpp @@ -21,7 +21,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); communicator->getProperties()->setProperty("TestAdapter.AdapterId", "test"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - Ice::ObjectPrxPtr prx = adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), communicator->stringToIdentity("test")); + Ice::ObjectPrxPtr prx = adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), Ice::stringToIdentity("test")); //adapter->activate(); // Don't activate OA to ensure collocation is used. test(!prx->ice_getConnection()); diff --git a/cpp/test/Ice/operations/Server.cpp b/cpp/test/Ice/operations/Server.cpp index c291f5cb13e..80f89467fe7 100644 --- a/cpp/test/Ice/operations/Server.cpp +++ b/cpp/test/Ice/operations/Server.cpp @@ -21,7 +21,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) string endpt = getTestEndpoint(communicator, 0); communicator->getProperties()->setProperty("TestAdapter.Endpoints", endpt + ":udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), Ice::stringToIdentity("test")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/operations/ServerAMD.cpp b/cpp/test/Ice/operations/ServerAMD.cpp index c52ea694234..f291f11a5a4 100644 --- a/cpp/test/Ice/operations/ServerAMD.cpp +++ b/cpp/test/Ice/operations/ServerAMD.cpp @@ -21,7 +21,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) string endpt = getTestEndpoint(communicator, 0); communicator->getProperties()->setProperty("TestAdapter.Endpoints", endpt + ":udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), Ice::stringToIdentity("test")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/operations/TestAMDI.cpp b/cpp/test/Ice/operations/TestAMDI.cpp index d7c5ceff2c0..046bd3f6de6 100644 --- a/cpp/test/Ice/operations/TestAMDI.cpp +++ b/cpp/test/Ice/operations/TestAMDI.cpp @@ -210,7 +210,7 @@ MyDerivedClassI::opMyClassAsync(shared_ptr<Test::MyClassPrx> p1, { auto p2 = p1; auto p3 = uncheckedCast<Test::MyClassPrx>(current.adapter->createProxy( - current.adapter->getCommunicator()->stringToIdentity("noSuchIdentity"))); + stringToIdentity("noSuchIdentity"))); response(uncheckedCast<Test::MyClassPrx>(current.adapter->createProxy(current.id)), p2, p3); } @@ -1126,7 +1126,7 @@ MyDerivedClassI::opMyClass_async(const Test::AMD_MyClass_opMyClassPtr& cb, Test::MyClassPrxPtr p2 = p1; Test::MyClassPrxPtr p3 = ICE_UNCHECKED_CAST( Test::MyClassPrx, current.adapter->createProxy( - current.adapter->getCommunicator()->stringToIdentity("noSuchIdentity"))); + stringToIdentity("noSuchIdentity"))); cb->ice_response(ICE_UNCHECKED_CAST(Test::MyClassPrx, current.adapter->createProxy(current.id)), p2, p3); } diff --git a/cpp/test/Ice/operations/TestI.cpp b/cpp/test/Ice/operations/TestI.cpp index 1c091594b36..ddbcffedd7f 100644 --- a/cpp/test/Ice/operations/TestI.cpp +++ b/cpp/test/Ice/operations/TestI.cpp @@ -164,7 +164,7 @@ MyDerivedClassI::opMyClass(ICE_IN(Test::MyClassPrxPtr) p1, p2 = p1; p3 = ICE_UNCHECKED_CAST(Test::MyClassPrx, current.adapter->createProxy( - current.adapter->getCommunicator()->stringToIdentity("noSuchIdentity"))); + stringToIdentity("noSuchIdentity"))); return ICE_UNCHECKED_CAST(Test::MyClassPrx, current.adapter->createProxy(current.id)); } diff --git a/cpp/test/Ice/operations/Twoways.cpp b/cpp/test/Ice/operations/Twoways.cpp index e0ba66c9c92..a8fbe72f7e9 100644 --- a/cpp/test/Ice/operations/Twoways.cpp +++ b/cpp/test/Ice/operations/Twoways.cpp @@ -351,9 +351,9 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& p) test(Ice::proxyIdentityAndFacetEqual(c1, p)); test(!Ice::proxyIdentityAndFacetEqual(c2, p)); test(Ice::proxyIdentityAndFacetEqual(r, p)); - test(c1->ice_getIdentity() == communicator->stringToIdentity("test")); - test(c2->ice_getIdentity() == communicator->stringToIdentity("noSuchIdentity")); - test(r->ice_getIdentity() == communicator->stringToIdentity("test")); + test(c1->ice_getIdentity() == Ice::stringToIdentity("test")); + test(c2->ice_getIdentity() == Ice::stringToIdentity("noSuchIdentity")); + test(r->ice_getIdentity() == Ice::stringToIdentity("test")); r->opVoid(); c1->opVoid(); try diff --git a/cpp/test/Ice/operations/TwowaysAMI.cpp b/cpp/test/Ice/operations/TwowaysAMI.cpp index 1a40355816b..1e96c80cae4 100644 --- a/cpp/test/Ice/operations/TwowaysAMI.cpp +++ b/cpp/test/Ice/operations/TwowaysAMI.cpp @@ -170,9 +170,9 @@ public: void opMyClass(const Test::MyClassPrxPtr& r, const Test::MyClassPrxPtr& c1, const Test::MyClassPrxPtr& c2) { - test(c1->ice_getIdentity() == _communicator->stringToIdentity("test")); - test(c2->ice_getIdentity() == _communicator->stringToIdentity("noSuchIdentity")); - test(r->ice_getIdentity() == _communicator->stringToIdentity("test")); + test(c1->ice_getIdentity() == Ice::stringToIdentity("test")); + test(c2->ice_getIdentity() == Ice::stringToIdentity("noSuchIdentity")); + test(r->ice_getIdentity() == Ice::stringToIdentity("test")); // // We can't do the callbacks below in connection serialization mode. diff --git a/cpp/test/Ice/optional/Server.cpp b/cpp/test/Ice/optional/Server.cpp index fe22e6abe87..aacddd084ed 100644 --- a/cpp/test/Ice/optional/Server.cpp +++ b/cpp/test/Ice/optional/Server.cpp @@ -21,7 +21,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(InitialI), communicator->stringToIdentity("initial")); + adapter->add(ICE_MAKE_SHARED(InitialI), Ice::stringToIdentity("initial")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/optional/ServerAMD.cpp b/cpp/test/Ice/optional/ServerAMD.cpp index 9b4c93e894b..c47b19721b5 100644 --- a/cpp/test/Ice/optional/ServerAMD.cpp +++ b/cpp/test/Ice/optional/ServerAMD.cpp @@ -20,7 +20,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(InitialI), communicator->stringToIdentity("initial")); + adapter->add(ICE_MAKE_SHARED(InitialI), Ice::stringToIdentity("initial")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/proxy/AllTests.cpp b/cpp/test/Ice/proxy/AllTests.cpp index 0bcaccfff27..bcded5cb5b2 100644 --- a/cpp/test/Ice/proxy/AllTests.cpp +++ b/cpp/test/Ice/proxy/AllTests.cpp @@ -258,15 +258,11 @@ allTests(const Ice::CommunicatorPtr& communicator) // Test for bug ICE-5543: escaped escapes in stringToIdentity // Ice::Identity id = { "test", ",X2QNUAzSBcJ_e$AV;E\\" }; - Ice::Identity id2 = communicator->stringToIdentity(communicator->identityToString(id)); - test(id == id2); - id2 = Ice::stringToIdentity(Ice::identityToString(id)); + Ice::Identity id2 = Ice::stringToIdentity(Ice::identityToString(id)); test(id == id2); id.name = "test"; id.category = ",X2QNUAz\\SB\\/cJ_e$AV;E\\\\"; - id2 = communicator->stringToIdentity(communicator->identityToString(id)); - test(id == id2); id2 = Ice::stringToIdentity(Ice::identityToString(id)); test(id == id2); @@ -448,8 +444,10 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "ok" << endl; cout << "testing proxy methods... " << flush; - test(communicator->identityToString(base->ice_identity(communicator->stringToIdentity("other"))->ice_getIdentity()) - == "other"); + +// Deprecated +// test(communicator->identityToString(base->ice_identity(communicator->stringToIdentity("other"))->ice_getIdentity()) +// == "other"); test(Ice::identityToString(base->ice_identity(Ice::stringToIdentity("other"))->ice_getIdentity()) == "other"); test(base->ice_facet("facet")->ice_getFacet() == "facet"); test(base->ice_adapterId("id")->ice_getAdapterId() == "id"); diff --git a/cpp/test/Ice/proxy/Collocated.cpp b/cpp/test/Ice/proxy/Collocated.cpp index aa651a1da15..2c7e91d3106 100644 --- a/cpp/test/Ice/proxy/Collocated.cpp +++ b/cpp/test/Ice/proxy/Collocated.cpp @@ -20,7 +20,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), Ice::stringToIdentity("test")); //adapter->activate(); // Don't activate OA to ensure collocation is used. Test::MyClassPrxPtr allTests(const Ice::CommunicatorPtr&); diff --git a/cpp/test/Ice/proxy/Server.cpp b/cpp/test/Ice/proxy/Server.cpp index 15c8418a051..c0a9a8761c5 100644 --- a/cpp/test/Ice/proxy/Server.cpp +++ b/cpp/test/Ice/proxy/Server.cpp @@ -20,7 +20,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), Ice::stringToIdentity("test")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/proxy/ServerAMD.cpp b/cpp/test/Ice/proxy/ServerAMD.cpp index 432c34f9b53..db603a4570a 100644 --- a/cpp/test/Ice/proxy/ServerAMD.cpp +++ b/cpp/test/Ice/proxy/ServerAMD.cpp @@ -20,7 +20,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), Ice::stringToIdentity("test")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/retry/Collocated.cpp b/cpp/test/Ice/retry/Collocated.cpp index 597fc7a65d7..1c83cb7c996 100644 --- a/cpp/test/Ice/retry/Collocated.cpp +++ b/cpp/test/Ice/retry/Collocated.cpp @@ -22,7 +22,7 @@ void setupObjectAdapter(const Ice::CommunicatorPtr& communicator) { Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter(""); - adapter->add(ICE_MAKE_SHARED(RetryI), communicator->stringToIdentity("retry")); + adapter->add(ICE_MAKE_SHARED(RetryI), Ice::stringToIdentity("retry")); //adapter->activate(); // Don't activate OA to ensure collocation is used. } diff --git a/cpp/test/Ice/retry/Server.cpp b/cpp/test/Ice/retry/Server.cpp index 8a42f1e389e..a0e37557fbf 100644 --- a/cpp/test/Ice/retry/Server.cpp +++ b/cpp/test/Ice/retry/Server.cpp @@ -20,7 +20,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0) + ":udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(RetryI), communicator->stringToIdentity("retry")); + adapter->add(ICE_MAKE_SHARED(RetryI), Ice::stringToIdentity("retry")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/servantLocator/Collocated.cpp b/cpp/test/Ice/servantLocator/Collocated.cpp index 13fe3b76e4b..aeb02c0e36d 100644 --- a/cpp/test/Ice/servantLocator/Collocated.cpp +++ b/cpp/test/Ice/servantLocator/Collocated.cpp @@ -96,8 +96,8 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); adapter->addServantLocator(ICE_MAKE_SHARED(ServantLocatorI, ""), ""); adapter->addServantLocator(ICE_MAKE_SHARED(ServantLocatorI, "category"), "category"); - adapter->add(ICE_MAKE_SHARED(TestI), communicator->stringToIdentity("asm")); - adapter->add(ICE_MAKE_SHARED(TestActivationI), communicator->stringToIdentity("test/activation")); + adapter->add(ICE_MAKE_SHARED(TestI), Ice::stringToIdentity("asm")); + adapter->add(ICE_MAKE_SHARED(TestActivationI), Ice::stringToIdentity("test/activation")); Test::TestIntfPrxPtr allTests(const CommunicatorPtr&); allTests(communicator); diff --git a/cpp/test/Ice/servantLocator/Server.cpp b/cpp/test/Ice/servantLocator/Server.cpp index 6b4a38dc772..c5c78e23881 100644 --- a/cpp/test/Ice/servantLocator/Server.cpp +++ b/cpp/test/Ice/servantLocator/Server.cpp @@ -97,8 +97,8 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) adapter->addServantLocator(ICE_MAKE_SHARED(ServantLocatorI, ""), ""); adapter->addServantLocator(ICE_MAKE_SHARED(ServantLocatorI, "category"), "category"); - adapter->add(ICE_MAKE_SHARED(TestI), communicator->stringToIdentity("asm")); - adapter->add(ICE_MAKE_SHARED(TestActivationI), communicator->stringToIdentity("test/activation")); + adapter->add(ICE_MAKE_SHARED(TestI), Ice::stringToIdentity("asm")); + adapter->add(ICE_MAKE_SHARED(TestActivationI), Ice::stringToIdentity("test/activation")); adapter->activate(); TEST_READY adapter->waitForDeactivate(); diff --git a/cpp/test/Ice/servantLocator/ServerAMD.cpp b/cpp/test/Ice/servantLocator/ServerAMD.cpp index b51708b76cb..740d6072b33 100644 --- a/cpp/test/Ice/servantLocator/ServerAMD.cpp +++ b/cpp/test/Ice/servantLocator/ServerAMD.cpp @@ -96,8 +96,8 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) adapter->addServantLocator(ICE_MAKE_SHARED(ServantLocatorAMDI, ""), ""); adapter->addServantLocator(ICE_MAKE_SHARED(ServantLocatorAMDI, "category"), "category"); - adapter->add(ICE_MAKE_SHARED(TestAMDI), communicator->stringToIdentity("asm")); - adapter->add(ICE_MAKE_SHARED(TestActivationI), communicator->stringToIdentity("test/activation")); + adapter->add(ICE_MAKE_SHARED(TestAMDI), Ice::stringToIdentity("asm")); + adapter->add(ICE_MAKE_SHARED(TestActivationI), Ice::stringToIdentity("test/activation")); adapter->activate(); TEST_READY adapter->waitForDeactivate(); diff --git a/cpp/test/Ice/slicing/exceptions/Server.cpp b/cpp/test/Ice/slicing/exceptions/Server.cpp index 2cd8dba2995..909b87b7fc0 100644 --- a/cpp/test/Ice/slicing/exceptions/Server.cpp +++ b/cpp/test/Ice/slicing/exceptions/Server.cpp @@ -22,7 +22,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) properties->setProperty("Ice.Warn.Dispatch", "0"); communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0) + " -t 2000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(TestI), communicator->stringToIdentity("Test")); + adapter->add(ICE_MAKE_SHARED(TestI), Ice::stringToIdentity("Test")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp b/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp index 5b67af38a4f..c5534dcc207 100644 --- a/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp +++ b/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp @@ -22,7 +22,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) properties->setProperty("Ice.Warn.Dispatch", "0"); communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0) + " -t 2000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(TestI), communicator->stringToIdentity("Test")); + adapter->add(ICE_MAKE_SHARED(TestI), Ice::stringToIdentity("Test")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/slicing/objects/Server.cpp b/cpp/test/Ice/slicing/objects/Server.cpp index 62221669931..093997a59ef 100644 --- a/cpp/test/Ice/slicing/objects/Server.cpp +++ b/cpp/test/Ice/slicing/objects/Server.cpp @@ -23,7 +23,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0) + " -t 2000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = ICE_MAKE_SHARED(TestI); - adapter->add(object, communicator->stringToIdentity("Test")); + adapter->add(object, Ice::stringToIdentity("Test")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/slicing/objects/ServerAMD.cpp b/cpp/test/Ice/slicing/objects/ServerAMD.cpp index 293676daa27..28e3b390606 100644 --- a/cpp/test/Ice/slicing/objects/ServerAMD.cpp +++ b/cpp/test/Ice/slicing/objects/ServerAMD.cpp @@ -23,7 +23,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0) + " -t 2000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = ICE_MAKE_SHARED(TestI); - adapter->add(object, communicator->stringToIdentity("Test")); + adapter->add(object, Ice::stringToIdentity("Test")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/stringConverter/Server.cpp b/cpp/test/Ice/stringConverter/Server.cpp index ce592e19ba9..3e3b6e17541 100644 --- a/cpp/test/Ice/stringConverter/Server.cpp +++ b/cpp/test/Ice/stringConverter/Server.cpp @@ -45,7 +45,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0) + ":udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(MyObjectI), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(MyObjectI), Ice::stringToIdentity("test")); adapter->activate(); TEST_READY diff --git a/cpp/test/Ice/threadPoolPriority/Server.cpp b/cpp/test/Ice/threadPoolPriority/Server.cpp index bde7ad25bff..b1957badf2f 100644 --- a/cpp/test/Ice/threadPoolPriority/Server.cpp +++ b/cpp/test/Ice/threadPoolPriority/Server.cpp @@ -49,7 +49,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = ICE_MAKE_SHARED(PriorityI, adapter); - adapter->add(object, communicator->stringToIdentity("test")); + adapter->add(object, Ice::stringToIdentity("test")); adapter->activate(); communicator->waitForShutdown(); return EXIT_SUCCESS; diff --git a/cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp b/cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp index 934ba14b99f..3d67cc16c3f 100644 --- a/cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp +++ b/cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp @@ -53,7 +53,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) #endif Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = ICE_MAKE_SHARED(PriorityI, adapter); - adapter->add(object, communicator->stringToIdentity("test")); + adapter->add(object, Ice::stringToIdentity("test")); adapter->activate(); communicator->waitForShutdown(); return EXIT_SUCCESS; diff --git a/cpp/test/Ice/timeout/Server.cpp b/cpp/test/Ice/timeout/Server.cpp index d31e626034e..f355ce381fa 100644 --- a/cpp/test/Ice/timeout/Server.cpp +++ b/cpp/test/Ice/timeout/Server.cpp @@ -21,7 +21,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0) + ":udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = ICE_MAKE_SHARED(TimeoutI); - adapter->add(object, communicator->stringToIdentity("timeout")); + adapter->add(object, Ice::stringToIdentity("timeout")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/udp/Server.cpp b/cpp/test/Ice/udp/Server.cpp index 77abcdf2d03..9574f504ed7 100644 --- a/cpp/test/Ice/udp/Server.cpp +++ b/cpp/test/Ice/udp/Server.cpp @@ -26,14 +26,14 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) os << "tcp -p " << (12010 + num); properties->setProperty("ControlAdapter.Endpoints", os.str()); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("ControlAdapter"); - adapter->add(ICE_MAKE_SHARED(TestIntfI), communicator->stringToIdentity("control")); + adapter->add(ICE_MAKE_SHARED(TestIntfI), Ice::stringToIdentity("control")); adapter->activate(); if(num == 0) { properties->setProperty("TestAdapter.Endpoints", "udp -p 12010"); Ice::ObjectAdapterPtr adapter2 = communicator->createObjectAdapter("TestAdapter"); - adapter2->add(ICE_MAKE_SHARED(TestIntfI), communicator->stringToIdentity("test")); + adapter2->add(ICE_MAKE_SHARED(TestIntfI), Ice::stringToIdentity("test")); adapter2->activate(); } @@ -52,7 +52,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) } properties->setProperty("McastTestAdapter.Endpoints", endpoint); Ice::ObjectAdapterPtr mcastAdapter = communicator->createObjectAdapter("McastTestAdapter"); - mcastAdapter->add(ICE_MAKE_SHARED(TestIntfI), communicator->stringToIdentity("test")); + mcastAdapter->add(ICE_MAKE_SHARED(TestIntfI), Ice::stringToIdentity("test")); mcastAdapter->activate(); TEST_READY |