From b7a66594511f6dc505b01fe5456f3fec9b704695 Mon Sep 17 00:00:00 2001 From: gabime Date: Thu, 4 Oct 2018 02:10:46 +0300 Subject: [PATCH] code formatting --- include/spdlog/details/logger_impl.h | 7 +++---- include/spdlog/logger.h | 2 +- tests/test_fmt_helper.cpp | 9 +++------ 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/include/spdlog/details/logger_impl.h b/include/spdlog/details/logger_impl.h index 84e9c3d1..6b12a4dd 100644 --- a/include/spdlog/details/logger_impl.h +++ b/include/spdlog/details/logger_impl.h @@ -185,7 +185,7 @@ inline void wbuf_to_utf8buf(const fmt::wmemory_buffer &wbuf, fmt::memory_buffer } auto result_size = ::WideCharToMultiByte(CP_UTF8, 0, wbuf.data(), wbuf_size, NULL, 0, NULL, NULL); - + if (result_size > 0) { target.resize(result_size); @@ -197,7 +197,6 @@ inline void wbuf_to_utf8buf(const fmt::wmemory_buffer &wbuf, fmt::memory_buffer } } - template inline void spdlog::logger::log(level::level_enum lvl, const wchar_t *fmt, const Args &... args) { @@ -208,10 +207,10 @@ inline void spdlog::logger::log(level::level_enum lvl, const wchar_t *fmt, const try { - // format to wmemory_buffer and convert to utf8 + // format to wmemory_buffer and convert to utf8 details::log_msg log_msg(&name_, lvl); fmt::wmemory_buffer wbuf; - fmt::format_to(wbuf, fmt, args...); + fmt::format_to(wbuf, fmt, args...); wbuf_to_utf8buf(wbuf, log_msg.raw); sink_it_(log_msg); } diff --git a/include/spdlog/logger.h b/include/spdlog/logger.h index 9df57c9b..18496bce 100644 --- a/include/spdlog/logger.h +++ b/include/spdlog/logger.h @@ -22,10 +22,10 @@ #include "spdlog/formatter.h" #include "spdlog/sinks/sink.h" +#include #include #include #include -#include namespace spdlog { diff --git a/tests/test_fmt_helper.cpp b/tests/test_fmt_helper.cpp index 3bfac918..415638ae 100644 --- a/tests/test_fmt_helper.cpp +++ b/tests/test_fmt_helper.cpp @@ -1,28 +1,27 @@ #include "includes.h" -void test_pad2(int n, const char* expected) +void test_pad2(int n, const char *expected) { fmt::memory_buffer buf; spdlog::details::fmt_helper::pad2(n, buf); REQUIRE(fmt::to_string(buf) == expected); } -void test_pad3(int n, const char* expected) +void test_pad3(int n, const char *expected) { fmt::memory_buffer buf; spdlog::details::fmt_helper::pad3(n, buf); REQUIRE(fmt::to_string(buf) == expected); } -void test_pad6(std::size_t n, const char* expected) +void test_pad6(std::size_t n, const char *expected) { fmt::memory_buffer buf; spdlog::details::fmt_helper::pad6(n, buf); REQUIRE(fmt::to_string(buf) == expected); } - TEST_CASE("pad2", "[fmt_helper]") { test_pad2(0, "00"); @@ -43,7 +42,6 @@ TEST_CASE("pad3", "[fmt_helper]") test_pad3(-5, "-05"); } - TEST_CASE("pad6", "[fmt_helper]") { test_pad6(0, "000000"); @@ -54,4 +52,3 @@ TEST_CASE("pad6", "[fmt_helper]") test_pad6(12345, "012345"); test_pad6(123456, "123456"); } -