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/StreamManagement/StanzaAckRequester.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/StreamManagement/StanzaAckRequester.cpp')
| -rw-r--r-- | Swiften/StreamManagement/StanzaAckRequester.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/StreamManagement/StanzaAckRequester.cpp b/Swiften/StreamManagement/StanzaAckRequester.cpp index a0f5b70..c71803a 100644 --- a/Swiften/StreamManagement/StanzaAckRequester.cpp +++ b/Swiften/StreamManagement/StanzaAckRequester.cpp | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2010-2018 Isode Limited. | 2 | * Copyright (c) 2010-2019 Isode Limited. |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * See the COPYING file for more information. | 4 | * See the COPYING file for more information. |
| 5 | */ | 5 | */ |
| @@ -28,7 +28,7 @@ void StanzaAckRequester::handleAckReceived(unsigned int handledStanzasCount) { | |||
| 28 | unsigned int i = lastHandledStanzasCount; | 28 | unsigned int i = lastHandledStanzasCount; |
| 29 | while (i != handledStanzasCount) { | 29 | while (i != handledStanzasCount) { |
| 30 | if (unackedStanzas.empty()) { | 30 | if (unackedStanzas.empty()) { |
| 31 | SWIFT_LOG(warning) << "Server acked more stanzas than we sent" << std::endl; | 31 | SWIFT_LOG(warning) << "Server acked more stanzas than we sent"; |
| 32 | break; | 32 | break; |
| 33 | } | 33 | } |
| 34 | std::shared_ptr<Stanza> ackedStanza = unackedStanzas.front(); | 34 | std::shared_ptr<Stanza> ackedStanza = unackedStanzas.front(); |