diff options
author | Tobias Markmann <tm@ayena.de> | 2016-10-04 12:15:57 (GMT) |
---|---|---|
committer | Kevin Smith <kevin.smith@isode.com> | 2016-10-04 13:44:51 (GMT) |
commit | bdb9fd141bc1cf5f9134dd095d364c08113a2c87 (patch) | |
tree | 458ce57a5d1c3feec6112567c843e5308008a5dc /Swiften/FileTransfer | |
parent | 9a4cee8bc017c8344fe5fc8777f42f29a1b69ee1 (diff) | |
download | swift-bdb9fd141bc1cf5f9134dd095d364c08113a2c87.zip swift-bdb9fd141bc1cf5f9134dd095d364c08113a2c87.tar.bz2 |
Remove optional_fwd.hpp use; workaround for Boost Ticket #12179
Test-Information:
Builds on macOS 10.12 and unit tests pass.
Change-Id: Ia979e7dbd6f6c84085b1b951d81b925dffbed262
Diffstat (limited to 'Swiften/FileTransfer')
-rw-r--r-- | Swiften/FileTransfer/FileTransferTransporter.h | 2 | ||||
-rw-r--r-- | Swiften/FileTransfer/IBBReceiveSession.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/FileTransfer/FileTransferTransporter.h b/Swiften/FileTransfer/FileTransferTransporter.h index 45eb811..cad3d28 100644 --- a/Swiften/FileTransfer/FileTransferTransporter.h +++ b/Swiften/FileTransfer/FileTransferTransporter.h @@ -1,41 +1,41 @@ /* * Copyright (c) 2013-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <vector> -#include <boost/optional/optional_fwd.hpp> +#include <boost/optional/optional.hpp> #include <Swiften/Elements/JingleS5BTransportPayload.h> #include <Swiften/Base/API.h> #include <Swiften/Base/boost_bsignals.h> namespace Swift { class TransportSession; class ErrorPayload; class ReadBytestream; class WriteBytestream; /** * @brief The FileTransferTransporter class is an abstract factory definition * to generate SOCKS5 bytestream transports or IBB bytestreams for use in file * transfers. */ class SWIFTEN_API FileTransferTransporter { public: virtual ~FileTransferTransporter(); virtual void startGeneratingLocalCandidates() = 0; virtual void stopGeneratingLocalCandidates() = 0; virtual void addRemoteCandidates( const std::vector<JingleS5BTransportPayload::Candidate>&, const std::string&) = 0; virtual void startTryingRemoteCandidates() = 0; virtual void stopTryingRemoteCandidates() = 0; virtual void startActivatingProxy(const JID& proxy) = 0; virtual void stopActivatingProxy() = 0; diff --git a/Swiften/FileTransfer/IBBReceiveSession.h b/Swiften/FileTransfer/IBBReceiveSession.h index 7700cb0..d400a1e 100644 --- a/Swiften/FileTransfer/IBBReceiveSession.h +++ b/Swiften/FileTransfer/IBBReceiveSession.h @@ -1,40 +1,40 @@ /* * Copyright (c) 2010 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <boost/shared_ptr.hpp> -#include <boost/optional/optional_fwd.hpp> +#include <boost/optional/optional.hpp> #include <Swiften/Base/API.h> #include <Swiften/Base/boost_bsignals.h> #include <Swiften/FileTransfer/WriteBytestream.h> #include <Swiften/JID/JID.h> #include <Swiften/Elements/IBB.h> #include <Swiften/FileTransfer/FileTransferError.h> namespace Swift { class IQRouter; class SWIFTEN_API IBBReceiveSession { public: IBBReceiveSession( const std::string& id, const JID& from, const JID& to, unsigned long long size, boost::shared_ptr<WriteBytestream> bytestream, IQRouter* router); ~IBBReceiveSession(); void start(); void stop(); const JID& getSender() const { return from; } const JID& getReceiver() const { |