2 files changed, 32 insertions, 32 deletions
diff --git a/Swiften/LinkLocal/UnitTest/LinkLocalConnectorTest.cpp b/Swiften/LinkLocal/UnitTest/LinkLocalConnectorTest.cpp
index 3511f90..3c5e098 100644
--- a/Swiften/LinkLocal/UnitTest/LinkLocalConnectorTest.cpp
+++ b/Swiften/LinkLocal/UnitTest/LinkLocalConnectorTest.cpp
@@ -31,8 +31,8 @@ class LinkLocalConnectorTest : public CppUnit::TestFixture {
     public:
         void setUp() {
             eventLoop = new DummyEventLoop();
-            querier = boost::make_shared<FakeDNSSDQuerier>("rabbithole.local", eventLoop);
-            connection = boost::make_shared<FakeConnection>(eventLoop);
+            querier = std::make_shared<FakeDNSSDQuerier>("rabbithole.local", eventLoop);
+            connection = std::make_shared<FakeConnection>(eventLoop);
             connectFinished = false;
         }
 
@@ -42,7 +42,7 @@ class LinkLocalConnectorTest : public CppUnit::TestFixture {
         }
 
         void testConnect() {
-            boost::shared_ptr<LinkLocalConnector>
+            std::shared_ptr<LinkLocalConnector>
                     testling(createConnector("rabbithole.local", 1234));
             querier->setAddress("rabbithole.local", HostAddress("192.168.1.1"));
 
@@ -57,7 +57,7 @@ class LinkLocalConnectorTest : public CppUnit::TestFixture {
         }
 
         void testConnect_UnableToResolve() {
-            boost::shared_ptr<LinkLocalConnector>
+            std::shared_ptr<LinkLocalConnector>
                     testling(createConnector("rabbithole.local", 1234));
             querier->setAddress("rabbithole.local", boost::optional<HostAddress>());
 
@@ -70,7 +70,7 @@ class LinkLocalConnectorTest : public CppUnit::TestFixture {
         }
 
         void testConnect_UnableToConnect() {
-            boost::shared_ptr<LinkLocalConnector>
+            std::shared_ptr<LinkLocalConnector>
                     testling(createConnector("rabbithole.local", 1234));
             querier->setAddress("rabbithole.local", HostAddress("192.168.1.1"));
             connection->setError(Connection::ReadError);
@@ -84,7 +84,7 @@ class LinkLocalConnectorTest : public CppUnit::TestFixture {
         }
 
         void testCancel_DuringResolve() {
-            boost::shared_ptr<LinkLocalConnector>
+            std::shared_ptr<LinkLocalConnector>
                     testling(createConnector("rabbithole.local", 1234));
             testling->connect();
             eventLoop->processEvents();
@@ -99,7 +99,7 @@ class LinkLocalConnectorTest : public CppUnit::TestFixture {
         }
 
         void testCancel_DuringConnect() {
-            boost::shared_ptr<LinkLocalConnector>
+            std::shared_ptr<LinkLocalConnector>
                     testling(createConnector("rabbithole.local", 1234));
             querier->setAddress("rabbithole.local", HostAddress("192.168.1.1"));
             connection->setDelayConnect();
@@ -114,13 +114,13 @@ class LinkLocalConnectorTest : public CppUnit::TestFixture {
         }
 
     private:
-        boost::shared_ptr<LinkLocalConnector> createConnector(const std::string& hostname, int port) {
+        std::shared_ptr<LinkLocalConnector> createConnector(const std::string& hostname, int port) {
             LinkLocalService service(
                     DNSSDServiceID("myname", "local."),
                     DNSSDResolveServiceQuery::Result(
                         "myname._presence._tcp.local", hostname, port,
                         LinkLocalServiceInfo().toTXTRecord()));
-            boost::shared_ptr<LinkLocalConnector> result(
+            std::shared_ptr<LinkLocalConnector> result(
                     new LinkLocalConnector(service, querier, connection));
             result->onConnectFinished.connect(
                     boost::bind(&LinkLocalConnectorTest::handleConnected, this, _1));
@@ -134,8 +134,8 @@ class LinkLocalConnectorTest : public CppUnit::TestFixture {
 
     private:
         DummyEventLoop* eventLoop;
-        boost::shared_ptr<FakeDNSSDQuerier> querier;
-        boost::shared_ptr<FakeConnection> connection;
+        std::shared_ptr<FakeDNSSDQuerier> querier;
+        std::shared_ptr<FakeConnection> connection;
         bool connectFinished;
         bool connectError;
 };
diff --git a/Swiften/LinkLocal/UnitTest/LinkLocalServiceBrowserTest.cpp b/Swiften/LinkLocal/UnitTest/LinkLocalServiceBrowserTest.cpp
index 6d8ba97..a80d748 100644
--- a/Swiften/LinkLocal/UnitTest/LinkLocalServiceBrowserTest.cpp
+++ b/Swiften/LinkLocal/UnitTest/LinkLocalServiceBrowserTest.cpp
@@ -5,9 +5,9 @@
  */
 
 #include <map>
+#include <memory>
 
 #include <boost/bind.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
 
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
@@ -45,7 +45,7 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
     public:
         void setUp() {
             eventLoop = new DummyEventLoop();
-            querier = boost::make_shared<FakeDNSSDQuerier>("wonderland.lit", eventLoop);
+            querier = std::make_shared<FakeDNSSDQuerier>("wonderland.lit", eventLoop);
             aliceServiceID = new DNSSDServiceID("alice", "wonderland.lit");
             aliceServiceInfo = new DNSSDResolveServiceQuery::Result("_presence._tcp.wonderland.lit", "xmpp.wonderland.lit", 1234, LinkLocalServiceInfo().toTXTRecord());
             testServiceID = new DNSSDServiceID("foo", "bar.local");
@@ -70,14 +70,14 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
         }
 
         void testConstructor() {
-            boost::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
+            std::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
 
             CPPUNIT_ASSERT(!testling->isRunning());
             CPPUNIT_ASSERT(!testling->hasError());
         }
 
         void testStart() {
-            boost::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
+            std::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
             testling->start();
 
             CPPUNIT_ASSERT(testling->isRunning());
@@ -87,7 +87,7 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
         }
 
         void testServiceAdded() {
-            boost::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
+            std::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
             testling->start();
             eventLoop->processEvents();
 
@@ -109,7 +109,7 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
         }
 
         void testServiceAdded_NoServiceInfo() {
-            boost::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
+            std::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
             testling->start();
             eventLoop->processEvents();
 
@@ -123,7 +123,7 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
         }
 
         void testServiceAdded_RegisteredService() {
-            boost::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
+            std::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
             testling->start();
             eventLoop->processEvents();
 
@@ -140,7 +140,7 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
         }
 
         void testServiceAdded_UnregisteredService() {
-            boost::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
+            std::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
             testling->start();
             eventLoop->processEvents();
             testling->registerService("alice", 1234, LinkLocalServiceInfo());
@@ -166,7 +166,7 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
         }
 
         void testServiceRemoved_UnregisteredService() {
-            boost::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
+            std::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
             testling->start();
             eventLoop->processEvents();
             testling->registerService("alice", 1234, LinkLocalServiceInfo());
@@ -183,7 +183,7 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
         }
 
         void testServiceAdded_Twice() {
-            boost::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
+            std::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
             testling->start();
             eventLoop->processEvents();
 
@@ -208,7 +208,7 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
 
 
         void testServiceChanged() {
-            boost::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
+            std::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
             testling->start();
             querier->setServiceInfo(*testServiceID,*testServiceInfo);
             querier->addService(*testServiceID);
@@ -231,7 +231,7 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
         }
 
         void testServiceRemoved() {
-            boost::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
+            std::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
             testling->start();
             querier->setServiceInfo(*testServiceID,*testServiceInfo);
             querier->addService(*testServiceID);
@@ -252,7 +252,7 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
         }
 
         void testError_BrowseErrorAfterStart() {
-            boost::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
+            std::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
             testling->start();
 
             querier->setBrowseError();
@@ -264,7 +264,7 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
         }
 
         void testError_BrowseErrorAfterResolve() {
-            boost::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
+            std::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
             testling->start();
             querier->setServiceInfo(*testServiceID,*testServiceInfo);
             querier->addService(*testServiceID);
@@ -283,7 +283,7 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
         }
 
         void testRegisterService() {
-            boost::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
+            std::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
             testling->start();
             eventLoop->processEvents();
 
@@ -299,7 +299,7 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
         }
 
         void testRegisterService_Error() {
-            boost::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
+            std::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
             testling->start();
             LinkLocalServiceInfo info;
             testling->registerService("foo@bar", 1234, info);
@@ -315,7 +315,7 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
         }
 
         void testRegisterService_Reregister() {
-            boost::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
+            std::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
             testling->start();
             eventLoop->processEvents();
             LinkLocalServiceInfo info;
@@ -335,7 +335,7 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
         }
 
         void testUpdateService() {
-            boost::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
+            std::shared_ptr<LinkLocalServiceBrowser> testling = createTestling();
             testling->start();
             eventLoop->processEvents();
 
@@ -352,8 +352,8 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
         }
 
     private:
-        boost::shared_ptr<LinkLocalServiceBrowser> createTestling() {
-            boost::shared_ptr<LinkLocalServiceBrowser> testling(
+        std::shared_ptr<LinkLocalServiceBrowser> createTestling() {
+            std::shared_ptr<LinkLocalServiceBrowser> testling(
                     new LinkLocalServiceBrowser(querier));
             testling->onServiceAdded.connect(boost::bind(
                     &LinkLocalServiceBrowserTest::handleServiceAdded, this, _1));
@@ -397,7 +397,7 @@ class LinkLocalServiceBrowserTest : public CppUnit::TestFixture {
 
     private:
         DummyEventLoop* eventLoop;
-        boost::shared_ptr<FakeDNSSDQuerier> querier;
+        std::shared_ptr<FakeDNSSDQuerier> querier;
         std::vector<LinkLocalService> addedServices;
         std::vector<LinkLocalService> changedServices;
         std::vector<LinkLocalService> removedServices;