Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-12-15 14:49:30 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-12-15 14:49:46 (GMT) |
| commit | 6cd7bef6eb507f979d7c964769429ef46e3e5aa9 (patch) | |
| tree | 322d5c80e7be477758a8e97ecd8a64fbb09836de /Swiften/Network | |
| parent | 864904bcd7931ff7453ecb1de72496e4e3cf9c96 (diff) | |
| parent | 2efefdc5ae847f5d187762e474d75c61560cba19 (diff) | |
| download | swift-6cd7bef6eb507f979d7c964769429ef46e3e5aa9.zip swift-6cd7bef6eb507f979d7c964769429ef46e3e5aa9.tar.bz2 | |
Merge branch 'swift-3.x’
* swift-3.x:
- Fix building Swift on 32-bit Linux distributions
- Remove optional_fwd.hpp use; workaround for Boost Bug #12179
- Split COPYING.thirdparty in contributions/dependencies
- Fixes for building packages on Debian
Conflicts:
BuildTools/SCons/SConstruct
Sluift/Console.h
Sluift/ITunesInterface.h
Sluift/Terminal.h
Swift/Packaging/Debian/debian/control.in
Swift/QtUI/SConscript
Swiften/Elements/Stanza.h
Swiften/FileTransfer/FileTransferTransporter.h
Swiften/FileTransfer/IBBReceiveSession.h
Swiften/JID/JID.h
Swiften/Network/BoostConnectionServer.h
Swiften/Network/ConnectionServer.h
Swiften/Parser/AttributeMap.h
Test-Information:
Builds on macOS 10.12.1 with clang trunk.
Change-Id: I9f41ab199f227bc106721627ea994313c68e5cfe
Diffstat (limited to 'Swiften/Network')
| -rw-r--r-- | Swiften/Network/BoostConnectionServer.h | 2 | ||||
| -rw-r--r-- | Swiften/Network/ConnectionServer.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/Network/BoostConnectionServer.h b/Swiften/Network/BoostConnectionServer.h index 41fdbe2..3dd9830 100644 --- a/Swiften/Network/BoostConnectionServer.h +++ b/Swiften/Network/BoostConnectionServer.h @@ -1,43 +1,43 @@ /* * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <memory> #include <boost/asio/io_service.hpp> #include <boost/asio/ip/tcp.hpp> -#include <boost/optional/optional_fwd.hpp> +#include <boost/optional/optional.hpp> #include <boost/signals2.hpp> #include <Swiften/Base/API.h> #include <Swiften/EventLoop/EventOwner.h> #include <Swiften/Network/BoostConnection.h> #include <Swiften/Network/ConnectionServer.h> namespace Swift { class SWIFTEN_API BoostConnectionServer : public ConnectionServer, public EventOwner, public std::enable_shared_from_this<BoostConnectionServer> { public: typedef std::shared_ptr<BoostConnectionServer> ref; static ref create(int port, std::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop) { return ref(new BoostConnectionServer(port, ioService, eventLoop)); } static ref create(const HostAddress &address, int port, std::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop) { return ref(new BoostConnectionServer(address, port, ioService, eventLoop)); } virtual boost::optional<Error> tryStart(); // FIXME: This should become the new start virtual void start(); virtual void stop(); virtual HostAddressPort getAddressPort() const; boost::signals2::signal<void (boost::optional<Error>)> onStopped; private: BoostConnectionServer(int port, std::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop); diff --git a/Swiften/Network/ConnectionServer.h b/Swiften/Network/ConnectionServer.h index 0c8a000..769ab9f 100644 --- a/Swiften/Network/ConnectionServer.h +++ b/Swiften/Network/ConnectionServer.h @@ -1,38 +1,38 @@ /* * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <memory> -#include <boost/optional/optional_fwd.hpp> +#include <boost/optional/optional.hpp> #include <boost/signals2.hpp> #include <Swiften/Base/API.h> #include <Swiften/Network/Connection.h> #include <Swiften/Network/HostAddressPort.h> namespace Swift { class SWIFTEN_API ConnectionServer { public: enum Error { Conflict, UnknownError }; virtual ~ConnectionServer(); virtual HostAddressPort getAddressPort() const = 0; virtual boost::optional<Error> tryStart() = 0; // FIXME: This should become the new start virtual void start() = 0; virtual void stop() = 0; boost::signals2::signal<void (std::shared_ptr<Connection>)> onNewConnection; }; } |