3 files changed, 11 insertions, 10 deletions
diff --git a/Swiften/Entity/GenericPayloadPersister.h b/Swiften/Entity/GenericPayloadPersister.h
index 19afc61..7cef857 100644
--- a/Swiften/Entity/GenericPayloadPersister.h
+++ b/Swiften/Entity/GenericPayloadPersister.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.
  */
@@ -18,8 +18,8 @@ namespace Swift {
             }
 
         public:
-            boost::shared_ptr<PAYLOAD> loadPayloadGeneric(const boost::filesystem::path& path) {
-                return boost::dynamic_pointer_cast<PAYLOAD>(loadPayload(path));
+            std::shared_ptr<PAYLOAD> loadPayloadGeneric(const boost::filesystem::path& path) {
+                return std::dynamic_pointer_cast<PAYLOAD>(loadPayload(path));
             }
 
         protected:
diff --git a/Swiften/Entity/PayloadPersister.cpp b/Swiften/Entity/PayloadPersister.cpp
index 7147615..4b3fb52 100644
--- a/Swiften/Entity/PayloadPersister.cpp
+++ b/Swiften/Entity/PayloadPersister.cpp
@@ -25,7 +25,7 @@ PayloadPersister::PayloadPersister() {
 PayloadPersister::~PayloadPersister() {
 }
 
-void PayloadPersister::savePayload(boost::shared_ptr<Payload> payload, const boost::filesystem::path& path) {
+void PayloadPersister::savePayload(std::shared_ptr<Payload> payload, const boost::filesystem::path& path) {
     try {
         if (!boost::filesystem::exists(path.parent_path())) {
             boost::filesystem::create_directories(path.parent_path());
@@ -39,12 +39,12 @@ void PayloadPersister::savePayload(boost::shared_ptr<Payload> payload, const boo
     }
 }
 
-boost::shared_ptr<Payload> PayloadPersister::loadPayload(const boost::filesystem::path& path) {
+std::shared_ptr<Payload> PayloadPersister::loadPayload(const boost::filesystem::path& path) {
     try {
         if (boost::filesystem::exists(path)) {
             ByteArray data;
             readByteArrayFromFile(data, path);
-            boost::shared_ptr<PayloadParser> parser(createParser());
+            std::shared_ptr<PayloadParser> parser(createParser());
             PayloadParserTester tester(parser.get());
             tester.parse(byteArrayToString(data));
             return parser->getPayload();
@@ -53,5 +53,5 @@ boost::shared_ptr<Payload> PayloadPersister::loadPayload(const boost::filesystem
     catch (const boost::filesystem::filesystem_error& e) {
         std::cerr << "ERROR: " << e.what() << std::endl;
     }
-    return boost::shared_ptr<Payload>();
+    return std::shared_ptr<Payload>();
 }
diff --git a/Swiften/Entity/PayloadPersister.h b/Swiften/Entity/PayloadPersister.h
index 9102f4b..c747a41 100644
--- a/Swiften/Entity/PayloadPersister.h
+++ b/Swiften/Entity/PayloadPersister.h
@@ -6,8 +6,9 @@
 
 #pragma once
 
+#include <memory>
+
 #include <boost/filesystem/path.hpp>
-#include <boost/shared_ptr.hpp>
 
 #include <Swiften/Base/API.h>
 
@@ -21,8 +22,8 @@ namespace Swift {
             PayloadPersister();
             virtual ~PayloadPersister();
 
-            void savePayload(boost::shared_ptr<Payload>, const boost::filesystem::path&);
-            boost::shared_ptr<Payload> loadPayload(const boost::filesystem::path&);
+            void savePayload(std::shared_ptr<Payload>, const boost::filesystem::path&);
+            std::shared_ptr<Payload> loadPayload(const boost::filesystem::path&);
 
         protected: