Swiftdiff 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/Network/BoostConnectionServer.h | |
| 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/Network/BoostConnectionServer.h')
| -rw-r--r-- | Swiften/Network/BoostConnectionServer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Swiften/Network/BoostConnectionServer.h b/Swiften/Network/BoostConnectionServer.h index cf37975..d1879a3 100644 --- a/Swiften/Network/BoostConnectionServer.h +++ b/Swiften/Network/BoostConnectionServer.h @@ -1,49 +1,49 @@ /* * Copyright (c) 2010 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <boost/shared_ptr.hpp> #include <boost/asio/io_service.hpp> #include <boost/asio/ip/tcp.hpp> #include <boost/enable_shared_from_this.hpp> #include <Swiften/Base/API.h> #include <Swiften/Base/boost_bsignals.h> #include <Swiften/Network/BoostConnection.h> #include <Swiften/Network/ConnectionServer.h> #include <Swiften/EventLoop/EventOwner.h> -#include <boost/optional/optional_fwd.hpp> +#include <boost/optional/optional.hpp> namespace Swift { class SWIFTEN_API BoostConnectionServer : public ConnectionServer, public EventOwner, public boost::enable_shared_from_this<BoostConnectionServer> { public: typedef boost::shared_ptr<BoostConnectionServer> ref; static ref create(int port, boost::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop) { return ref(new BoostConnectionServer(port, ioService, eventLoop)); } static ref create(const HostAddress &address, int port, boost::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::signal<void (boost::optional<Error>)> onStopped; private: BoostConnectionServer(int port, boost::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop); BoostConnectionServer(const HostAddress &address, int port, boost::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop); void stop(boost::optional<Error> e); void acceptNextConnection(); void handleAccept(boost::shared_ptr<BoostConnection> newConnection, const boost::system::error_code& error); |