7 files changed, 35 insertions, 37 deletions
diff --git a/Limber/Server/ServerFromClientSession.cpp b/Limber/Server/ServerFromClientSession.cpp
index e8d0769..f2a3659 100644
--- a/Limber/Server/ServerFromClientSession.cpp
+++ b/Limber/Server/ServerFromClientSession.cpp
@@ -6,8 +6,9 @@
 
 #include <Limber/Server/ServerFromClientSession.h>
 
+#include <memory>
+
 #include <boost/bind.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
 
 #include <Swiften/Elements/AuthFailure.h>
 #include <Swiften/Elements/AuthRequest.h>
@@ -27,7 +28,7 @@ namespace Swift {
 
 ServerFromClientSession::ServerFromClientSession(
         const std::string& id,
-        boost::shared_ptr<Connection> connection,
+        std::shared_ptr<Connection> connection,
         PayloadParserFactoryCollection* payloadParserFactories,
         PayloadSerializerCollection* payloadSerializers,
         XMLParserFactory* xmlParserFactory,
@@ -41,7 +42,7 @@ ServerFromClientSession::ServerFromClientSession(
 }
 
 
-void ServerFromClientSession::handleElement(boost::shared_ptr<ToplevelElement> element) {
+void ServerFromClientSession::handleElement(std::shared_ptr<ToplevelElement> element) {
     if (isInitialized()) {
         onElementReceived(element);
     }
@@ -49,33 +50,33 @@ void ServerFromClientSession::handleElement(boost::shared_ptr<ToplevelElement> e
         if (AuthRequest* authRequest = dynamic_cast<AuthRequest*>(element.get())) {
             if (authRequest->getMechanism() == "PLAIN" || (allowSASLEXTERNAL && authRequest->getMechanism() == "EXTERNAL")) {
                 if (authRequest->getMechanism() == "EXTERNAL") {
-                        getXMPPLayer()->writeElement(boost::make_shared<AuthSuccess>());
+                        getXMPPLayer()->writeElement(std::make_shared<AuthSuccess>());
                         authenticated_ = true;
                         getXMPPLayer()->resetParser();
                 }
                 else {
                     PLAINMessage plainMessage(authRequest->getMessage() ? *authRequest->getMessage() : createSafeByteArray(""));
                     if (userRegistry_->isValidUserPassword(JID(plainMessage.getAuthenticationID(), getLocalJID().getDomain()), plainMessage.getPassword())) {
-                        getXMPPLayer()->writeElement(boost::make_shared<AuthSuccess>());
+                        getXMPPLayer()->writeElement(std::make_shared<AuthSuccess>());
                         user_ = plainMessage.getAuthenticationID();
                         authenticated_ = true;
                         getXMPPLayer()->resetParser();
                     }
                     else {
-                        getXMPPLayer()->writeElement(boost::shared_ptr<AuthFailure>(new AuthFailure));
+                        getXMPPLayer()->writeElement(std::shared_ptr<AuthFailure>(new AuthFailure));
                         finishSession(AuthenticationFailedError);
                     }
                 }
             }
             else {
-                getXMPPLayer()->writeElement(boost::shared_ptr<AuthFailure>(new AuthFailure));
+                getXMPPLayer()->writeElement(std::shared_ptr<AuthFailure>(new AuthFailure));
                 finishSession(NoSupportedAuthMechanismsError);
             }
         }
         else if (IQ* iq = dynamic_cast<IQ*>(element.get())) {
-            if (boost::shared_ptr<ResourceBind> resourceBind = iq->getPayload<ResourceBind>()) {
+            if (std::shared_ptr<ResourceBind> resourceBind = iq->getPayload<ResourceBind>()) {
                 setRemoteJID(JID(user_, getLocalJID().getDomain(), resourceBind->getResource()));
-                boost::shared_ptr<ResourceBind> resultResourceBind(new ResourceBind());
+                std::shared_ptr<ResourceBind> resultResourceBind(new ResourceBind());
                 resultResourceBind->setJID(getRemoteJID());
                 getXMPPLayer()->writeElement(IQ::createResult(JID(), iq->getID(), resultResourceBind));
             }
@@ -94,7 +95,7 @@ void ServerFromClientSession::handleStreamStart(const ProtocolHeader& incomingHe
     header.setID(id_);
     getXMPPLayer()->writeHeader(header);
 
-    boost::shared_ptr<StreamFeatures> features(new StreamFeatures());
+    std::shared_ptr<StreamFeatures> features(new StreamFeatures());
     if (!authenticated_) {
         features->addAuthenticationMechanism("PLAIN");
         if (allowSASLEXTERNAL) {
diff --git a/Limber/Server/ServerFromClientSession.h b/Limber/Server/ServerFromClientSession.h
index 34d4f18..feba96a 100644
--- a/Limber/Server/ServerFromClientSession.h
+++ b/Limber/Server/ServerFromClientSession.h
@@ -6,11 +6,9 @@
 
 #pragma once
 
+#include <memory>
 #include <string>
 
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/shared_ptr.hpp>
-
 #include <Swiften/Base/ByteArray.h>
 #include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/JID/JID.h>
@@ -34,7 +32,7 @@ namespace Swift {
         public:
             ServerFromClientSession(
                     const std::string& id,
-                    boost::shared_ptr<Connection> connection,
+                    std::shared_ptr<Connection> connection,
                     PayloadParserFactoryCollection* payloadParserFactories,
                     PayloadSerializerCollection* payloadSerializers,
                     XMLParserFactory* xmlParserFactory,
@@ -44,7 +42,7 @@ namespace Swift {
             void setAllowSASLEXTERNAL();
 
         private:
-            void handleElement(boost::shared_ptr<ToplevelElement>);
+            void handleElement(std::shared_ptr<ToplevelElement>);
             void handleStreamStart(const ProtocolHeader& header);
 
             void setInitialized();
diff --git a/Limber/Server/ServerSession.h b/Limber/Server/ServerSession.h
index 9b784ac..0b39d7c 100644
--- a/Limber/Server/ServerSession.h
+++ b/Limber/Server/ServerSession.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include <Swiften/Elements/Stanza.h>
 
@@ -18,6 +18,6 @@ namespace Swift {
             virtual const JID& getJID() const = 0;
             virtual int getPriority() const = 0;
 
-            virtual void sendStanza(boost::shared_ptr<Stanza>) = 0;
+            virtual void sendStanza(std::shared_ptr<Stanza>) = 0;
     };
 }
diff --git a/Limber/Server/ServerStanzaRouter.cpp b/Limber/Server/ServerStanzaRouter.cpp
index 3ab88e1..b7ccca8 100644
--- a/Limber/Server/ServerStanzaRouter.cpp
+++ b/Limber/Server/ServerStanzaRouter.cpp
@@ -34,7 +34,7 @@ namespace {
 ServerStanzaRouter::ServerStanzaRouter() {
 }
 
-bool ServerStanzaRouter::routeStanza(boost::shared_ptr<Stanza> stanza) {
+bool ServerStanzaRouter::routeStanza(std::shared_ptr<Stanza> stanza) {
     JID to = stanza->getTo();
     assert(to.isValid());
 
diff --git a/Limber/Server/ServerStanzaRouter.h b/Limber/Server/ServerStanzaRouter.h
index 174f509..04192ba 100644
--- a/Limber/Server/ServerStanzaRouter.h
+++ b/Limber/Server/ServerStanzaRouter.h
@@ -7,8 +7,7 @@
 #pragma once
 
 #include <map>
-
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include <Swiften/Elements/Stanza.h>
 #include <Swiften/JID/JID.h>
@@ -20,7 +19,7 @@ namespace Swift {
         public:
             ServerStanzaRouter();
 
-            bool routeStanza(boost::shared_ptr<Stanza>);
+            bool routeStanza(std::shared_ptr<Stanza>);
 
             void addClientSession(ServerSession*);
             void removeClientSession(ServerSession*);
diff --git a/Limber/Server/UnitTest/ServerStanzaRouterTest.cpp b/Limber/Server/UnitTest/ServerStanzaRouterTest.cpp
index a234038..5f34d92 100644
--- a/Limber/Server/UnitTest/ServerStanzaRouterTest.cpp
+++ b/Limber/Server/UnitTest/ServerStanzaRouterTest.cpp
@@ -125,8 +125,8 @@ class ServerStanzaRouterTest : public CppUnit::TestFixture {
         }
 
     private:
-        boost::shared_ptr<Message> createMessageTo(const std::string& recipient) {
-            boost::shared_ptr<Message> message(new Message());
+        std::shared_ptr<Message> createMessageTo(const std::string& recipient) {
+            std::shared_ptr<Message> message(new Message());
             message->setTo(JID(recipient));
             return message;
         }
@@ -138,13 +138,13 @@ class ServerStanzaRouterTest : public CppUnit::TestFixture {
                 virtual const JID& getJID() const { return jid; }
                 virtual int getPriority() const { return priority; }
 
-                virtual void sendStanza(boost::shared_ptr<Stanza> stanza) {
+                virtual void sendStanza(std::shared_ptr<Stanza> stanza) {
                     sentStanzas.push_back(stanza);
                 }
 
                 JID jid;
                 int priority;
-                std::vector< boost::shared_ptr<Stanza> > sentStanzas;
+                std::vector< std::shared_ptr<Stanza> > sentStanzas;
         };
 };
 
diff --git a/Limber/main.cpp b/Limber/main.cpp
index 52f9347..26cb8d6 100644
--- a/Limber/main.cpp
+++ b/Limber/main.cpp
@@ -4,10 +4,10 @@
  * See the COPYING file for more information.
  */
 
+#include <memory>
 #include <string>
 
 #include <boost/bind.hpp>
-#include <boost/shared_ptr.hpp>
 
 #include <Swiften/Base/IDGenerator.h>
 #include <Swiften/Elements/IQ.h>
@@ -39,20 +39,20 @@ class Server {
         }
 
     private:
-        void handleNewConnection(boost::shared_ptr<Connection> c) {
-            boost::shared_ptr<ServerFromClientSession> session(new ServerFromClientSession(idGenerator_.generateID(), c, &payloadParserFactories_, &payloadSerializers_, &xmlParserFactory, userRegistry_));
+        void handleNewConnection(std::shared_ptr<Connection> c) {
+            std::shared_ptr<ServerFromClientSession> session(new ServerFromClientSession(idGenerator_.generateID(), c, &payloadParserFactories_, &payloadSerializers_, &xmlParserFactory, userRegistry_));
             serverFromClientSessions_.push_back(session);
             session->onElementReceived.connect(boost::bind(&Server::handleElementReceived, this, _1, session));
             session->onSessionFinished.connect(boost::bind(&Server::handleSessionFinished, this, session));
             session->startSession();
         }
 
-        void handleSessionFinished(boost::shared_ptr<ServerFromClientSession> session) {
+        void handleSessionFinished(std::shared_ptr<ServerFromClientSession> session) {
             serverFromClientSessions_.erase(std::remove(serverFromClientSessions_.begin(), serverFromClientSessions_.end(), session), serverFromClientSessions_.end());
         }
 
-        void handleElementReceived(boost::shared_ptr<ToplevelElement> element, boost::shared_ptr<ServerFromClientSession> session) {
-            boost::shared_ptr<Stanza> stanza(boost::dynamic_pointer_cast<Stanza>(element));
+        void handleElementReceived(std::shared_ptr<ToplevelElement> element, std::shared_ptr<ServerFromClientSession> session) {
+            std::shared_ptr<Stanza> stanza(std::dynamic_pointer_cast<Stanza>(element));
             if (!stanza) {
                 return;
             }
@@ -61,13 +61,13 @@ class Server {
                 stanza->setTo(JID(session->getLocalJID()));
             }
             if (!stanza->getTo().isValid() || stanza->getTo() == session->getLocalJID() || stanza->getTo() == session->getRemoteJID().toBare()) {
-                if (boost::shared_ptr<IQ> iq = boost::dynamic_pointer_cast<IQ>(stanza)) {
+                if (std::shared_ptr<IQ> iq = std::dynamic_pointer_cast<IQ>(stanza)) {
                     if (iq->getPayload<RosterPayload>()) {
-                        session->sendElement(IQ::createResult(iq->getFrom(), iq->getID(), boost::make_shared<RosterPayload>()));
+                        session->sendElement(IQ::createResult(iq->getFrom(), iq->getID(), std::make_shared<RosterPayload>()));
                     }
                     if (iq->getPayload<VCard>()) {
                         if (iq->getType() == IQ::Get) {
-                            boost::shared_ptr<VCard> vcard(new VCard());
+                            std::shared_ptr<VCard> vcard(new VCard());
                             vcard->setNickname(iq->getFrom().getNode());
                             session->sendElement(IQ::createResult(iq->getFrom(), iq->getID(), vcard));
                         }
@@ -87,8 +87,8 @@ class Server {
         PlatformXMLParserFactory xmlParserFactory;
         UserRegistry* userRegistry_;
         BoostIOServiceThread boostIOServiceThread_;
-        boost::shared_ptr<BoostConnectionServer> serverFromClientConnectionServer_;
-        std::vector< boost::shared_ptr<ServerFromClientSession> > serverFromClientSessions_;
+        std::shared_ptr<BoostConnectionServer> serverFromClientConnectionServer_;
+        std::vector< std::shared_ptr<ServerFromClientSession> > serverFromClientSessions_;
         FullPayloadParserFactoryCollection payloadParserFactories_;
         FullPayloadSerializerCollection payloadSerializers_;
 };