From b9272f22aab1409d111bd7b380f16e643786e42e Mon Sep 17 00:00:00 2001 From: Tobias Markmann <tm@ayena.de> Date: Fri, 19 Feb 2016 09:33:57 +0100 Subject: 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 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() { -- cgit v0.10.2-6-g49f6