Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-04-01 17:23:49 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-04-04 08:28:23 (GMT) |
| commit | 741c45b74d5f634622eb5f757c49323274fb8937 (patch) | |
| tree | b9cfa6c2fe2e79e03cc8cb7c1ca1e9cf45aa5328 /Swiften/Parser/PayloadParsers/UnitTest/ForwardedParserTest.cpp | |
| parent | eddd92ed76ae68cb1e202602fd3ebd11b69191a2 (diff) | |
| download | swift-741c45b74d5f634622eb5f757c49323274fb8937.zip swift-741c45b74d5f634622eb5f757c49323274fb8937.tar.bz2 | |
Modernize code to use C++11 shared_ptr instead of Boost's
This change was done by applying the following 'gsed'
replacement calls to all source files:
's/\#include <boost\/shared_ptr\.hpp>/\#include <memory>/g'
's/\#include <boost\/enable_shared_from_this\.hpp>/\#include <memory>/g'
's/\#include <boost\/smart_ptr\/make_shared\.hpp>/\#include <memory>/g'
's/\#include <boost\/make_shared\.hpp>/\#include <memory>/g'
's/\#include <boost\/weak_ptr\.hpp>/\#include <memory>/g'
's/boost::make_shared/std::make_shared/g'
's/boost::dynamic_pointer_cast/std::dynamic_pointer_cast/g'
's/boost::shared_ptr/std::shared_ptr/g'
's/boost::weak_ptr/std::weak_ptr/g'
's/boost::enable_shared_from_this/std::enable_shared_from_this/g'
The remaining issues have been fixed manually.
Test-Information:
Code builds on OS X 10.11.4 and unit tests pass.
Change-Id: Ia7ae34eab869fb9ad6387a1348426b71ae4acd5f
Diffstat (limited to 'Swiften/Parser/PayloadParsers/UnitTest/ForwardedParserTest.cpp')
| -rw-r--r-- | Swiften/Parser/PayloadParsers/UnitTest/ForwardedParserTest.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Swiften/Parser/PayloadParsers/UnitTest/ForwardedParserTest.cpp b/Swiften/Parser/PayloadParsers/UnitTest/ForwardedParserTest.cpp index 30af3ec..a807d4e 100644 --- a/Swiften/Parser/PayloadParsers/UnitTest/ForwardedParserTest.cpp +++ b/Swiften/Parser/PayloadParsers/UnitTest/ForwardedParserTest.cpp @@ -35,12 +35,12 @@ class ForwardedParserTest : public CppUnit::TestFixture "<iq xmlns=\"jabber:client\" type=\"get\" from=\"kindanormal@example.com/IM\" to=\"stupidnewbie@example.com\" id=\"id0\"/>" "</forwarded>")); - boost::shared_ptr<Forwarded> payload = parser.getPayload<Forwarded>(); + std::shared_ptr<Forwarded> payload = parser.getPayload<Forwarded>(); CPPUNIT_ASSERT(!!payload); CPPUNIT_ASSERT(payload->getDelay()); CPPUNIT_ASSERT_EQUAL(std::string("2010-07-10T23:08:25Z"), dateTimeToString(payload->getDelay()->getStamp())); - boost::shared_ptr<IQ> iq = boost::dynamic_pointer_cast<IQ>(payload->getStanza()); + std::shared_ptr<IQ> iq = std::dynamic_pointer_cast<IQ>(payload->getStanza()); CPPUNIT_ASSERT(!!iq); CPPUNIT_ASSERT_EQUAL(JID("stupidnewbie@example.com"), iq->getTo()); CPPUNIT_ASSERT_EQUAL(JID("kindanormal@example.com/IM"), iq->getFrom()); @@ -58,12 +58,12 @@ class ForwardedParserTest : public CppUnit::TestFixture "</message>" "</forwarded>")); - boost::shared_ptr<Forwarded> payload = parser.getPayload<Forwarded>(); + std::shared_ptr<Forwarded> payload = parser.getPayload<Forwarded>(); CPPUNIT_ASSERT(!!payload); CPPUNIT_ASSERT(payload->getDelay()); CPPUNIT_ASSERT_EQUAL(std::string("2010-07-10T23:08:25Z"), dateTimeToString(payload->getDelay()->getStamp())); - boost::shared_ptr<Message> message = boost::dynamic_pointer_cast<Message>(payload->getStanza()); + std::shared_ptr<Message> message = std::dynamic_pointer_cast<Message>(payload->getStanza()); CPPUNIT_ASSERT(!!message); const std::string expectedBody = "Call me but love, and I'll be new baptized; Henceforth I never will be Romeo."; CPPUNIT_ASSERT_EQUAL(expectedBody, message->getBody().get()); @@ -81,11 +81,11 @@ class ForwardedParserTest : public CppUnit::TestFixture "</message>" "</forwarded>")); - boost::shared_ptr<Forwarded> payload = parser.getPayload<Forwarded>(); + std::shared_ptr<Forwarded> payload = parser.getPayload<Forwarded>(); CPPUNIT_ASSERT(!!payload); CPPUNIT_ASSERT(!payload->getDelay()); - boost::shared_ptr<Message> message = boost::dynamic_pointer_cast<Message>(payload->getStanza()); + std::shared_ptr<Message> message = std::dynamic_pointer_cast<Message>(payload->getStanza()); CPPUNIT_ASSERT(!!message); const std::string expectedBody = "Call me but love, and I'll be new baptized; Henceforth I never will be Romeo."; CPPUNIT_ASSERT_EQUAL(expectedBody, message->getBody().get()); @@ -102,12 +102,12 @@ class ForwardedParserTest : public CppUnit::TestFixture "<presence xmlns=\"jabber:client\" from=\"alice@wonderland.lit/rabbithole\" to=\"madhatter@wonderland.lit\" type=\"unavailable\"/>" "</forwarded>")); - boost::shared_ptr<Forwarded> payload = parser.getPayload<Forwarded>(); + std::shared_ptr<Forwarded> payload = parser.getPayload<Forwarded>(); CPPUNIT_ASSERT(!!payload); CPPUNIT_ASSERT(payload->getDelay()); CPPUNIT_ASSERT_EQUAL(std::string("2010-07-10T23:08:25Z"), dateTimeToString(payload->getDelay()->getStamp())); - boost::shared_ptr<Presence> presence = boost::dynamic_pointer_cast<Presence>(payload->getStanza()); + std::shared_ptr<Presence> presence = std::dynamic_pointer_cast<Presence>(payload->getStanza()); CPPUNIT_ASSERT(!!presence); CPPUNIT_ASSERT_EQUAL(JID("madhatter@wonderland.lit"), presence->getTo()); CPPUNIT_ASSERT_EQUAL(JID("alice@wonderland.lit/rabbithole"), presence->getFrom()); |