summaryrefslogtreecommitdiffstats
path: root/Sluift
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-04-05 13:17:19 (GMT)
committerTobias Markmann <tm@ayena.de>2016-04-05 19:42:39 (GMT)
commit2b560b129b7a31fc8cc07f618e763c95a22bf832 (patch)
tree73e72cdc758b79d01485dc28dcedd48b26859ae8 /Sluift
parent3c560e31b0f168da917e8d566db01fd1cd997d86 (diff)
downloadswift-2b560b129b7a31fc8cc07f618e763c95a22bf832.zip
swift-2b560b129b7a31fc8cc07f618e763c95a22bf832.tar.bz2
Migrate to Boost.Signals2 from Boost.Signals
Boost.Signals was deprecated and is not improved further. This patch removes Boost.Signals from 3rdParty and adds Boost.Signals2 and its dependencies. Also removed the Qt signals compatibility file Swiften/Base/boost_bsignals.h. Test-Information: Build and ran unit tests on OS X 10.11.4. Confirmed successful login using Swift client. Change-Id: Ie6e3b2d15aac2462cda95401582f5287a479fb54
Diffstat (limited to 'Sluift')
-rw-r--r--Sluift/SluiftClient.h4
-rw-r--r--Sluift/SluiftComponent.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/Sluift/SluiftClient.h b/Sluift/SluiftClient.h
index 42a59e9..f6bad86 100644
--- a/Sluift/SluiftClient.h
+++ b/Sluift/SluiftClient.h
@@ -89,14 +89,14 @@ namespace Swift {
template<typename REQUEST_TYPE>
Sluift::Response sendRequest(REQUEST_TYPE request, int timeout) {
- boost::signals::scoped_connection c = request->onResponse.connect(
+ 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::signals::scoped_connection c = request->onResponse.connect(
+ 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 83bd52f..2278267 100644
--- a/Sluift/SluiftComponent.h
+++ b/Sluift/SluiftComponent.h
@@ -70,14 +70,14 @@ namespace Swift {
template<typename REQUEST_TYPE>
Sluift::Response sendRequest(REQUEST_TYPE request, int timeout) {
- boost::signals::scoped_connection c = request->onResponse.connect(
+ 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::signals::scoped_connection c = request->onResponse.connect(
+ boost::signals2::scoped_connection c = request->onResponse.connect(
boost::bind(&SluiftComponent::handleRequestResponse, this, std::shared_ptr<Payload>(), _1));
return doSendRequest(request, timeout);
}