From a31719b54680d85729534254bf3ee0d9762dd33e Mon Sep 17 00:00:00 2001 From: gabime Date: Thu, 22 Nov 2018 18:49:14 +0200 Subject: [PATCH] clang-format --- bench/bench.cpp | 1 - include/spdlog/common.h | 15 +++++--- include/spdlog/details/log_msg.h | 6 ++-- include/spdlog/details/logger_impl.h | 4 +-- include/spdlog/details/pattern_formatter.h | 41 +++++++++++----------- include/spdlog/logger.h | 6 ++-- include/spdlog/spdlog.h | 1 - tests/test_macros.cpp | 1 - 8 files changed, 39 insertions(+), 36 deletions(-) diff --git a/bench/bench.cpp b/bench/bench.cpp index 814851f7..bebfd745 100644 --- a/bench/bench.cpp +++ b/bench/bench.cpp @@ -67,7 +67,6 @@ int main(int argc, char *argv[]) bench(howmany, spdlog::create("null_st")); - spdlog::info("**************************************************************"); spdlog::info("C-string (400 bytes). Single thread, {:n} iterations", howmany); spdlog::info("**************************************************************"); diff --git a/include/spdlog/common.h b/include/spdlog/common.h index ee4bc249..34c0862f 100644 --- a/include/spdlog/common.h +++ b/include/spdlog/common.h @@ -185,12 +185,19 @@ using filename_t = std::wstring; using filename_t = std::string; #endif - struct source_loc { - SPDLOG_CONSTEXPR source_loc(): filename(""), line(0) {} - SPDLOG_CONSTEXPR source_loc(const char *filename, int line) : filename(filename), line(line) {} - const char* const filename ; + SPDLOG_CONSTEXPR source_loc() + : filename("") + , line(0) + { + } + SPDLOG_CONSTEXPR source_loc(const char *filename, int line) + : filename(filename) + , line(line) + { + } + const char *const filename; const uint32_t line; }; diff --git a/include/spdlog/details/log_msg.h b/include/spdlog/details/log_msg.h index 56f4729a..affeb514 100644 --- a/include/spdlog/details/log_msg.h +++ b/include/spdlog/details/log_msg.h @@ -31,8 +31,10 @@ struct log_msg { } - log_msg(const std::string *loggers_name, level::level_enum lvl, string_view_t view): - log_msg(source_loc{}, loggers_name, lvl, view){} + log_msg(const std::string *loggers_name, level::level_enum lvl, string_view_t view) + : log_msg(source_loc{}, loggers_name, lvl, view) + { + } log_msg(const log_msg &other) = default; log_msg &operator=(const log_msg &other) = default; diff --git a/include/spdlog/details/logger_impl.h b/include/spdlog/details/logger_impl.h index de2f76ff..a7435f2e 100644 --- a/include/spdlog/details/logger_impl.h +++ b/include/spdlog/details/logger_impl.h @@ -57,7 +57,6 @@ inline void spdlog::logger::set_pattern(std::string pattern, pattern_time_type t set_formatter(std::move(new_formatter)); } - template inline void spdlog::logger::log(source_loc source, level::level_enum lvl, const char *fmt, const Args &... args) { @@ -77,11 +76,10 @@ inline void spdlog::logger::log(source_loc source, level::level_enum lvl, const SPDLOG_CATCH_AND_HANDLE } - template inline void spdlog::logger::log(level::level_enum lvl, const char *fmt, const Args &... args) { - log(source_loc{}, lvl, fmt, args...); + log(source_loc{}, lvl, fmt, args...); } inline void spdlog::logger::log(source_loc source, level::level_enum lvl, const char *msg) diff --git a/include/spdlog/details/pattern_formatter.h b/include/spdlog/details/pattern_formatter.h index 044006c5..e0e72081 100644 --- a/include/spdlog/details/pattern_formatter.h +++ b/include/spdlog/details/pattern_formatter.h @@ -813,34 +813,32 @@ class source_location_formatter final : public flag_formatter { public: explicit source_location_formatter(padding_info padinfo) - : flag_formatter(padinfo){}; + : flag_formatter(padinfo){}; -void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override -{ - if(padinfo_.width_) + void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override { - const auto text_size = std::char_traits::length(msg.source.filename) - + fmt_helper::count_digits(msg.source.line) - +1; - scoped_pad p(text_size, padinfo_, dest); - fmt_helper::append_string_view(msg.source.filename, dest); - dest.push_back(':'); - fmt_helper::append_int(msg.source.line, dest); + if (padinfo_.width_) + { + const auto text_size = std::char_traits::length(msg.source.filename) + fmt_helper::count_digits(msg.source.line) + 1; + scoped_pad p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.filename, dest); + dest.push_back(':'); + fmt_helper::append_int(msg.source.line, dest); + } + else + { + fmt_helper::append_string_view(msg.source.filename, dest); + dest.push_back(':'); + fmt_helper::append_int(msg.source.line, dest); + } } - else - { - fmt_helper::append_string_view(msg.source.filename, dest); - dest.push_back(':'); - fmt_helper::append_int(msg.source.line, dest); - } -} }; // print soruce filename class source_filename_formatter final : public flag_formatter { public: explicit source_filename_formatter(padding_info padinfo) - : flag_formatter(padinfo){}; + : flag_formatter(padinfo){}; void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override { @@ -853,12 +851,13 @@ class source_linenum_formatter final : public flag_formatter { public: explicit source_linenum_formatter(padding_info padinfo) - : flag_formatter(padinfo){}; + : flag_formatter(padinfo){}; void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override { - if(padinfo_.width_) { + if (padinfo_.width_) + { const size_t field_size = fmt::internal::count_digits(msg.source.line); scoped_pad p(field_size, padinfo_, dest); fmt_helper::append_int(msg.source.line, dest); diff --git a/include/spdlog/logger.h b/include/spdlog/logger.h index 640895a3..0f75a6f0 100644 --- a/include/spdlog/logger.h +++ b/include/spdlog/logger.h @@ -105,9 +105,9 @@ public: template::value, T>::type * = nullptr> void log(level::level_enum lvl, const T &); - // T can be statically converted to string_view - template::value, T>::type * = nullptr> - void log(source_loc loc, level::level_enum lvl, const T &); + // T can be statically converted to string_view + template::value, T>::type * = nullptr> + void log(source_loc loc, level::level_enum lvl, const T &); // T cannot be statically converted to string_view template::value, T>::type * = nullptr> diff --git a/include/spdlog/spdlog.h b/include/spdlog/spdlog.h index 64a53fbe..301ae97d 100644 --- a/include/spdlog/spdlog.h +++ b/include/spdlog/spdlog.h @@ -309,7 +309,6 @@ inline void critical(const wchar_t *fmt, const Args &... args) // SPDLOG_LEVEL_OFF // - #define SPDLOG_LOGGER_LOG(logger, level, ...) logger->log(spdlog::source_loc{__FILE__, __LINE__}, level, __VA_ARGS__) #if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_TRACE diff --git a/tests/test_macros.cpp b/tests/test_macros.cpp index cf917069..22a5ccbf 100644 --- a/tests/test_macros.cpp +++ b/tests/test_macros.cpp @@ -33,7 +33,6 @@ TEST_CASE("debug and trace w/o format string", "[macros]]") REQUIRE(ends_with(file_contents(filename), "Test message 4\n")); REQUIRE(count_lines(filename) == 2); - } TEST_CASE("disable param evaluation", "[macros]")