3 files changed, 21 insertions, 23 deletions
diff --git a/Swiften/QA/NetworkTest/BoostConnectionServerTest.cpp b/Swiften/QA/NetworkTest/BoostConnectionServerTest.cpp
index a415a0f..11b0eb5 100644
--- a/Swiften/QA/NetworkTest/BoostConnectionServerTest.cpp
+++ b/Swiften/QA/NetworkTest/BoostConnectionServerTest.cpp
@@ -1,13 +1,12 @@
 /*
- * Copyright (c) 2010-2015 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
+#include <memory>
 #include <string>
 
-#include <boost/shared_ptr.hpp>
-
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 
@@ -194,7 +193,7 @@ class BoostConnectionServerTest : public CppUnit::TestFixture {
             stoppedError_ = e;
         }
 
-        void handleNewConnection(boost::shared_ptr<Connection> connection) {
+        void handleNewConnection(std::shared_ptr<Connection> connection) {
             receivedNewConnection_ = true;
             remoteAddress_ = connection->getRemoteAddress();
         }
diff --git a/Swiften/QA/NetworkTest/BoostConnectionTest.cpp b/Swiften/QA/NetworkTest/BoostConnectionTest.cpp
index f09e1a7..12c4a77 100755
--- a/Swiften/QA/NetworkTest/BoostConnectionTest.cpp
+++ b/Swiften/QA/NetworkTest/BoostConnectionTest.cpp
@@ -4,11 +4,10 @@
  * See the COPYING file for more information.
  */
 
