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
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')
-rw-r--r--Swiften/Elements/Stanza.h2
-rw-r--r--Swiften/FileTransfer/FileTransferTransporter.h2
-rw-r--r--Swiften/FileTransfer/IBBReceiveSession.h2
-rw-r--r--Swiften/JID/JID.h2
-rw-r--r--Swiften/Network/BoostConnectionServer.h2
-rw-r--r--Swiften/Network/ConnectionServer.h2
-rw-r--r--Swiften/Parser/AttributeMap.h2
7 files changed, 7 insertions, 7 deletions
diff --git a/Swiften/Elements/Stanza.h b/Swiften/Elements/Stanza.h
index 8da6280..212ce10 100644
--- a/Swiften/Elements/Stanza.h
+++ b/Swiften/Elements/Stanza.h
@@ -10,7 +10,7 @@
#include <vector>
#include <boost/date_time/posix_time/ptime.hpp>
-#include <boost/optional/optional_fwd.hpp>
+#include <boost/optional/optional.hpp>
#include <boost/shared_ptr.hpp>
#include <Swiften/Base/API.h>
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
@@ -8,7 +8,7 @@
#include <vector>
-#include <boost/optional/optional_fwd.hpp>
+#include <boost/optional/optional.hpp>
#include <Swiften/Elements/JingleS5BTransportPayload.h>
#include <Swiften/Base/API.h>
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
@@ -7,7 +7,7 @@
#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>
diff --git a/Swiften/JID/JID.h b/Swiften/JID/JID.h
index 00ee27f..9bcc7d5 100644
--- a/Swiften/JID/JID.h
+++ b/Swiften/JID/JID.h
@@ -10,7 +10,7 @@
#include <iosfwd>
#include <Swiften/Base/API.h>
-#include <boost/optional/optional_fwd.hpp>
+#include <boost/optional/optional.hpp>
namespace Swift {
class IDNConverter;
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
@@ -16,7 +16,7 @@
#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> {
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
@@ -12,7 +12,7 @@
#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 {
diff --git a/Swiften/Parser/AttributeMap.h b/Swiften/Parser/AttributeMap.h
index cf9b20c..93c163b 100644
--- a/Swiften/Parser/AttributeMap.h
+++ b/Swiften/Parser/AttributeMap.h
@@ -9,7 +9,7 @@
#include <vector>
#include <string>
#include <map>
-#include <boost/optional/optional_fwd.hpp>
+#include <boost/optional/optional.hpp>
#include <Swiften/Base/API.h>
#include <Swiften/Parser/Attribute.h>