From eece9049d1c55b890222b02d653f06d68f37e269 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Wed, 6 Apr 2016 22:45:30 +0200
Subject: 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

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);
             }
 
-- 
cgit v0.10.2-6-g49f6