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/Component/ComponentSession.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/Component/ComponentSession.h')
-rw-r--r-- | Swiften/Component/ComponentSession.h | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/Swiften/Component/ComponentSession.h b/Swiften/Component/ComponentSession.h index 608bb79..97f5378 100644 --- a/Swiften/Component/ComponentSession.h +++ b/Swiften/Component/ComponentSession.h @@ -6,11 +6,9 @@ #pragma once +#include <memory> #include <string> -#include <boost/enable_shared_from_this.hpp> -#include <boost/shared_ptr.hpp> - #include <Swiften/Base/API.h> #include <Swiften/Base/Error.h> #include <Swiften/Base/boost_bsignals.h> @@ -23,7 +21,7 @@ namespace Swift { class ComponentAuthenticator; class CryptoProvider; - class SWIFTEN_API ComponentSession : public boost::enable_shared_from_this<ComponentSession> { + class SWIFTEN_API ComponentSession : public std::enable_shared_from_this<ComponentSession> { public: enum State { Initial, @@ -44,8 +42,8 @@ namespace Swift { ~ComponentSession(); - static boost::shared_ptr<ComponentSession> create(const JID& jid, const std::string& secret, boost::shared_ptr<SessionStream> stream, CryptoProvider* crypto) { - return boost::shared_ptr<ComponentSession>(new ComponentSession(jid, secret, stream, crypto)); + static std::shared_ptr<ComponentSession> create(const JID& jid, const std::string& secret, std::shared_ptr<SessionStream> stream, CryptoProvider* crypto) { + return std::shared_ptr<ComponentSession>(new ComponentSession(jid, secret, stream, crypto)); } State getState() const { @@ -55,33 +53,33 @@ namespace Swift { void start(); void finish(); - void sendStanza(boost::shared_ptr<Stanza>); + void sendStanza(std::shared_ptr<Stanza>); public: boost::signal<void ()> onInitialized; - boost::signal<void (boost::shared_ptr<Swift::Error>)> onFinished; - boost::signal<void (boost::shared_ptr<Stanza>)> onStanzaReceived; + boost::signal<void (std::shared_ptr<Swift::Error>)> onFinished; + boost::signal<void (std::shared_ptr<Stanza>)> onStanzaReceived; private: - ComponentSession(const JID& jid, const std::string& secret, boost::shared_ptr<SessionStream>, CryptoProvider*); + ComponentSession(const JID& jid, const std::string& secret, std::shared_ptr<SessionStream>, CryptoProvider*); void finishSession(Error::Type error); - void finishSession(boost::shared_ptr<Swift::Error> error); + void finishSession(std::shared_ptr<Swift::Error> error); void sendStreamHeader(); - void handleElement(boost::shared_ptr<ToplevelElement>); + void handleElement(std::shared_ptr<ToplevelElement>); void handleStreamStart(const ProtocolHeader&); - void handleStreamClosed(boost::shared_ptr<Swift::Error>); + void handleStreamClosed(std::shared_ptr<Swift::Error>); bool checkState(State); private: JID jid; std::string secret; - boost::shared_ptr<SessionStream> stream; + std::shared_ptr<SessionStream> stream; CryptoProvider* crypto; - boost::shared_ptr<Swift::Error> error; + std::shared_ptr<Swift::Error> error; State state; }; } |