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 /Sluift | |
| 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 'Sluift')
| -rw-r--r-- | Sluift/Console.h | 2 | ||||
| -rw-r--r-- | Sluift/ITunesInterface.h | 2 | ||||
| -rw-r--r-- | Sluift/Terminal.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Sluift/Console.h b/Sluift/Console.h index d1687bf..6ed6f58 100644 --- a/Sluift/Console.h +++ b/Sluift/Console.h @@ -8,7 +8,7 @@ #include <string> -#include <boost/optional/optional_fwd.hpp> +#include <boost/optional/optional.hpp> #include <Swiften/Base/Override.h> diff --git a/Sluift/ITunesInterface.h b/Sluift/ITunesInterface.h index d09982b..d44dcb1 100644 --- a/Sluift/ITunesInterface.h +++ b/Sluift/ITunesInterface.h @@ -9,7 +9,7 @@ #include <memory> #include <string> -#include <boost/optional/optional_fwd.hpp> +#include <boost/optional/optional.hpp> #include <Swiften/Base/API.h> diff --git a/Sluift/Terminal.h b/Sluift/Terminal.h index 9d44095..3443d16 100644 --- a/Sluift/Terminal.h +++ b/Sluift/Terminal.h @@ -8,7 +8,7 @@ #include <string> -#include <boost/optional/optional_fwd.hpp> +#include <boost/optional/optional.hpp> namespace Swift { class Completer; |