summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-02-19 08:33:57 (GMT)
committerKevin Smith <kevin.smith@isode.com>2016-02-29 17:37:05 (GMT)
commitb9272f22aab1409d111bd7b380f16e643786e42e (patch)
tree6c9a0e4b5b58ee9196797821068135470c925192
parentff65a1b2fd5789162cc8ee391754153a580ed732 (diff)
downloadswift-b9272f22aab1409d111bd7b380f16e643786e42e.zip
swift-b9272f22aab1409d111bd7b380f16e643786e42e.tar.bz2
Fix compilation with Boost 1.60
Building with Boost 1.60 showed a bug in WindowsGSSAPIClientAuthenticator.cpp, passing NULL to a method expecting a const boost::optional reference. Passing a default constructed boost::optional here instead now. Test-Information: Compiles with VS 2015 and Windows 10 and externally built Boost 1.60. Change-Id: I5c67d706dade21c60b006b13d441355714a42ec2
-rw-r--r--Swiften/SASL/WindowsGSSAPIClientAuthenticator.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/SASL/WindowsGSSAPIClientAuthenticator.cpp b/Swiften/SASL/WindowsGSSAPIClientAuthenticator.cpp
index f602bff..12b0dc4 100644
--- a/Swiften/SASL/WindowsGSSAPIClientAuthenticator.cpp
+++ b/Swiften/SASL/WindowsGSSAPIClientAuthenticator.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015 Isode Limited.
+ * Copyright (c) 2015-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -30,7 +30,7 @@ WindowsGSSAPIClientAuthenticator::WindowsGSSAPIClientAuthenticator(const std::st
haveCredentialsHandle_ = true;
}
- buildSecurityContext(NULL);
+ buildSecurityContext(boost::optional<ByteArray>());
}
WindowsGSSAPIClientAuthenticator::~WindowsGSSAPIClientAuthenticator() {