summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Stephens <bruce.stephens@isode.com>2019-01-09 16:21:20 (GMT)
committerKevin Smith <kevin.smith@isode.com>2019-01-22 09:54:57 (GMT)
commita2dc74cd0e4891037b97b6a782de80458675e4f0 (patch)
treee0ce1ead1dcf173eb4016e7f2e7028536ed47b15 /Swiften
parent9a27bc87984613a63cb6cfb651282b824df51c81 (diff)
downloadswift-a2dc74cd0e4891037b97b6a782de80458675e4f0.zip
swift-a2dc74cd0e4891037b97b6a782de80458675e4f0.tar.bz2
Don't assume that tribool has an implicit bool conversion
In boost 1.68.0 the conversion is implicit, but in 1.69.0 it's explicit and we must explicitly call it. Change-Id: I24eb78be7510c89b88342d28c539cad4977f99fd
Diffstat (limited to 'Swiften')
-rw-r--r--Swiften/Network/PlatformNATTraversalWorker.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/Network/PlatformNATTraversalWorker.cpp b/Swiften/Network/PlatformNATTraversalWorker.cpp
index af12049..041ad2d 100644
--- a/Swiften/Network/PlatformNATTraversalWorker.cpp
+++ b/Swiften/Network/PlatformNATTraversalWorker.cpp
@@ -157,7 +157,7 @@ NATTraversalInterface* PlatformNATTraversalWorker::getNATTraversalInterface() co
miniUPnPInterface = new MiniUPnPInterface();
miniUPnPSupported = miniUPnPInterface->isAvailable();
}
- SWIFT_LOG(debug) << "UPnP NAT traversal supported: " << miniUPnPSupported << std::endl;
+ SWIFT_LOG(debug) << "UPnP NAT traversal supported: " << static_cast<bool>(miniUPnPSupported) << std::endl;
if (miniUPnPSupported) {
return miniUPnPInterface;
}
@@ -168,7 +168,7 @@ NATTraversalInterface* PlatformNATTraversalWorker::getNATTraversalInterface() co
natPMPInterface = new NATPMPInterface();
natPMPSupported = natPMPInterface->isAvailable();
}
- SWIFT_LOG(debug) << "NAT-PMP NAT traversal supported: " << natPMPSupported << std::endl;
+ SWIFT_LOG(debug) << "NAT-PMP NAT traversal supported: " << static_cast<bool>(natPMPSupported) << std::endl;
if (natPMPSupported) {
return natPMPInterface;
}