+#include <memory>
 #include <string>
 
 #include <boost/date_time/posix_time/posix_time_types.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
 
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
@@ -38,7 +37,7 @@ class BoostConnectionTest : public CppUnit::TestFixture {
         void setUp() {
             eventLoop_ = new DummyEventLoop();
             boostIOServiceThread_ = new BoostIOServiceThread();
-            boostIOService_ = boost::make_shared<boost::asio::io_service>();
+            boostIOService_ = std::make_shared<boost::asio::io_service>();
             disconnected_ = false;
             connectFinished_ = false;
         }
@@ -145,7 +144,7 @@ class BoostConnectionTest : public CppUnit::TestFixture {
             connection->write(createSafeByteArray("\r\n\r\n")); // Temporarily, while we don't have an xmpp server running on ipv6
         }
 
-        void handleDataRead(boost::shared_ptr<SafeByteArray> data) {
+        void handleDataRead(std::shared_ptr<SafeByteArray> data) {
             append(receivedData_, *data);
         }
 
@@ -159,7 +158,7 @@ class BoostConnectionTest : public CppUnit::TestFixture {
 
     private:
         BoostIOServiceThread* boostIOServiceThread_;
-        boost::shared_ptr<boost::asio::io_service> boostIOService_;
+        std::shared_ptr<boost::asio::io_service> boostIOService_;
         DummyEventLoop* eventLoop_;
         ByteArray receivedData_;
         bool disconnected_;
diff --git a/Swiften/QA/NetworkTest/DomainNameResolverTest.cpp b/Swiften/QA/NetworkTest/DomainNameResolverTest.cpp
index 05dd3a1..d45d118 100644
--- a/Swiften/QA/NetworkTest/DomainNameResolverTest.cpp
+++ b/Swiften/QA/NetworkTest/DomainNameResolverTest.cpp
@@ -67,7 +67,7 @@ class DomainNameResolverTest : public CppUnit::TestFixture {
         void setUp() {
             ioServiceThread = new BoostIOServiceThread();
             eventLoop = new DummyEventLoop();
-            idnConverter = boost::shared_ptr<IDNConverter>(PlatformIDNConverter::create());
+            idnConverter = std::shared_ptr<IDNConverter>(PlatformIDNConverter::create());
 #ifdef USE_UNBOUND
             resolver = new UnboundDomainNameResolver(idnConverter.get(), ioServiceThread->getIOService(), eventLoop);
 #else
@@ -83,7 +83,7 @@ class DomainNameResolverTest : public CppUnit::TestFixture {
         }
 
         void testResolveAddress() {
-            boost::shared_ptr<DomainNameAddressQuery> query(createAddressQuery("xmpp.test.swift.im"));
+            std::shared_ptr<DomainNameAddressQuery> query(createAddressQuery("xmpp.test.swift.im"));
 
             query->run();
             waitForResults();
@@ -94,7 +94,7 @@ class DomainNameResolverTest : public CppUnit::TestFixture {
         }
 
         void testResolveAddress_Error() {
-            boost::shared_ptr<DomainNameAddressQuery> query(createAddressQuery("invalid.test.swift.im"));
+            std::shared_ptr<DomainNameAddressQuery> query(createAddressQuery("invalid.test.swift.im"));
 
             query->run();
             waitForResults();
@@ -103,7 +103,7 @@ class DomainNameResolverTest : public CppUnit::TestFixture {
         }
 
         void testResolveAddress_IPv6() {
-            boost::shared_ptr<DomainNameAddressQuery> query(createAddressQuery("xmpp-ipv6.test.swift.im"));
+            std::shared_ptr<DomainNameAddressQuery> query(createAddressQuery("xmpp-ipv6.test.swift.im"));
 
             query->run();
             waitForResults();
@@ -113,7 +113,7 @@ class DomainNameResolverTest : public CppUnit::TestFixture {
         }
 
         void testResolveAddress_IPv4and6() {
-            boost::shared_ptr<DomainNameAddressQuery> query(createAddressQuery("xmpp-ipv46.test.swift.im"));
+            std::shared_ptr<DomainNameAddressQuery> query(createAddressQuery("xmpp-ipv46.test.swift.im"));
 
             query->run();
             waitForResults();
@@ -125,7 +125,7 @@ class DomainNameResolverTest : public CppUnit::TestFixture {
         }
 
         void testResolveAddress_International() {
-            boost::shared_ptr<DomainNameAddressQuery> query(createAddressQuery("tron\xc3\xa7on.test.swift.im"));
+            std::shared_ptr<DomainNameAddressQuery> query(createAddressQuery("tron\xc3\xa7on.test.swift.im"));
 
             query->run();
             waitForResults();
@@ -136,7 +136,7 @@ class DomainNameResolverTest : public CppUnit::TestFixture {
         }
 
         void testResolveAddress_Localhost() {
-            boost::shared_ptr<DomainNameAddressQuery> query(createAddressQuery("localhost"));
+            std::shared_ptr<DomainNameAddressQuery> query(createAddressQuery("localhost"));
 
             query->run();
             waitForResults();
@@ -172,7 +172,7 @@ class DomainNameResolverTest : public CppUnit::TestFixture {
         }
 
         void testResolveService() {
-            boost::shared_ptr<DomainNameServiceQuery> query(createServiceQuery("_xmpp-client._tcp.", "xmpp-srv.test.swift.im"));
+            std::shared_ptr<DomainNameServiceQuery> query(createServiceQuery("_xmpp-client._tcp.", "xmpp-srv.test.swift.im"));
 
             query->run();
             waitForResults();
@@ -200,8 +200,8 @@ class DomainNameResolverTest : public CppUnit::TestFixture {
         }
 
     private:
-            boost::shared_ptr<DomainNameAddressQuery> createAddressQuery(const std::string& domain) {
-                boost::shared_ptr<DomainNameAddressQuery> result = resolver->createAddressQuery(domain);
+            std::shared_ptr<DomainNameAddressQuery> createAddressQuery(const std::string& domain) {
+                std::shared_ptr<DomainNameAddressQuery> result = resolver->createAddressQuery(domain);
                 result->onResult.connect(boost::bind(&DomainNameResolverTest::handleAddressQueryResult, this, _1, _2));
                 return result;
             }
@@ -214,8 +214,8 @@ class DomainNameResolverTest : public CppUnit::TestFixture {
                 resultsAvailable = true;
             }
 
-            boost::shared_ptr<DomainNameServiceQuery> createServiceQuery(const std::string& serviceLookupPrefix, const std::string& domain) {
-                boost::shared_ptr<DomainNameServiceQuery> result = resolver->createServiceQuery(serviceLookupPrefix, domain);
+            std::shared_ptr<DomainNameServiceQuery> createServiceQuery(const std::string& serviceLookupPrefix, const std::string& domain) {
+                std::shared_ptr<DomainNameServiceQuery> result = resolver->createServiceQuery(serviceLookupPrefix, domain);
                 result->onResult.connect(boost::bind(&DomainNameResolverTest::handleServiceQueryResult, this, _1));
                 return result;
             }
@@ -241,8 +241,8 @@ class DomainNameResolverTest : public CppUnit::TestFixture {
     private:
         BoostIOServiceThread* ioServiceThread;
         DummyEventLoop* eventLoop;
-        boost::shared_ptr<IDNConverter> idnConverter;
-        boost::shared_ptr<TimerFactory> timerFactory;
+        std::shared_ptr<IDNConverter> idnConverter;
+        std::shared_ptr<TimerFactory> timerFactory;
         bool resultsAvailable;
         std::vector<HostAddress> addressQueryResult;
         std::vector<HostAddress> allAddressQueryResults;