diff options
| -rw-r--r-- | bench/async_bench.cpp | 12 | ||||
| -rw-r--r-- | include/spdlog/details/pattern_formatter-inl.h | 4 | ||||
| -rw-r--r-- | include/spdlog/spdlog.h | 2 | ||||
| -rw-r--r-- | tests/test_pattern_formatter.cpp | 1 |
4 files changed, 9 insertions, 10 deletions
diff --git a/bench/async_bench.cpp b/bench/async_bench.cpp index eaa3a9ee..e5732725 100644 --- a/bench/async_bench.cpp +++ b/bench/async_bench.cpp @@ -26,11 +26,10 @@ using namespace utils; void bench_mt(int howmany, std::shared_ptr<spdlog::logger> log, int thread_count); - #ifdef _MSC_VER -#pragma warning(push) -#pragma warning(disable : 4996) //disable fopen warning under msvc -#endif // _MSC_VER +#pragma warning(push) +#pragma warning(disable : 4996) // disable fopen warning under msvc +#endif // _MSC_VER int count_lines(const char *filename) { @@ -59,7 +58,7 @@ void verify_file(const char *filename, int expected_count) } #ifdef _MSC_VER -#pragma warning(pop) +#pragma warning(pop) #endif int main(int argc, char *argv[]) @@ -130,7 +129,8 @@ int main(int argc, char *argv[]) { auto tp = std::make_shared<details::thread_pool>(queue_size, 1); auto file_sink = std::make_shared<spdlog::sinks::basic_file_sink_mt>(filename, true); - auto logger = std::make_shared<async_logger>("async_logger", std::move(file_sink), std::move(tp), async_overflow_policy::overrun_oldest); + auto logger = + std::make_shared<async_logger>("async_logger", std::move(file_sink), std::move(tp), async_overflow_policy::overrun_oldest); bench_mt(howmany, std::move(logger), threads); } spdlog::shutdown(); diff --git a/include/spdlog/details/pattern_formatter-inl.h b/include/spdlog/details/pattern_formatter-inl.h index 6124c946..fe92e7b9 100644 --- a/include/spdlog/details/pattern_formatter-inl.h +++ b/include/spdlog/details/pattern_formatter-inl.h @@ -828,10 +828,10 @@ public: : flag_formatter(padinfo) {} - static const char* basename(const char* filename) + static const char *basename(const char *filename) { const char *rv = std::strrchr(filename, os::folder_sep); - return rv != nullptr ? rv + 1: filename; + return rv != nullptr ? rv + 1 : filename; } void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override diff --git a/include/spdlog/spdlog.h b/include/spdlog/spdlog.h index d3dd2af1..dfa42145 100644 --- a/include/spdlog/spdlog.h +++ b/include/spdlog/spdlog.h @@ -267,7 +267,7 @@ inline void critical(const wchar_t *fmt, const Args &... args) do \ { \ if (logger->should_log(level)) \ - logger->log(spdlog::source_loc{__FILE__, __LINE__, SPDLOG_FUNCTION}, level, __VA_ARGS__); \ + logger->log(spdlog::source_loc{__FILE__, __LINE__, SPDLOG_FUNCTION}, level, __VA_ARGS__); \ } while (0) #if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_TRACE diff --git a/tests/test_pattern_formatter.cpp b/tests/test_pattern_formatter.cpp index c661db28..632cdfc0 100644 --- a/tests/test_pattern_formatter.cpp +++ b/tests/test_pattern_formatter.cpp @@ -301,4 +301,3 @@ TEST_CASE("full filename formatter", "[pattern_formatter]") formatter.format(msg, formatted); REQUIRE(fmt::to_string(formatted) == "/a/b/c/d/myfile.cpp:123"); } - |