Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-04-06 20:45:30 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2016-04-07 07:41:04 (GMT) |
| commit | eece9049d1c55b890222b02d653f06d68f37e269 (patch) | |
| tree | 00313221327600f50792e8cdeb361c39df8a26bb | |
| parent | a22b8fc1ed8bf22272bf9d71e7febdbd9cfe561b (diff) | |
| download | swift-eece9049d1c55b890222b02d653f06d68f37e269.zip swift-eece9049d1c55b890222b02d653f06d68f37e269.tar.bz2 | |
Fix building with system boost on Debian 8.4
The signals library is still called signals and not signals2.
Test-Information:
Builds and unit tests pass on Debian 8.4 with system GCC.
Change-Id: I1d1b3f6bade979bc8a181915176b84be0ddf6597
| -rw-r--r-- | BuildTools/SCons/SConstruct | 2 | ||||
| -rw-r--r-- | Sluift/SluiftClient.h | 8 | ||||
| -rw-r--r-- | Sluift/SluiftComponent.h | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct index 4cf8803..ef32b31 100644 --- a/BuildTools/SCons/SConstruct +++ b/BuildTools/SCons/SConstruct @@ -206,7 +206,7 @@ if env.get("boost_includedir", None) : boost_flags["CPPFLAGS"] = [("-isystem", env["boost_includedir"])] boost_conf_env.MergeFlags(boost_flags) conf = Configure(boost_conf_env) -boostLibs = [("signals2", None), ("system", "system/system_error.hpp"), ("thread", None), ("regex", None), ("program_options", None), ("filesystem", None), ("serialization", "archive/text_oarchive.hpp"), ("date_time", "date_time/date.hpp")] +boostLibs = [("signals", None), ("system", "system/system_error.hpp"), ("thread", None), ("regex", None), ("program_options", None), ("filesystem", None), ("serialization", "archive/text_oarchive.hpp"), ("date_time", "date_time/date.hpp")] allLibsPresent = True libNames = [] for (lib, header) in boostLibs : diff --git a/Sluift/SluiftClient.h b/Sluift/SluiftClient.h index f6bad86..1b0dd43 100644 --- a/Sluift/SluiftClient.h +++ b/Sluift/SluiftClient.h @@ -89,15 +89,15 @@ namespace Swift { template<typename REQUEST_TYPE> Sluift::Response sendRequest(REQUEST_TYPE request, int timeout) { - boost::signals2::scoped_connection c = request->onResponse.connect( - boost::bind(&SluiftClient::handleRequestResponse, this, _1, _2)); + boost::signals2::scoped_connection c(request->onResponse.connect( + boost::bind(&SluiftClient::handleRequestResponse, this, _1, _2))); return doSendRequest(request, timeout); } template<typename REQUEST_TYPE> Sluift::Response sendVoidRequest(REQUEST_TYPE request, int timeout) { - boost::signals2::scoped_connection c = request->onResponse.connect( - boost::bind(&SluiftClient::handleRequestResponse, this, std::shared_ptr<Payload>(), _1)); + boost::signals2::scoped_connection c(request->onResponse.connect( + boost::bind(&SluiftClient::handleRequestResponse, this, std::shared_ptr<Payload>(), _1))); return doSendRequest(request, timeout); } diff --git a/Sluift/SluiftComponent.h b/Sluift/SluiftComponent.h index 2278267..675d6c0 100644 --- a/Sluift/SluiftComponent.h +++ b/Sluift/SluiftComponent.h @@ -70,15 +70,15 @@ namespace Swift { template<typename REQUEST_TYPE> Sluift::Response sendRequest(REQUEST_TYPE request, int timeout) { - boost::signals2::scoped_connection c = request->onResponse.connect( - boost::bind(&SluiftComponent::handleRequestResponse, this, _1, _2)); + boost::signals2::scoped_connection c(request->onResponse.connect( + boost::bind(&SluiftComponent::handleRequestResponse, this, _1, _2))); return doSendRequest(request, timeout); } template<typename REQUEST_TYPE> Sluift::Response sendVoidRequest(REQUEST_TYPE request, int timeout) { - boost::signals2::scoped_connection c = request->onResponse.connect( - boost::bind(&SluiftComponent::handleRequestResponse, this, std::shared_ptr<Payload>(), _1)); + boost::signals2::scoped_connection c(request->onResponse.connect( + boost::bind(&SluiftComponent::handleRequestResponse, this, std::shared_ptr<Payload>(), _1))); return doSendRequest(request, timeout); } |