summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2018-04-28 12:11:33 (GMT)
committerKevin Smith <git@kismith.co.uk>2018-04-28 12:11:33 (GMT)
commitc9d97d5acf4a158c6129d72e491580c29b54322b (patch)
treebcc82501886e7a6148bb6fcac5367f9a816081da
parent522dfe5cd1390181ec8fb3f5fa3c8f665af3f806 (diff)
downloadswift-c9d97d5acf4a158c6129d72e491580c29b54322b.zip
swift-c9d97d5acf4a158c6129d72e491580c29b54322b.tar.bz2
Fix compiler warnings for Sluift
Test-Information: ./scons allow_warnings=0 Sluift now builds on latest macOS Change-Id: I7aca1c733dd86c772fc3a55f76d4915ad3c76e8d
-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 a48c681..8cc815d 100644
--- a/Sluift/SluiftClient.h
+++ b/Sluift/SluiftClient.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2017 Isode Limited.
+ * Copyright (c) 2013-2018 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -110,7 +110,7 @@ namespace Swift {
void disconnect();
void setSoftwareVersion(const std::string& name, const std::string& version, const std::string& os);
boost::optional<SluiftClient::Event> getNextEvent(int timeout,
- boost::function<bool (const Event&)> condition = 0);
+ boost::function<bool (const Event&)> condition = boost::function<bool (const Event&)>());
std::vector<XMPPRosterItem> getRoster(int timeout);
std::vector<JID> getBlockList(int timeout);
diff --git a/Sluift/SluiftComponent.h b/Sluift/SluiftComponent.h
index d45c3b2..9fc7101 100644
--- a/Sluift/SluiftComponent.h
+++ b/Sluift/SluiftComponent.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014-2016 Isode Limited.
+ * Copyright (c) 2014-2018 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -85,7 +85,7 @@ namespace Swift {
void disconnect();
void setSoftwareVersion(const std::string& name, const std::string& version, const std::string& os);
boost::optional<SluiftComponent::Event> getNextEvent(int timeout,
- boost::function<bool (const Event&)> condition = 0);
+ boost::function<bool (const Event&)> condition = boost::function<bool (const Event&)>());
private:
Sluift::Response doSendRequest(std::shared_ptr<Request> request, int timeout);