From c41b6d28b514169dc3a91330c74207f3889c6b6e Mon Sep 17 00:00:00 2001 From: gabime Date: Fri, 24 Nov 2017 20:59:58 +0200 Subject: [PATCH] astyle --- include/spdlog/details/async_log_helper.h | 8 ++++---- include/spdlog/details/async_logger_impl.h | 2 +- include/spdlog/details/logger_impl.h | 13 +++++++------ include/spdlog/details/pattern_formatter_impl.h | 2 +- include/spdlog/fmt/bundled/format.h | 12 ++++++------ 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/include/spdlog/details/async_log_helper.h b/include/spdlog/details/async_log_helper.h index 7fb4922c..0adc72b5 100644 --- a/include/spdlog/details/async_log_helper.h +++ b/include/spdlog/details/async_log_helper.h @@ -279,13 +279,13 @@ inline void spdlog::details::async_log_helper::worker_loop() catch (const std::exception &ex) { _err_handler(ex.what()); - } - catch(...) + } + catch(...) { _err_handler("Unknown exeption in worker loop. Terminating worker loop"); - active = false; + active = false; - } + } } if (_worker_teardown_cb) _worker_teardown_cb(); diff --git a/include/spdlog/details/async_logger_impl.h b/include/spdlog/details/async_logger_impl.h index 1b8bd1ca..83732117 100644 --- a/include/spdlog/details/async_logger_impl.h +++ b/include/spdlog/details/async_logger_impl.h @@ -98,7 +98,7 @@ inline void spdlog::async_logger::_sink_it(details::log_msg& msg) { _err_handler(ex.what()); } - catch(...) + catch(...) { _err_handler("Unknown exception in logger " + _name); throw; diff --git a/include/spdlog/details/logger_impl.h b/include/spdlog/details/logger_impl.h index 492a9461..a0da380d 100644 --- a/include/spdlog/details/logger_impl.h +++ b/include/spdlog/details/logger_impl.h @@ -77,10 +77,11 @@ inline void spdlog::logger::log(level::level_enum lvl, const char* fmt, const Ar { _err_handler(ex.what()); } - catch(...) { - _err_handler("Unknown exception in logger " + _name); - throw; - } + catch(...) + { + _err_handler("Unknown exception in logger " + _name); + throw; + } } template @@ -96,7 +97,7 @@ inline void spdlog::logger::log(level::level_enum lvl, const char* msg) catch (const std::exception &ex) { _err_handler(ex.what()); - } + } } template @@ -112,7 +113,7 @@ inline void spdlog::logger::log(level::level_enum lvl, const T& msg) catch (const std::exception &ex) { _err_handler(ex.what()); - } + } } diff --git a/include/spdlog/details/pattern_formatter_impl.h b/include/spdlog/details/pattern_formatter_impl.h index a73f5dea..837bd5eb 100644 --- a/include/spdlog/details/pattern_formatter_impl.h +++ b/include/spdlog/details/pattern_formatter_impl.h @@ -526,7 +526,7 @@ inline void spdlog::pattern_formatter::handle_flag(char flag) { switch (flag) { - // logger name + // logger name case 'n': _formatters.push_back(std::unique_ptr(new details::name_formatter())); break; diff --git a/include/spdlog/fmt/bundled/format.h b/include/spdlog/fmt/bundled/format.h index 91f43481..97fe71a2 100644 --- a/include/spdlog/fmt/bundled/format.h +++ b/include/spdlog/fmt/bundled/format.h @@ -488,7 +488,7 @@ template class BasicPrintfArgFormatter; template > + typename ArgFormatter = fmt::ArgFormatter > class BasicFormatter; /** @@ -2618,15 +2618,15 @@ inline uint64_t make_type(const T &arg) } template - struct ArgArray; +struct ArgArray; template struct ArgArray { typedef Value Type[N > 0 ? N : 1]; -template -static Value make(const T &value) + template + static Value make(const T &value) { #ifdef __clang__ Value result = MakeValue(value); @@ -2638,7 +2638,7 @@ static Value make(const T &value) return MakeValue(value); #endif } - }; +}; template struct ArgArray @@ -3473,7 +3473,7 @@ void BasicWriter::write_double(T value, const Spec &spec) // MSVC's printf doesn't support 'F'. type = 'f'; #endif - // Fall through. + // Fall through. case 'E': case 'G': case 'A':