5 files changed, 22 insertions, 23 deletions
diff --git a/Swiften/StreamManagement/StanzaAckRequester.cpp b/Swiften/StreamManagement/StanzaAckRequester.cpp
index ceafe28..8e9e7f3 100644
--- a/Swiften/StreamManagement/StanzaAckRequester.cpp
+++ b/Swiften/StreamManagement/StanzaAckRequester.cpp
@@ -20,9 +20,9 @@ StanzaAckRequester::StanzaAckRequester() : lastHandledStanzasCount(0) {
 
 }
 
-void StanzaAckRequester::handleStanzaSent(boost::shared_ptr<Stanza> stanza) {
+void StanzaAckRequester::handleStanzaSent(std::shared_ptr<Stanza> stanza) {
     unackedStanzas.push_back(stanza);
-    if (boost::dynamic_pointer_cast<Message>(stanza)) {
+    if (std::dynamic_pointer_cast<Message>(stanza)) {
         onRequestAck();
     }
 }
@@ -34,7 +34,7 @@ void StanzaAckRequester::handleAckReceived(unsigned int handledStanzasCount) {
             std::cerr << "Warning: Server acked more stanzas than we sent" << std::endl;
             break;
         }
-        boost::shared_ptr<Stanza> ackedStanza = unackedStanzas.front();
+        std::shared_ptr<Stanza> ackedStanza = unackedStanzas.front();
         unackedStanzas.pop_front();
         onStanzaAcked(ackedStanza);
         i = (i == MAX_HANDLED_STANZA_COUNT ? 0 : i + 1);
diff --git a/Swiften/StreamManagement/StanzaAckRequester.h b/Swiften/StreamManagement/StanzaAckRequester.h
index 4d913bb..dda1395 100644
--- a/Swiften/StreamManagement/StanzaAckRequester.h
+++ b/Swiften/StreamManagement/StanzaAckRequester.h
@@ -7,8 +7,7 @@
 #pragma once
 
 #include <deque>
-
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/boost_bsignals.h>
@@ -19,17 +18,17 @@ namespace Swift {
         public:
             StanzaAckRequester();
 
-            void handleStanzaSent(boost::shared_ptr<Stanza> stanza);
+            void handleStanzaSent(std::shared_ptr<Stanza> stanza);
             void handleAckReceived(unsigned int handledStanzasCount);
 
         public:
             boost::signal<void ()> onRequestAck;
-            boost::signal<void (boost::shared_ptr<Stanza>)> onStanzaAcked;
+            boost::signal<void (std::shared_ptr<Stanza>)> onStanzaAcked;
 
         private:
             friend class StanzaAckRequesterTest;
             unsigned int lastHandledStanzasCount;
-            std::deque<boost::shared_ptr<Stanza> > unackedStanzas;
+            std::deque<std::shared_ptr<Stanza> > unackedStanzas;
     };
 
 }
diff --git a/Swiften/StreamManagement/StanzaAckResponder.h b/Swiften/StreamManagement/StanzaAckResponder.h
index 16c8825..389606e 100644
--- a/Swiften/StreamManagement/StanzaAckResponder.h
+++ b/Swiften/StreamManagement/StanzaAckResponder.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/boost_bsignals.h>
diff --git a/Swiften/StreamManagement/UnitTest/StanzaAckRequesterTest.cpp b/Swiften/StreamManagement/UnitTest/StanzaAckRequesterTest.cpp
index 55e6012..b1bc7c2 100644
--- a/Swiften/StreamManagement/UnitTest/StanzaAckRequesterTest.cpp
+++ b/Swiften/StreamManagement/UnitTest/StanzaAckRequesterTest.cpp
@@ -37,28 +37,28 @@ class StanzaAckRequesterTest : public CppUnit::TestFixture {
         }
 
         void testHandleStanzaSent_MessageRequestsAck() {
-            boost::shared_ptr<StanzaAckRequester> testling(createRequester());
+            std::shared_ptr<StanzaAckRequester> testling(createRequester());
             testling->handleStanzaSent(createMessage("m1"));
 
             CPPUNIT_ASSERT_EQUAL(1, acksRequested);
         }
 
         void testHandleStanzaSent_IQDoesNotRequestAck() {
-            boost::shared_ptr<StanzaAckRequester> testling(createRequester());
+            std::shared_ptr<StanzaAckRequester> testling(createRequester());
             testling->handleStanzaSent(createIQ("iq1"));
 
             CPPUNIT_ASSERT_EQUAL(0, acksRequested);
         }
 
         void testHandleStanzaSent_PresenceDoesNotRequestAck() {
-            boost::shared_ptr<StanzaAckRequester> testling(createRequester());
+            std::shared_ptr<StanzaAckRequester> testling(createRequester());
             testling->handleStanzaSent(createPresence("p1"));
 
             CPPUNIT_ASSERT_EQUAL(0, acksRequested);
         }
 
         void testHandleAckReceived_AcksStanza() {
-            boost::shared_ptr<StanzaAckRequester> testling(createRequester());
+            std::shared_ptr<StanzaAckRequester> testling(createRequester());
             testling->handleStanzaSent(createMessage("m1"));
 
             testling->handleAckReceived(1);
@@ -68,7 +68,7 @@ class StanzaAckRequesterTest : public CppUnit::TestFixture {
         }
 
         void testHandleAckReceived_AcksMultipleMessages() {
-            boost::shared_ptr<StanzaAckRequester> testling(createRequester());
+            std::shared_ptr<StanzaAckRequester> testling(createRequester());
             testling->handleStanzaSent(createMessage("m1"));
             testling->handleStanzaSent(createMessage("m2"));
 
@@ -80,7 +80,7 @@ class StanzaAckRequesterTest : public CppUnit::TestFixture {
         }
 
         void testHandleAckReceived_AcksMultipleStanzas() {
-            boost::shared_ptr<StanzaAckRequester> testling(createRequester());
+            std::shared_ptr<StanzaAckRequester> testling(createRequester());
             testling->handleStanzaSent(createIQ("iq1"));
             testling->handleStanzaSent(createPresence("p1"));
             testling->handleStanzaSent(createMessage("m1"));
@@ -94,7 +94,7 @@ class StanzaAckRequesterTest : public CppUnit::TestFixture {
         }
 
         void testHandleAckReceived_MultipleAcks() {
-            boost::shared_ptr<StanzaAckRequester> testling(createRequester());
+            std::shared_ptr<StanzaAckRequester> testling(createRequester());
             testling->handleStanzaSent(createMessage("m1"));
             testling->handleAckReceived(1);
 
@@ -110,7 +110,7 @@ class StanzaAckRequesterTest : public CppUnit::TestFixture {
 
         // Handle stanza ack count wrapping, as per the XEP
         void testHandleAckReceived_WrapAround() {
-            boost::shared_ptr<StanzaAckRequester> testling(createRequester());
+            std::shared_ptr<StanzaAckRequester> testling(createRequester());
             testling->lastHandledStanzasCount = boost::numeric_cast<unsigned int>((1ULL<<32) - 1);
             testling->handleStanzaSent(createMessage("m1"));
             testling->handleStanzaSent(createMessage("m2"));
@@ -152,13 +152,13 @@ class StanzaAckRequesterTest : public CppUnit::TestFixture {
             acksRequested++;
         }
 
-        void handleStanzaAcked(boost::shared_ptr<Stanza> stanza) {
+        void handleStanzaAcked(std::shared_ptr<Stanza> stanza) {
             ackedStanzas.push_back(stanza);
         }
 
     private:
         int acksRequested;
-        std::vector< boost::shared_ptr<Stanza> > ackedStanzas;
+        std::vector< std::shared_ptr<Stanza> > ackedStanzas;
 };
 
 }
diff --git a/Swiften/StreamManagement/UnitTest/StanzaAckResponderTest.cpp b/Swiften/StreamManagement/UnitTest/StanzaAckResponderTest.cpp
index 70cd8fc..ffdabe9 100644
--- a/Swiften/StreamManagement/UnitTest/StanzaAckResponderTest.cpp
+++ b/Swiften/StreamManagement/UnitTest/StanzaAckResponderTest.cpp
@@ -27,7 +27,7 @@ class StanzaAckResponderTest : public CppUnit::TestFixture {
 
     public:
         void testHandleAckRequestReceived_AcksStanza() {
-            boost::shared_ptr<StanzaAckResponder> testling(createResponder());
+            std::shared_ptr<StanzaAckResponder> testling(createResponder());
             testling->handleStanzaReceived();
 
             testling->handleAckRequestReceived();
@@ -37,7 +37,7 @@ class StanzaAckResponderTest : public CppUnit::TestFixture {
         }
 
         void testHandleAckRequestReceived_AcksMultipleStanzas() {
-            boost::shared_ptr<StanzaAckResponder> testling(createResponder());
+            std::shared_ptr<StanzaAckResponder> testling(createResponder());
             testling->handleStanzaReceived();
             testling->handleStanzaReceived();
 
@@ -48,7 +48,7 @@ class StanzaAckResponderTest : public CppUnit::TestFixture {
         }
 
         void testHandleAckRequestReceived_MultipleAcks() {
-            boost::shared_ptr<StanzaAckResponder> testling(createResponder());
+            std::shared_ptr<StanzaAckResponder> testling(createResponder());
             testling->handleStanzaReceived();
             testling->handleAckRequestReceived();
 
@@ -62,7 +62,7 @@ class StanzaAckResponderTest : public CppUnit::TestFixture {
 
         // Handle stanza ack count wrapping, as per the XEP
         void testHandleAckRequestReceived_WrapAround() {
-            boost::shared_ptr<StanzaAckResponder> testling(createResponder());
+            std::shared_ptr<StanzaAckResponder> testling(createResponder());
             testling->handledStanzasCount = boost::numeric_cast<unsigned int>((1ULL<<32) - 1);
             testling->handleStanzaReceived();
             testling->handleStanzaReceived();