Swiftdiff options
| author | Bruce Stephens <bruce.stephens@isode.com> | 2019-01-09 16:21:20 (GMT) |
|---|---|---|
| committer | Edwin Mons <edwin.mons@isode.com> | 2019-01-22 11:08:09 (GMT) |
| commit | a21993d750396d755717df21e331df87af8a0c6a (patch) | |
| tree | 394cef7b3f1dbe0f69577fe993b7cfc8386efee4 | |
| parent | 6874d64ed2684d83cb3e340f58f6c8c5089aa857 (diff) | |
| download | swift-a21993d750396d755717df21e331df87af8a0c6a.zip swift-a21993d750396d755717df21e331df87af8a0c6a.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
| -rw-r--r-- | Swiften/Network/PlatformNATTraversalWorker.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/Network/PlatformNATTraversalWorker.cpp b/Swiften/Network/PlatformNATTraversalWorker.cpp index f56de0b..eaa13b3 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; } |