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/Queries/PubSubRequest.h | |
| 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/Queries/PubSubRequest.h')
| -rw-r--r-- | Swiften/Queries/PubSubRequest.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Swiften/Queries/PubSubRequest.h b/Swiften/Queries/PubSubRequest.h index 7218f83..888b531 100644 --- a/Swiften/Queries/PubSubRequest.h +++ b/Swiften/Queries/PubSubRequest.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/smart_ptr/make_shared.hpp> +#include <memory> #include <Swiften/Base/API.h> #include <Swiften/Base/boost_bsignals.h> @@ -56,10 +56,10 @@ namespace Swift { PubSubRequest( IQ::Type type, const JID& receiver, - boost::shared_ptr<T> payload, + std::shared_ptr<T> payload, IQRouter* router) : Request(type, receiver, router) { - boost::shared_ptr<ContainerType> wrapper = boost::make_shared<ContainerType>(); + std::shared_ptr<ContainerType> wrapper = std::make_shared<ContainerType>(); wrapper->setPayload(payload); setPayload(wrapper); } @@ -68,24 +68,24 @@ namespace Swift { IQ::Type type, const JID& sender, const JID& receiver, - boost::shared_ptr<T> payload, + std::shared_ptr<T> payload, IQRouter* router) : Request(type, sender, receiver, router) { - boost::shared_ptr<ContainerType> wrapper = boost::make_shared<ContainerType>(); + std::shared_ptr<ContainerType> wrapper = std::make_shared<ContainerType>(); wrapper->setPayload(payload); setPayload(wrapper); } virtual void handleResponse( - boost::shared_ptr<Payload> payload, ErrorPayload::ref error) { - boost::shared_ptr<ResponseType> result; - if (boost::shared_ptr<ContainerType> container = boost::dynamic_pointer_cast<ContainerType>(payload)) { - result = boost::dynamic_pointer_cast<ResponseType>(container->getPayload()); + std::shared_ptr<Payload> payload, ErrorPayload::ref error) { + std::shared_ptr<ResponseType> result; + if (std::shared_ptr<ContainerType> container = std::dynamic_pointer_cast<ContainerType>(payload)) { + result = std::dynamic_pointer_cast<ResponseType>(container->getPayload()); } onResponse(result, error); } public: - boost::signal<void (boost::shared_ptr<ResponseType>, ErrorPayload::ref)> onResponse; + boost::signal<void (std::shared_ptr<ResponseType>, ErrorPayload::ref)> onResponse; }; } |