summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-10-04 12:15:57 (GMT)
committerKevin Smith <kevin.smith@isode.com>2016-10-04 13:44:51 (GMT)
commitbdb9fd141bc1cf5f9134dd095d364c08113a2c87 (patch)
tree458ce57a5d1c3feec6112567c843e5308008a5dc /Swiften/Network/ConnectionServer.h
parent9a4cee8bc017c8344fe5fc8777f42f29a1b69ee1 (diff)
downloadswift-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/ConnectionServer.h')
-rw-r--r--Swiften/Network/ConnectionServer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Swiften/Network/ConnectionServer.h b/Swiften/Network/ConnectionServer.h
index 10d549e..33fc7b3 100644
--- a/Swiften/Network/ConnectionServer.h
+++ b/Swiften/Network/ConnectionServer.h
@@ -1,37 +1,37 @@
/*
* Copyright (c) 2010 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
#include <boost/shared_ptr.hpp>
#include <Swiften/Base/API.h>
#include <Swiften/Base/boost_bsignals.h>
#include <Swiften/Network/Connection.h>
#include <Swiften/Network/HostAddressPort.h>
-#include <boost/optional/optional_fwd.hpp>
+#include <boost/optional/optional.hpp>
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::signal<void (boost::shared_ptr<Connection>)> onNewConnection;
};
}