6 files changed, 19 insertions, 17 deletions
diff --git a/Swiften/EventLoop/BoostASIOEventLoop.cpp b/Swiften/EventLoop/BoostASIOEventLoop.cpp
index a9d1440..bab8b54 100644
--- a/Swiften/EventLoop/BoostASIOEventLoop.cpp
+++ b/Swiften/EventLoop/BoostASIOEventLoop.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Isode Limited.
+ * Copyright (c) 2015-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -10,7 +10,7 @@
 
 namespace Swift {
 
-BoostASIOEventLoop::BoostASIOEventLoop(boost::shared_ptr<boost::asio::io_service> ioService) : ioService_(ioService) {
+BoostASIOEventLoop::BoostASIOEventLoop(std::shared_ptr<boost::asio::io_service> ioService) : ioService_(ioService) {
 
 }
 
diff --git a/Swiften/EventLoop/BoostASIOEventLoop.h b/Swiften/EventLoop/BoostASIOEventLoop.h
index c39aaf5..41304c4 100644
--- a/Swiften/EventLoop/BoostASIOEventLoop.h
+++ b/Swiften/EventLoop/BoostASIOEventLoop.h
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2015 Isode Limited.
+ * Copyright (c) 2015-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
+#include <memory>
+
 #include <boost/asio/io_service.hpp>
-#include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
 
 #include <Swiften/Base/API.h>
@@ -17,7 +18,7 @@
 namespace Swift {
     class SWIFTEN_API BoostASIOEventLoop : public EventLoop {
         public:
-            BoostASIOEventLoop(boost::shared_ptr<boost::asio::io_service> ioService);
+            BoostASIOEventLoop(std::shared_ptr<boost::asio::io_service> ioService);
             virtual ~BoostASIOEventLoop();
 
         protected:
@@ -26,7 +27,7 @@ namespace Swift {
             virtual void eventPosted();
 
         private:
-            boost::shared_ptr<boost::asio::io_service> ioService_;
+            std::shared_ptr<boost::asio::io_service> ioService_;
 
             bool isEventInASIOEventLoop_;
             boost::recursive_mutex isEventInASIOEventLoopMutex_;
diff --git a/Swiften/EventLoop/Event.h b/Swiften/EventLoop/Event.h
index eecd896..e92bb33 100644
--- a/Swiften/EventLoop/Event.h
+++ b/Swiften/EventLoop/Event.h
@@ -6,15 +6,16 @@
 
 #pragma once
 
+#include <memory>
+
 #include <boost/function.hpp>
-#include <boost/shared_ptr.hpp>
 
 #include <Swiften/EventLoop/EventOwner.h>
 
 namespace Swift {
     class Event {
         public:
-            Event(boost::shared_ptr<EventOwner> owner, const boost::function<void()>& callback) : id(~0U), owner(owner), callback(callback) {
+            Event(std::shared_ptr<EventOwner> owner, const boost::function<void()>& callback) : id(~0U), owner(owner), callback(callback) {
             }
 
             bool operator==(const Event& o) const {
@@ -22,7 +23,7 @@ namespace Swift {
             }
 
             unsigned int id;
-            boost::shared_ptr<EventOwner> owner;
+            std::shared_ptr<EventOwner> owner;
             boost::function<void()> callback;
     };
 }
diff --git a/Swiften/EventLoop/EventLoop.cpp b/Swiften/EventLoop/EventLoop.cpp
index 2434277..730ee0a 100644
--- a/Swiften/EventLoop/EventLoop.cpp
+++ b/Swiften/EventLoop/EventLoop.cpp
@@ -74,7 +74,7 @@ void EventLoop::handleNextEvents() {
     }
 }
 
-void EventLoop::postEvent(boost::function<void ()> callback, boost::shared_ptr<EventOwner> owner) {
+void EventLoop::postEvent(boost::function<void ()> callback, std::shared_ptr<EventOwner> owner) {
     Event event(owner, callback);
     bool callEventPosted = false;
     {
@@ -91,7 +91,7 @@ void EventLoop::postEvent(boost::function<void ()> callback, boost::shared_ptr<E
     }
 }
 
-void EventLoop::removeEventsFromOwner(boost::shared_ptr<EventOwner> owner) {
+void EventLoop::removeEventsFromOwner(std::shared_ptr<EventOwner> owner) {
     boost::recursive_mutex::scoped_lock removeLock(removeEventsMutex_);
     boost::recursive_mutex::scoped_lock lock(eventsMutex_);
     events_.remove_if(lambda::bind(&Event::owner, lambda::_1) == owner);
diff --git a/Swiften/EventLoop/EventLoop.h b/Swiften/EventLoop/EventLoop.h
index 84a3e9d..c7f7760 100644
--- a/Swiften/EventLoop/EventLoop.h
+++ b/Swiften/EventLoop/EventLoop.h
@@ -33,13 +33,13 @@ namespace Swift {
              * An optional \ref EventOwner can be passed, allowing later removal of events that have not yet been
              * executed using the \ref removeEventsFromOwner method.
              */
-            void postEvent(boost::function<void ()> event, boost::shared_ptr<EventOwner> owner = boost::shared_ptr<EventOwner>());
+            void postEvent(boost::function<void ()> event, std::shared_ptr<EventOwner> owner = std::shared_ptr<EventOwner>());
 
             /**
              * The \ref removeEventsFromOwner method removes all events from the specified \ref owner from the
              * event queue.
              */
-            void removeEventsFromOwner(boost::shared_ptr<EventOwner> owner);
+            void removeEventsFromOwner(std::shared_ptr<EventOwner> owner);
 
         protected:
             /**
diff --git a/Swiften/EventLoop/UnitTest/EventLoopTest.cpp b/Swiften/EventLoop/UnitTest/EventLoopTest.cpp
index 1028b7e..55715d0 100644
--- a/Swiften/EventLoop/UnitTest/EventLoopTest.cpp
+++ b/Swiften/EventLoop/UnitTest/EventLoopTest.cpp
@@ -44,8 +44,8 @@ class EventLoopTest : public CppUnit::TestFixture {
 
         void testRemove() {
             SimpleEventLoop testling;
-            boost::shared_ptr<MyEventOwner> eventOwner1(new MyEventOwner());
-            boost::shared_ptr<MyEventOwner> eventOwner2(new MyEventOwner());
+            std::shared_ptr<MyEventOwner> eventOwner1(new MyEventOwner());
+            std::shared_ptr<MyEventOwner> eventOwner2(new MyEventOwner());
 
             testling.postEvent(boost::bind(&EventLoopTest::logEvent, this, 1), eventOwner1);
             testling.postEvent(boost::bind(&EventLoopTest::logEvent, this, 2), eventOwner2);
@@ -62,7 +62,7 @@ class EventLoopTest : public CppUnit::TestFixture {
 
         void testHandleEvent_Recursive() {
             DummyEventLoop testling;
-            boost::shared_ptr<MyEventOwner> eventOwner(new MyEventOwner());
+            std::shared_ptr<MyEventOwner> eventOwner(new MyEventOwner());
 
             testling.postEvent(boost::bind(&EventLoopTest::runEventLoop, this, &testling, eventOwner), eventOwner);
             testling.postEvent(boost::bind(&EventLoopTest::logEvent, this, 0), eventOwner);
@@ -78,7 +78,7 @@ class EventLoopTest : public CppUnit::TestFixture {
         void logEvent(int i) {
             events_.push_back(i);
         }
-        void runEventLoop(DummyEventLoop* loop, boost::shared_ptr<MyEventOwner> eventOwner) {
+        void runEventLoop(DummyEventLoop* loop, std::shared_ptr<MyEventOwner> eventOwner) {
             loop->processEvents();
             CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(events_.size()));
             loop->postEvent(boost::bind(&EventLoopTest::logEvent, this, 1), eventOwner);