6 files changed, 10 insertions, 12 deletions
diff --git a/Swiften/Parser/Tree/NullParserElement.cpp b/Swiften/Parser/Tree/NullParserElement.cpp
index 4a2db8f..7b52926 100644
--- a/Swiften/Parser/Tree/NullParserElement.cpp
+++ b/Swiften/Parser/Tree/NullParserElement.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -8,6 +8,6 @@
 
 namespace Swift {
 
-boost::shared_ptr<NullParserElement> NullParserElement::element = boost::make_shared<NullParserElement>();
+std::shared_ptr<NullParserElement> NullParserElement::element = std::make_shared<NullParserElement>();
 
 }
diff --git a/Swiften/Parser/Tree/NullParserElement.h b/Swiften/Parser/Tree/NullParserElement.h
index 8dae25d..320e098 100644
--- a/Swiften/Parser/Tree/NullParserElement.h
+++ b/Swiften/Parser/Tree/NullParserElement.h
@@ -18,6 +18,6 @@ namespace Swift {
 
             virtual operator bool() { return false; }
 
-            static boost::shared_ptr<NullParserElement> element;
+            static std::shared_ptr<NullParserElement> element;
     };
 }
diff --git a/Swiften/Parser/Tree/ParserElement.cpp b/Swiften/Parser/Tree/ParserElement.cpp
index 6bbd93e..27bd790 100644
--- a/Swiften/Parser/Tree/ParserElement.cpp
+++ b/Swiften/Parser/Tree/ParserElement.cpp
@@ -25,7 +25,7 @@ ParserElement::~ParserElement() {
 }
 
 ParserElement::ref ParserElement::addChild(const std::string& name, const std::string& xmlns, const AttributeMap& attributes) {
-    ParserElement::ref child = boost::make_shared<ParserElement>(name, xmlns, attributes);
+    ParserElement::ref child = std::make_shared<ParserElement>(name, xmlns, attributes);
     children_.push_back(child);
     return child;
 }
diff --git a/Swiften/Parser/Tree/ParserElement.h b/Swiften/Parser/Tree/ParserElement.h
index dc9f31c..cffd59a 100644
--- a/Swiften/Parser/Tree/ParserElement.h
+++ b/Swiften/Parser/Tree/ParserElement.h
@@ -7,12 +7,10 @@
 
 #pragma once
 
+#include <memory>
 #include <string>
 #include <vector>
 
-#include <boost/shared_ptr.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
-
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Parser/AttributeMap.h>
@@ -20,7 +18,7 @@
 namespace Swift {
     class SWIFTEN_API ParserElement {
         public:
-            typedef boost::shared_ptr<ParserElement> ref;
+            typedef std::shared_ptr<ParserElement> ref;
 
             ParserElement(const std::string& name, const std::string& xmlns, const AttributeMap& attributes);
             virtual ~ParserElement();
diff --git a/Swiften/Parser/Tree/TreeReparser.cpp b/Swiften/Parser/Tree/TreeReparser.cpp
index 269b2ea..7fc74cf 100644
--- a/Swiften/Parser/Tree/TreeReparser.cpp
+++ b/Swiften/Parser/Tree/TreeReparser.cpp
@@ -21,7 +21,7 @@ namespace Swift {
 
 typedef std::pair<ParserElement::ref, bool> ElementState;
 
-boost::shared_ptr<Payload> TreeReparser::parseTree(ParserElement::ref root, PayloadParserFactoryCollection* collection) {
+std::shared_ptr<Payload> TreeReparser::parseTree(ParserElement::ref root, PayloadParserFactoryCollection* collection) {
     PayloadParser* parser = collection->getPayloadParserFactory(root->getName(), root->getNamespace(), root->getAttributes())->createPayloadParser();
     std::deque<ElementState > stack;
     stack.push_back(ElementState(root, true));
@@ -41,7 +41,7 @@ boost::shared_ptr<Payload> TreeReparser::parseTree(ParserElement::ref root, Payl
 
     }
 
-    boost::shared_ptr<Payload> payload = parser->getPayload();
+    std::shared_ptr<Payload> payload = parser->getPayload();
     delete parser;
     return payload;
 }
diff --git a/Swiften/Parser/Tree/TreeReparser.h b/Swiften/Parser/Tree/TreeReparser.h
index fb96c1b..435922b 100644
--- a/Swiften/Parser/Tree/TreeReparser.h
+++ b/Swiften/Parser/Tree/TreeReparser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2015 Isode Limited.
+ * Copyright (c) 2011-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -14,7 +14,7 @@ namespace Swift {
     class PayloadParserFactoryCollection;
     class SWIFTEN_API TreeReparser {
         public:
-            static boost::shared_ptr<Payload> parseTree(ParserElement::ref root, PayloadParserFactoryCollection* collection);
+            static std::shared_ptr<Payload> parseTree(ParserElement::ref root, PayloadParserFactoryCollection* collection);
 
     };
 }