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/FileTransfer/LocalJingleTransportCandidateGenerator.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/FileTransfer/LocalJingleTransportCandidateGenerator.cpp')
| -rw-r--r-- | Swiften/FileTransfer/LocalJingleTransportCandidateGenerator.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Swiften/FileTransfer/LocalJingleTransportCandidateGenerator.cpp b/Swiften/FileTransfer/LocalJingleTransportCandidateGenerator.cpp index 834a401..7cb4cbb 100644 --- a/Swiften/FileTransfer/LocalJingleTransportCandidateGenerator.cpp +++ b/Swiften/FileTransfer/LocalJingleTransportCandidateGenerator.cpp | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | /* | 7 | /* |
| 8 | * Copyright (c) 2013-2016 Isode Limited. | 8 | * Copyright (c) 2013-2019 Isode Limited. |
| 9 | * All rights reserved. | 9 | * All rights reserved. |
| 10 | * See the COPYING file for more information. | 10 | * See the COPYING file for more information. |
| 11 | */ | 11 | */ |
| @@ -45,7 +45,7 @@ LocalJingleTransportCandidateGenerator::LocalJingleTransportCandidateGenerator( | |||
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | LocalJingleTransportCandidateGenerator::~LocalJingleTransportCandidateGenerator() { | 47 | LocalJingleTransportCandidateGenerator::~LocalJingleTransportCandidateGenerator() { |
| 48 | SWIFT_LOG_ASSERT(!s5bServerInitializeRequest, warning) << std::endl; | 48 | SWIFT_LOG_ASSERT(!s5bServerInitializeRequest, warning); |
| 49 | } | 49 | } |
| 50 | 50 | ||
| 51 | void LocalJingleTransportCandidateGenerator::start() { | 51 | void LocalJingleTransportCandidateGenerator::start() { |
| @@ -98,7 +98,7 @@ void LocalJingleTransportCandidateGenerator::handleS5BServerInitialized(bool suc | |||
| 98 | } | 98 | } |
| 99 | } | 99 | } |
| 100 | else { | 100 | else { |
| 101 | SWIFT_LOG(warning) << "Unable to start SOCKS5 server" << std::endl; | 101 | SWIFT_LOG(warning) << "Unable to start SOCKS5 server"; |
| 102 | if (s5bServerResourceUser_) { | 102 | if (s5bServerResourceUser_) { |
| 103 | s5bServerResourceUser_->onSuccessfulInitialized.disconnect(boost::bind(&LocalJingleTransportCandidateGenerator::handleS5BServerInitialized, this, _1)); | 103 | s5bServerResourceUser_->onSuccessfulInitialized.disconnect(boost::bind(&LocalJingleTransportCandidateGenerator::handleS5BServerInitialized, this, _1)); |
| 104 | } | 104 | } |