3 files changed, 12 insertions, 12 deletions
diff --git a/Swiften/PubSub/PubSubManager.h b/Swiften/PubSub/PubSubManager.h
index daed7e5..c143a81 100644
--- a/Swiften/PubSub/PubSubManager.h
+++ b/Swiften/PubSub/PubSubManager.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/Override.h>
@@ -34,8 +34,8 @@
 #include <Swiften/PubSub/PubSubUtil.h>
 #include <Swiften/Queries/PubSubRequest.h>
 #define SWIFTEN_PUBSUBMANAGER_DECLARE_CREATE_REQUEST(payload, container, response) \
-    virtual boost::shared_ptr< PubSubRequest<payload> >  \
-        createRequest(IQ::Type, const JID&, boost::shared_ptr<payload>) = 0;
+    virtual std::shared_ptr< PubSubRequest<payload> >  \
+        createRequest(IQ::Type, const JID&, std::shared_ptr<payload>) = 0;
 
 namespace Swift {
     class JID;
@@ -47,6 +47,6 @@ namespace Swift {
             SWIFTEN_PUBSUB_FOREACH_PUBSUB_PAYLOAD_TYPE(
                     SWIFTEN_PUBSUBMANAGER_DECLARE_CREATE_REQUEST)
 
-            boost::signal<void (const JID&, const boost::shared_ptr<PubSubEventPayload>)> onEvent;
+            boost::signal<void (const JID&, const std::shared_ptr<PubSubEventPayload>)> onEvent;
     };
 }
diff --git a/Swiften/PubSub/PubSubManagerImpl.cpp b/Swiften/PubSub/PubSubManagerImpl.cpp
index b186a08..12eb25c 100644
--- a/Swiften/PubSub/PubSubManagerImpl.cpp
+++ b/Swiften/PubSub/PubSubManagerImpl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -24,8 +24,8 @@ PubSubManagerImpl::~PubSubManagerImpl() {
     stanzaChannel->onMessageReceived.disconnect(boost::bind(&PubSubManagerImpl::handleMessageRecevied, this, _1));
 }
 
-void PubSubManagerImpl::handleMessageRecevied(boost::shared_ptr<Message> message) {
-    if (boost::shared_ptr<PubSubEvent> event = message->getPayload<PubSubEvent>()) {
+void PubSubManagerImpl::handleMessageRecevied(std::shared_ptr<Message> message) {
+    if (std::shared_ptr<PubSubEvent> event = message->getPayload<PubSubEvent>()) {
         onEvent(message->getFrom(), event->getPayload());
     }
 }
diff --git a/Swiften/PubSub/PubSubManagerImpl.h b/Swiften/PubSub/PubSubManagerImpl.h
index c752b84..58c5fc0 100644
--- a/Swiften/PubSub/PubSubManagerImpl.h
+++ b/Swiften/PubSub/PubSubManagerImpl.h
@@ -6,15 +6,15 @@
 
 #pragma once
 
-#include <boost/smart_ptr/make_shared.hpp>
+#include <memory>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/Override.h>
 #include <Swiften/PubSub/PubSubManager.h>
 #define SWIFTEN_PUBSUBMANAGERIMPL_DECLARE_CREATE_REQUEST(payload, container, response) \
-    virtual boost::shared_ptr< PubSubRequest<payload> >  \
-            createRequest(IQ::Type type, const JID& receiver, boost::shared_ptr<payload> p) SWIFTEN_OVERRIDE { \
-        return boost::make_shared< PubSubRequest<payload> >(type, receiver, p, router); \
+    virtual std::shared_ptr< PubSubRequest<payload> >  \
+            createRequest(IQ::Type type, const JID& receiver, std::shared_ptr<payload> p) SWIFTEN_OVERRIDE { \
+        return std::make_shared< PubSubRequest<payload> >(type, receiver, p, router); \
     }
 
 namespace Swift {
@@ -31,7 +31,7 @@ namespace Swift {
                     SWIFTEN_PUBSUBMANAGERIMPL_DECLARE_CREATE_REQUEST)
 
         private:
-            void handleMessageRecevied(boost::shared_ptr<Message>);
+            void handleMessageRecevied(std::shared_ptr<Message>);
 
         private:
             StanzaChannel* stanzaChannel;