diff 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/CarbonsParserTest.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/CarbonsParserTest.cpp')
-rw-r--r-- | Swiften/Parser/PayloadParsers/UnitTest/CarbonsParserTest.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Swiften/Parser/PayloadParsers/UnitTest/CarbonsParserTest.cpp b/Swiften/Parser/PayloadParsers/UnitTest/CarbonsParserTest.cpp index f85efb2..b5b9995 100644 --- a/Swiften/Parser/PayloadParsers/UnitTest/CarbonsParserTest.cpp +++ b/Swiften/Parser/PayloadParsers/UnitTest/CarbonsParserTest.cpp @@ -73,14 +73,14 @@ class CarbonsParserTest : public CppUnit::TestFixture { CarbonsReceived::ref received = parser.getPayload<CarbonsReceived>(); CPPUNIT_ASSERT(received); - boost::shared_ptr<Forwarded> forwarded = received->getForwarded(); + std::shared_ptr<Forwarded> forwarded = received->getForwarded(); CPPUNIT_ASSERT(forwarded); - boost::shared_ptr<Message> message = boost::dynamic_pointer_cast<Message>(forwarded->getStanza()); + std::shared_ptr<Message> message = std::dynamic_pointer_cast<Message>(forwarded->getStanza()); CPPUNIT_ASSERT(message); CPPUNIT_ASSERT_EQUAL(JID("juliet@capulet.example/balcony"), message->getFrom()); - boost::shared_ptr<Thread> thread = message->getPayload<Thread>(); + std::shared_ptr<Thread> thread = message->getPayload<Thread>(); CPPUNIT_ASSERT(thread); CPPUNIT_ASSERT_EQUAL(std::string("0e3141cd80894871a68e6fe6b1ec56fa"), thread->getText()); } @@ -105,10 +105,10 @@ class CarbonsParserTest : public CppUnit::TestFixture { CarbonsSent::ref sent = parser.getPayload<CarbonsSent>(); CPPUNIT_ASSERT(sent); - boost::shared_ptr<Forwarded> forwarded = sent->getForwarded(); + std::shared_ptr<Forwarded> forwarded = sent->getForwarded(); CPPUNIT_ASSERT(forwarded); - boost::shared_ptr<Message> message = boost::dynamic_pointer_cast<Message>(forwarded->getStanza()); + std::shared_ptr<Message> message = std::dynamic_pointer_cast<Message>(forwarded->getStanza()); CPPUNIT_ASSERT(message); CPPUNIT_ASSERT_EQUAL(JID("juliet@capulet.example/balcony"), message->getTo()); } |