7 files changed, 12 insertions, 12 deletions
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.