1 files changed, 41 insertions, 40 deletions
diff --git a/Swiften/Elements/UnitTest/StanzaTest.cpp b/Swiften/Elements/UnitTest/StanzaTest.cpp
index 13c038c..6a45bd8 100644
--- a/Swiften/Elements/UnitTest/StanzaTest.cpp
+++ b/Swiften/Elements/UnitTest/StanzaTest.cpp
@@ -4,8 +4,9 @@
  * See the COPYING file for more information.
  */
 
+#include <memory>
+
 #include <boost/date_time/posix_time/posix_time.hpp>
-#include <boost/shared_ptr.hpp>
 
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
@@ -70,8 +71,8 @@ class StanzaTest : public CppUnit::TestFixture
 
         void testConstructor_Copy() {
             Message m;
-            m.addPayload(boost::make_shared<MyPayload1>());
-            m.addPayload(boost::make_shared<MyPayload2>());
+            m.addPayload(std::make_shared<MyPayload1>());
+            m.addPayload(std::make_shared<MyPayload2>());
             Message copy(m);
 
             CPPUNIT_ASSERT(copy.getPayload<MyPayload1>());
@@ -82,7 +83,7 @@ class StanzaTest : public CppUnit::TestFixture
             bool payloadAlive = true;
             {
                 Message m;
-                m.addPayload(boost::make_shared<DestroyingPayload>(&payloadAlive));
+                m.addPayload(std::make_shared<DestroyingPayload>(&payloadAlive));
             }
 
             CPPUNIT_ASSERT(!payloadAlive);
@@ -91,7 +92,7 @@ class StanzaTest : public CppUnit::TestFixture
         void testDestructor_Copy() {
             bool payloadAlive = true;
             Message* m1 = new Message();
-            m1->addPayload(boost::make_shared<DestroyingPayload>(&payloadAlive));
+            m1->addPayload(std::make_shared<DestroyingPayload>(&payloadAlive));
             Message* m2 = new Message(*m1);
 
             delete m1;
@@ -103,30 +104,30 @@ class StanzaTest : public CppUnit::TestFixture
 
         void testGetPayload() {
             Message m;
-            m.addPayload(boost::make_shared<MyPayload1>());
-            m.addPayload(boost::make_shared<MyPayload2>());
-            m.addPayload(boost::make_shared<MyPayload3>());
+            m.addPayload(std::make_shared<MyPayload1>());
+            m.addPayload(std::make_shared<MyPayload2>());
+            m.addPayload(std::make_shared<MyPayload3>());
 
-            boost::shared_ptr<MyPayload2> p(m.getPayload<MyPayload2>());
+            std::shared_ptr<MyPayload2> p(m.getPayload<MyPayload2>());
             CPPUNIT_ASSERT(p);
         }
 
         void testGetPayload_NoSuchPayload() {
             Message m;
-            m.addPayload(boost::make_shared<MyPayload1>());
-            m.addPayload(boost::make_shared<MyPayload3>());
+            m.addPayload(std::make_shared<MyPayload1>());
+            m.addPayload(std::make_shared<MyPayload3>());
 
-            boost::shared_ptr<MyPayload2> p(m.getPayload<MyPayload2>());
+            std::shared_ptr<MyPayload2> p(m.getPayload<MyPayload2>());
             CPPUNIT_ASSERT(!p);
         }
 
         void testGetPayloads() {
             Message m;
-            boost::shared_ptr<MyPayload2> payload1(new MyPayload2());
-            boost::shared_ptr<MyPayload2> payload2(new MyPayload2());
-            m.addPayload(boost::make_shared<MyPayload1>());
+            std::shared_ptr<MyPayload2> payload1(new MyPayload2());
+            std::shared_ptr<MyPayload2> payload2(new MyPayload2());
+            m.addPayload(std::make_shared<MyPayload1>());
             m.addPayload(payload1);
-            m.addPayload(boost::make_shared<MyPayload3>());
+            m.addPayload(std::make_shared<MyPayload3>());
             m.addPayload(payload2);
 
             CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), m.getPayloads<MyPayload2>().size());
@@ -137,51 +138,51 @@ class StanzaTest : public CppUnit::TestFixture
 
         void testUpdatePayload_ExistingPayload() {
             Message m;
-            m.addPayload(boost::make_shared<MyPayload1>());
-            m.addPayload(boost::make_shared<MyPayload2>("foo"));
-            m.addPayload(boost::make_shared<MyPayload3>());
+            m.addPayload(std::make_shared<MyPayload1>());
+            m.addPayload(std::make_shared<MyPayload2>("foo"));
+            m.addPayload(std::make_shared<MyPayload3>());
 
-            m.updatePayload(boost::make_shared<MyPayload2>("bar"));
+            m.updatePayload(std::make_shared<MyPayload2>("bar"));
 
             CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(3), m.getPayloads().size());
-            boost::shared_ptr<MyPayload2> p(m.getPayload<MyPayload2>());
+            std::shared_ptr<MyPayload2> p(m.getPayload<MyPayload2>());
             CPPUNIT_ASSERT_EQUAL(std::string("bar"), p->text_);
         }
 
         void testUpdatePayload_NewPayload() {
             Message m;
-            m.addPayload(boost::make_shared<MyPayload1>());
-            m.addPayload(boost::make_shared<MyPayload3>());
+            m.addPayload(std::make_shared<MyPayload1>());
+            m.addPayload(std::make_shared<MyPayload3>());
 
-            m.updatePayload(boost::make_shared<MyPayload2>("bar"));
+            m.updatePayload(std::make_shared<MyPayload2>("bar"));
 
             CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(3), m.getPayloads().size());
