Swiftdiff options
| author | Edwin Mons <edwin.mons@isode.com> | 2019-11-19 13:36:05 (GMT) |
|---|---|---|
| committer | Edwin Mons <edwin.mons@isode.com> | 2019-11-19 13:58:45 (GMT) |
| commit | 261ba8d8595ed8cb90f9c4feb1d6ef642942bcba (patch) | |
| tree | c7e60d473509db8c4dbff5aa83fbde963d8dd75e /Swiften/Network/PlatformNATTraversalWorker.cpp | |
| parent | 697ae6ae84512a744958b24118197ec7bfdbc1f0 (diff) | |
| download | swift-261ba8d8595ed8cb90f9c4feb1d6ef642942bcba.zip swift-261ba8d8595ed8cb90f9c4feb1d6ef642942bcba.tar.bz2 | |
Remove std::endl from SWIFT_LOG calls
The std::endl is now added by ~Log, but only for output to stderr or a
log file. Calls to the Android logging system or manually set callbacks
will not include the newline in the logging output.
JIRA: SWIFT-430
Test-Information:
Unit tests pass on Debian 9
Checked that running Swift with logging to stderr still had a newline.
Change-Id: I096fdba78a3b8f87db2097951c28c528592183e8
Diffstat (limited to 'Swiften/Network/PlatformNATTraversalWorker.cpp')
| -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 041ad2d..5431379 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: " << static_cast<bool>(miniUPnPSupported) << std::endl; | 160 | SWIFT_LOG(debug) << "UPnP NAT traversal supported: " << static_cast<bool>(miniUPnPSupported); |
| 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: " << static_cast<bool>(natPMPSupported) << std::endl; | 171 | SWIFT_LOG(debug) << "NAT-PMP NAT traversal supported: " << static_cast<bool>(natPMPSupported); |
| 172 | if (natPMPSupported) { | 172 | if (natPMPSupported) { |
| 173 | return natPMPInterface; | 173 | return natPMPInterface; |
| 174 | } | 174 | } |