1 files changed, 10 insertions, 10 deletions
diff --git a/cpp/test/IceBridge/simple/Server.cpp b/cpp/test/IceBridge/simple/Server.cpp
index 4b51e5d132b..c75ae99363b 100644
--- a/cpp/test/IceBridge/simple/Server.cpp
+++ b/cpp/test/IceBridge/simple/Server.cpp
@@ -8,31 +8,31 @@
 
 using namespace std;
 
-class Server : public Test::TestHelper
+class Server final : public Test::TestHelper
 {
 public:
 
-    void run(int, char**);
+    void run(int, char**) override;
 };
 
 void
 Server::run(int argc, char** argv)
 {
-    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    auto properties = createTestProperties(argc, argv);
     properties->setProperty("Ice.Warn.Dispatch", "0");
 
     // Make sure requests are serialized, this is required for the ordering test.
     properties->setProperty("Ice.ThreadPool.Server.Serialize", "1");
 
-    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints",
-                                               getTestEndpoint() + ":" +
-                                               getTestEndpoint("udp"));
-    Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
-    adapter->add(ICE_MAKE_SHARED(MyClassI), Ice::stringToIdentity("test"));
+    Ice::CommunicatorHolder communicatorHolder = initialize(argc, argv, properties);
+    communicatorHolder->getProperties()->setProperty("TestAdapter.Endpoints",
+                                                     getTestEndpoint() + ":" +
+                                                     getTestEndpoint("udp"));
+    auto adapter = communicatorHolder->createObjectAdapter("TestAdapter");
+    adapter->add(make_shared<MyClassI>(), Ice::stringToIdentity("test"));
     adapter->activate();
     serverReady();
-    communicator->waitForShutdown();
+    communicatorHolder->waitForShutdown();
 }
 
 DEFINE_TEST(Server)