Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-06-02 18:54:54 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-06-02 18:56:06 (GMT) |
| commit | 9a0d8edbcb89c8d83839c4131425c1a1c598fca4 (patch) | |
| tree | 1cad70f294b2d7f73ef7c54a4207513b9307c90c /Swiften/Session | |
| parent | 721b89dee808c822db1a4211d58b3dd9fae55e62 (diff) | |
| download | swift-9a0d8edbcb89c8d83839c4131425c1a1c598fca4.zip swift-9a0d8edbcb89c8d83839c4131425c1a1c598fca4.tar.bz2 | |
Using Boost workaround for Qt signals keyword clash.
This should allow us to link against system boost versions.
Diffstat (limited to 'Swiften/Session')
| -rw-r--r-- | Swiften/Session/Session.h | 2 | ||||
| -rw-r--r-- | Swiften/Session/SessionStream.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/Session/Session.h b/Swiften/Session/Session.h index 9134096..5261bf2 100644 --- a/Swiften/Session/Session.h +++ b/Swiften/Session/Session.h @@ -7,7 +7,7 @@ #pragma once #include <boost/shared_ptr.hpp> -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/optional.hpp> #include <boost/enable_shared_from_this.hpp> diff --git a/Swiften/Session/SessionStream.h b/Swiften/Session/SessionStream.h index f2d4a7b..c3f5cef 100644 --- a/Swiften/Session/SessionStream.h +++ b/Swiften/Session/SessionStream.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/shared_ptr.hpp> #include "Swiften/Elements/ProtocolHeader.h" |