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 /SwifTools/Application | |
| 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 'SwifTools/Application')
| -rw-r--r-- | SwifTools/Application/ApplicationPathProvider.cpp | 4 | ||||
| -rw-r--r-- | SwifTools/Application/MacOSXApplicationPathProvider.cpp | 4 | ||||
| -rw-r--r-- | SwifTools/Application/UnixApplicationPathProvider.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/SwifTools/Application/ApplicationPathProvider.cpp b/SwifTools/Application/ApplicationPathProvider.cpp index 8b952bb..77457ef 100644 --- a/SwifTools/Application/ApplicationPathProvider.cpp +++ b/SwifTools/Application/ApplicationPathProvider.cpp | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2010-2016 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 | */ |
| @@ -25,7 +25,7 @@ boost::filesystem::path ApplicationPathProvider::getProfileDir(const std::string | |||
| 25 | boost::filesystem::create_directory(result); | 25 | boost::filesystem::create_directory(result); |
| 26 | } | 26 | } |
| 27 | catch (const boost::filesystem::filesystem_error& e) { | 27 | catch (const boost::filesystem::filesystem_error& e) { |
| 28 | SWIFT_LOG(error) << e.what() << std::endl; | 28 | SWIFT_LOG(error) << e.what(); |
| 29 | } | 29 | } |
| 30 | return result; | 30 | return result; |
| 31 | } | 31 | } |
diff --git a/SwifTools/Application/MacOSXApplicationPathProvider.cpp b/SwifTools/Application/MacOSXApplicationPathProvider.cpp index 684d8b2..d7b99b9 100644 --- a/SwifTools/Application/MacOSXApplicationPathProvider.cpp +++ b/SwifTools/Application/MacOSXApplicationPathProvider.cpp | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2010-2016 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 | */ |
| @@ -23,7 +23,7 @@ boost::filesystem::path MacOSXApplicationPathProvider::getDataDir() const { | |||
| 23 | boost::filesystem::create_directory(result); | 23 | boost::filesystem::create_directory(result); |
| 24 | } | 24 | } |
| 25 | catch (const boost::filesystem::filesystem_error& e) { | 25 | catch (const boost::filesystem::filesystem_error& e) { |
| 26 | SWIFT_LOG(error) << e.what() << std::endl; | 26 | SWIFT_LOG(error) << e.what(); |
| 27 | } | 27 | } |
| 28 | return result; | 28 | return result; |
| 29 | } | 29 | } |
diff --git a/SwifTools/Application/UnixApplicationPathProvider.cpp b/SwifTools/Application/UnixApplicationPathProvider.cpp index e455d23..a345766 100644 --- a/SwifTools/Application/UnixApplicationPathProvider.cpp +++ b/SwifTools/Application/UnixApplicationPathProvider.cpp | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2010-2016 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 | */ |
| @@ -54,7 +54,7 @@ boost::filesystem::path UnixApplicationPathProvider::getDataDir() const { | |||
| 54 | boost::filesystem::create_directories(dataPath); | 54 | boost::filesystem::create_directories(dataPath); |
| 55 | } | 55 | } |
| 56 | catch (const boost::filesystem::filesystem_error& e) { | 56 | catch (const boost::filesystem::filesystem_error& e) { |
| 57 | SWIFT_LOG(error) << "file system error: " << e.what() << std::endl; | 57 | SWIFT_LOG(error) << "file system error: " << e.what(); |
| 58 | } | 58 | } |
| 59 | return dataPath; | 59 | return dataPath; |
| 60 | } | 60 | } |