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/Network | |
| 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/Network')
| -rw-r--r-- | Swiften/Network/BoostConnectionServer.h | 2 | ||||
| -rw-r--r-- | Swiften/Network/Connection.h | 2 | ||||
| -rw-r--r-- | Swiften/Network/ConnectionServer.h | 2 | ||||
| -rw-r--r-- | Swiften/Network/Connector.h | 2 | ||||
| -rw-r--r-- | Swiften/Network/DomainNameAddressQuery.h | 2 | ||||
| -rw-r--r-- | Swiften/Network/DomainNameServiceQuery.h | 2 | ||||
| -rw-r--r-- | Swiften/Network/Timer.h | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/Swiften/Network/BoostConnectionServer.h b/Swiften/Network/BoostConnectionServer.h index 10b4df3..2a2a041 100644 --- a/Swiften/Network/BoostConnectionServer.h +++ b/Swiften/Network/BoostConnectionServer.h @@ -9,7 +9,7 @@ #include <boost/shared_ptr.hpp> #include <boost/enable_shared_from_this.hpp> #include <boost/asio.hpp> -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include "Swiften/Network/BoostConnection.h" #include "Swiften/Network/ConnectionServer.h" diff --git a/Swiften/Network/Connection.h b/Swiften/Network/Connection.h index d19aa63..17c3d18 100644 --- a/Swiften/Network/Connection.h +++ b/Swiften/Network/Connection.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signals.hpp> +#include "Swiften/Base/boost_signalslib.h" #include "Swiften/Base/ByteArray.h" #include "Swiften/Base/String.h" diff --git a/Swiften/Network/ConnectionServer.h b/Swiften/Network/ConnectionServer.h index 15dd869..0411056 100644 --- a/Swiften/Network/ConnectionServer.h +++ b/Swiften/Network/ConnectionServer.h @@ -7,7 +7,7 @@ #pragma once #include <boost/shared_ptr.hpp> -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include "Swiften/Network/Connection.h" diff --git a/Swiften/Network/Connector.h b/Swiften/Network/Connector.h index d283f2d..f0774a9 100644 --- a/Swiften/Network/Connector.h +++ b/Swiften/Network/Connector.h @@ -7,7 +7,7 @@ #pragma once #include <deque> -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/shared_ptr.hpp> #include "Swiften/Network/DomainNameServiceQuery.h" diff --git a/Swiften/Network/DomainNameAddressQuery.h b/Swiften/Network/DomainNameAddressQuery.h index fd26bd0..fcc9fb3 100644 --- a/Swiften/Network/DomainNameAddressQuery.h +++ b/Swiften/Network/DomainNameAddressQuery.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signals.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/optional.hpp> #include <boost/shared_ptr.hpp> diff --git a/Swiften/Network/DomainNameServiceQuery.h b/Swiften/Network/DomainNameServiceQuery.h index 286ac7b..c8474a3 100644 --- a/Swiften/Network/DomainNameServiceQuery.h +++ b/Swiften/Network/DomainNameServiceQuery.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signals.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/optional.hpp> #include <vector> diff --git a/Swiften/Network/Timer.h b/Swiften/Network/Timer.h index 8b92271..0042e92 100644 --- a/Swiften/Network/Timer.h +++ b/Swiften/Network/Timer.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signals.hpp> +#include "Swiften/Base/boost_signalslib.h" namespace Swift { class Timer { |