-            boost::shared_ptr<MyPayload2> p(m.getPayload<MyPayload2>());
+            std::shared_ptr<MyPayload2> p(m.getPayload<MyPayload2>());
             CPPUNIT_ASSERT_EQUAL(std::string("bar"), p->text_);
         }
 
         void testGetPayloadOfSameType() {
             Message m;
-            m.addPayload(boost::make_shared<MyPayload1>());
-            m.addPayload(boost::make_shared<MyPayload2>("foo"));
-            m.addPayload(boost::make_shared<MyPayload3>());
+            m.addPayload(std::make_shared<MyPayload1>());
+            m.addPayload(std::make_shared<MyPayload2>("foo"));
+            m.addPayload(std::make_shared<MyPayload3>());
 
-            boost::shared_ptr<MyPayload2> payload(boost::dynamic_pointer_cast<MyPayload2>(m.getPayloadOfSameType(boost::make_shared<MyPayload2>("bar"))));
+            std::shared_ptr<MyPayload2> payload(std::dynamic_pointer_cast<MyPayload2>(m.getPayloadOfSameType(std::make_shared<MyPayload2>("bar"))));
             CPPUNIT_ASSERT(payload);
             CPPUNIT_ASSERT_EQUAL(std::string("foo"), payload->text_);
         }
 
         void testGetPayloadOfSameType_NoSuchPayload() {
             Message m;
-            m.addPayload(boost::make_shared<MyPayload1>());
-            m.addPayload(boost::make_shared<MyPayload3>());
+            m.addPayload(std::make_shared<MyPayload1>());
+            m.addPayload(std::make_shared<MyPayload3>());
 
-            CPPUNIT_ASSERT(!m.getPayloadOfSameType(boost::make_shared<MyPayload2>("bar")));
+            CPPUNIT_ASSERT(!m.getPayloadOfSameType(std::make_shared<MyPayload2>("bar")));
         }
 
         void testGetTimestamp() {
             Message m;
-            m.addPayload(boost::make_shared<Delay>(boost::posix_time::from_time_t(1)));
+            m.addPayload(std::make_shared<Delay>(boost::posix_time::from_time_t(1)));
 
             boost::optional<boost::posix_time::ptime> timestamp = m.getTimestamp();
 
@@ -191,7 +192,7 @@ class StanzaTest : public CppUnit::TestFixture
 
         void testGetTimestamp_TimestampWithFrom() {
             Message m;
-            m.addPayload(boost::make_shared<Delay>(boost::posix_time::from_time_t(1), JID("foo@bar.com")));
+            m.addPayload(std::make_shared<Delay>(boost::posix_time::from_time_t(1), JID("foo@bar.com")));
 
             boost::optional<boost::posix_time::ptime> timestamp = m.getTimestamp();
 
@@ -206,10 +207,10 @@ class StanzaTest : public CppUnit::TestFixture
 
         void testGetTimestampFrom() {
             Message m;
-            m.addPayload(boost::make_shared<Delay>(boost::posix_time::from_time_t(0)));
-            m.addPayload(boost::make_shared<Delay>(boost::posix_time::from_time_t(1), JID("foo1@bar.com")));
-            m.addPayload(boost::make_shared<Delay>(boost::posix_time::from_time_t(2), JID("foo2@bar.com")));
-            m.addPayload(boost::make_shared<Delay>(boost::posix_time::from_time_t(3), JID("foo3@bar.com")));
+            m.addPayload(std::make_shared<Delay>(boost::posix_time::from_time_t(0)));
+            m.addPayload(std::make_shared<Delay>(boost::posix_time::from_time_t(1), JID("foo1@bar.com")));
+            m.addPayload(std::make_shared<Delay>(boost::posix_time::from_time_t(2), JID("foo2@bar.com")));
+            m.addPayload(std::make_shared<Delay>(boost::posix_time::from_time_t(3), JID("foo3@bar.com")));
 
             boost::optional<boost::posix_time::ptime> timestamp = m.getTimestampFrom(JID("foo2@bar.com"));
 
@@ -219,8 +220,8 @@ class StanzaTest : public CppUnit::TestFixture
 
         void testGetTimestampFrom_Fallsback() {
             Message m;
-            m.addPayload(boost::make_shared<Delay>(boost::posix_time::from_time_t(1), JID("foo1@bar.com")));
-            m.addPayload(boost::make_shared<Delay>(boost::posix_time::from_time_t(3), JID("foo3@bar.com")));
+            m.addPayload(std::make_shared<Delay>(boost::posix_time::from_time_t(1), JID("foo1@bar.com")));
+            m.addPayload(std::make_shared<Delay>(boost::posix_time::from_time_t(3), JID("foo3@bar.com")));
 
             boost::optional<boost::posix_time::ptime> timestamp = m.getTimestampFrom(JID("foo2@bar.com"));