4 files changed, 15 insertions, 16 deletions
diff --git a/Swiften/Serializer/XML/UnitTest/XMLElementTest.cpp b/Swiften/Serializer/XML/UnitTest/XMLElementTest.cpp
index edd1b0e..ed3f8ab 100644
--- a/Swiften/Serializer/XML/UnitTest/XMLElementTest.cpp
+++ b/Swiften/Serializer/XML/UnitTest/XMLElementTest.cpp
@@ -4,7 +4,7 @@
  * See the COPYING file for more information.
  */
 
-#include <boost/smart_ptr/make_shared.hpp>
+#include <memory>
 
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
@@ -29,11 +29,11 @@ class XMLElementTest : public CppUnit::TestFixture
         void testSerialize() {
             XMLElement testling("foo", "http://example.com");
             testling.setAttribute("myatt", "myval");
-            boost::shared_ptr<XMLElement> barElement(new XMLElement("bar"));
-            barElement->addNode(boost::make_shared<XMLTextNode>("Blo"));
+            std::shared_ptr<XMLElement> barElement(new XMLElement("bar"));
+            barElement->addNode(std::make_shared<XMLTextNode>("Blo"));
             testling.addNode(barElement);
-            boost::shared_ptr<XMLElement> bazElement(new XMLElement("baz"));
-            bazElement->addNode(boost::make_shared<XMLTextNode>("Bli&</stream>"));
+            std::shared_ptr<XMLElement> bazElement(new XMLElement("baz"));
+            bazElement->addNode(std::make_shared<XMLTextNode>("Bli&</stream>"));
             testling.addNode(bazElement);
 
             std::string result = testling.serialize();
diff --git a/Swiften/Serializer/XML/XMLElement.cpp b/Swiften/Serializer/XML/XMLElement.cpp
index fc5e470..4a874ab 100644
--- a/Swiften/Serializer/XML/XMLElement.cpp
+++ b/Swiften/Serializer/XML/XMLElement.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -30,7 +30,7 @@ std::string XMLElement::serialize() {
 
     if (!childNodes_.empty()) {
         result += ">";
-        foreach (boost::shared_ptr<XMLNode> node, childNodes_) {
+        foreach (std::shared_ptr<XMLNode> node, childNodes_) {
             result += node->serialize();
         }
         result += "</" + tag_ + ">";
@@ -51,7 +51,7 @@ void XMLElement::setAttribute(const std::string& attribute, const std::string& v
     attributes_[attribute] = escapedValue;
 }
 
-void XMLElement::addNode(boost::shared_ptr<XMLNode> node) {
+void XMLElement::addNode(std::shared_ptr<XMLNode> node) {
     if (node) {
         childNodes_.push_back(node);
     }
diff --git a/Swiften/Serializer/XML/XMLElement.h b/Swiften/Serializer/XML/XMLElement.h
index e7507f2..54de041 100644
--- a/Swiften/Serializer/XML/XMLElement.h
+++ b/Swiften/Serializer/XML/XMLElement.h
@@ -7,29 +7,28 @@
 #pragma once
 
 #include <map>
+#include <memory>
 #include <string>
 #include <vector>
 
-#include <boost/shared_ptr.hpp>
-
 #include <Swiften/Base/API.h>
 #include <Swiften/Serializer/XML/XMLNode.h>
 
 namespace Swift {
     class SWIFTEN_API XMLElement : public XMLNode {
         public:
-            typedef boost::shared_ptr<XMLElement> ref;
+            typedef std::shared_ptr<XMLElement> ref;
 
             XMLElement(const std::string& tag, const std::string& xmlns = "", const std::string& text = "");
 
             void setAttribute(const std::string& attribute, const std::string& value);
-            void addNode(boost::shared_ptr<XMLNode> node);
+            void addNode(std::shared_ptr<XMLNode> node);
 
             virtual std::string serialize();
 
         private:
             std::string tag_;
             std::map<std::string, std::string> attributes_;
-            std::vector< boost::shared_ptr<XMLNode> > childNodes_;
+            std::vector< std::shared_ptr<XMLNode> > childNodes_;
     };
 }
diff --git a/Swiften/Serializer/XML/XMLTextNode.h b/Swiften/Serializer/XML/XMLTextNode.h
index b0f8d01..44970bf 100644
--- a/Swiften/Serializer/XML/XMLTextNode.h
+++ b/Swiften/Serializer/XML/XMLTextNode.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2015 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/Base/API.h>
 #include <Swiften/Base/String.h>
@@ -15,7 +15,7 @@
 namespace Swift {
     class SWIFTEN_API XMLTextNode : public XMLNode {
         public:
-            typedef boost::shared_ptr<XMLTextNode> ref;
+            typedef std::shared_ptr<XMLTextNode> ref;
 
             XMLTextNode(const std::string& text) : text_(text) {
                 String::replaceAll(text_, '&', "&amp;"); // Should come first