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/Elements/JingleContentPayload.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/Elements/JingleContentPayload.h')
| -rw-r--r-- | Swiften/Elements/JingleContentPayload.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Swiften/Elements/JingleContentPayload.h b/Swiften/Elements/JingleContentPayload.h index 46751fd..286e08b 100644 --- a/Swiften/Elements/JingleContentPayload.h +++ b/Swiften/Elements/JingleContentPayload.h @@ -20,7 +20,7 @@ namespace Swift { class SWIFTEN_API JingleContentPayload : public Payload { public: - typedef boost::shared_ptr<JingleContentPayload> ref; + typedef std::shared_ptr<JingleContentPayload> ref; enum Creator { UnknownCreator, @@ -62,34 +62,34 @@ namespace Swift { descriptions.push_back(description); } - const std::vector<boost::shared_ptr<JingleTransportPayload> >& getTransports() const { + const std::vector<std::shared_ptr<JingleTransportPayload> >& getTransports() const { return transports; } - void addTransport(boost::shared_ptr<JingleTransportPayload> transport) { + void addTransport(std::shared_ptr<JingleTransportPayload> transport) { transports.push_back(transport); } template<typename T> - boost::shared_ptr<T> getDescription() const { + std::shared_ptr<T> getDescription() const { for (size_t i = 0; i < descriptions.size(); ++i) { - boost::shared_ptr<T> result(boost::dynamic_pointer_cast<T>(descriptions[i])); + std::shared_ptr<T> result(std::dynamic_pointer_cast<T>(descriptions[i])); if (result) { return result; } } - return boost::shared_ptr<T>(); + return std::shared_ptr<T>(); } template<typename T> - boost::shared_ptr<T> getTransport() const { + std::shared_ptr<T> getTransport() const { for (size_t i = 0; i < transports.size(); ++i) { - boost::shared_ptr<T> result(boost::dynamic_pointer_cast<T>(transports[i])); + std::shared_ptr<T> result(std::dynamic_pointer_cast<T>(transports[i])); if (result) { return result; } } - return boost::shared_ptr<T>(); + return std::shared_ptr<T>(); } private: @@ -97,6 +97,6 @@ namespace Swift { std::string name; //Senders senders; std::vector<JingleDescription::ref> descriptions; - std::vector<boost::shared_ptr<JingleTransportPayload> > transports; + std::vector<std::shared_ptr<JingleTransportPayload> > transports; }; } |