Swiftdiff options
| author | Bruce Stephens <bruce.stephens@isode.com> | 2019-01-09 16:21:20 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2019-01-22 09:54:57 (GMT) |
| commit | a2dc74cd0e4891037b97b6a782de80458675e4f0 (patch) | |
| tree | e0ce1ead1dcf173eb4016e7f2e7028536ed47b15 | |
| parent | 9a27bc87984613a63cb6cfb651282b824df51c81 (diff) | |
| download | swift-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
| -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 af12049..041ad2d 100644 --- a/Swiften/Network/PlatformNATTraversalWorker.cpp +++ b/Swiften/Network/PlatformNATTraversalWorker.cpp | |||
| @@ -157,7 +157,7 @@ NATTraversalInterface* PlatformNATTraversalWorker::getNATTraversalInterface() co | |||
| 157 | miniUPnPInterface = new MiniUPnPInterface(); | 157 | miniUPnPInterface = new MiniUPnPInterface(); |
| 158 | miniUPnPSupported = miniUPnPInterface->isAvailable(); | 158 | miniUPnPSupported = miniUPnPInterface->isAvailable(); |
| 159 | } | 159 | } |
| 160 | SWIFT_LOG(debug) << "UPnP NAT traversal supported: " << miniUPnPSupported << std::endl; | 160 | SWIFT_LOG(debug) << "UPnP NAT traversal supported: " << static_cast<bool>(miniUPnPSupported) << std::endl; |
| 161 | if (miniUPnPSupported) { | 161 | if (miniUPnPSupported) { |
| 162 | return miniUPnPInterface; | 162 | return miniUPnPInterface; |
| 163 | } | 163 | } |
| @@ -168,7 +168,7 @@ NATTraversalInterface* PlatformNATTraversalWorker::getNATTraversalInterface() co | |||
| 168 | natPMPInterface = new NATPMPInterface(); | 168 | natPMPInterface = new NATPMPInterface(); |
| 169 | natPMPSupported = natPMPInterface->isAvailable(); | 169 | natPMPSupported = natPMPInterface->isAvailable(); |
| 170 | } | 170 | } |
| 171 | SWIFT_LOG(debug) << "NAT-PMP NAT traversal supported: " << natPMPSupported << std::endl; | 171 | SWIFT_LOG(debug) << "NAT-PMP NAT traversal supported: " << static_cast<bool>(natPMPSupported) << std::endl; |
| 172 | if (natPMPSupported) { | 172 | if (natPMPSupported) { |
| 173 | return natPMPInterface; | 173 | return natPMPInterface; |
| 174 | } | 174 | } |