mirrors/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2024-12-24 17:41:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

code formatting

Browse Source
This commit is contained in:
gabime 2018-10-04 02:10:46 +03:00
parent 102c31a04c
commit b7a6659451
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/spdlog/details/logger_impl.h
View File

@ -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); auto result_size = ::WideCharToMultiByte(CP_UTF8, 0, wbuf.data(), wbuf_size, NULL, 0, NULL, NULL);
if (result_size > 0) if (result_size > 0)
{ {
target.resize(result_size); target.resize(result_size);
@ -197,7 +197,6 @@ inline void wbuf_to_utf8buf(const fmt::wmemory_buffer &wbuf, fmt::memory_buffer
} }
} }
template<typename... Args> template<typename... Args>
inline void spdlog::logger::log(level::level_enum lvl, const wchar_t *fmt, const Args &... args) 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 try
{ {
// format to wmemory_buffer and convert to utf8 // format to wmemory_buffer and convert to utf8
details::log_msg log_msg(&name_, lvl); details::log_msg log_msg(&name_, lvl);
fmt::wmemory_buffer wbuf; fmt::wmemory_buffer wbuf;
fmt::format_to(wbuf, fmt, args...); fmt::format_to(wbuf, fmt, args...);
wbuf_to_utf8buf(wbuf, log_msg.raw); wbuf_to_utf8buf(wbuf, log_msg.raw);
sink_it_(log_msg); sink_it_(log_msg);
} }

2
include/spdlog/logger.h
View File

@ -22,10 +22,10 @@
#include "spdlog/formatter.h" #include "spdlog/formatter.h"
#include "spdlog/sinks/sink.h" #include "spdlog/sinks/sink.h"
#include <locale>
#include <memory> #include <memory>
#include <string> #include <string>
#include <vector> #include <vector>
#include <locale>
namespace spdlog { namespace spdlog {

9
tests/test_fmt_helper.cpp
View File

@ -1,28 +1,27 @@
#include "includes.h" #include "includes.h"
void test_pad2(int n, const char* expected) void test_pad2(int n, const char *expected)
{ {
fmt::memory_buffer buf; fmt::memory_buffer buf;
spdlog::details::fmt_helper::pad2(n, buf); spdlog::details::fmt_helper::pad2(n, buf);
REQUIRE(fmt::to_string(buf) == expected); 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; fmt::memory_buffer buf;
spdlog::details::fmt_helper::pad3(n, buf); spdlog::details::fmt_helper::pad3(n, buf);
REQUIRE(fmt::to_string(buf) == expected); 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; fmt::memory_buffer buf;
spdlog::details::fmt_helper::pad6(n, buf); spdlog::details::fmt_helper::pad6(n, buf);
REQUIRE(fmt::to_string(buf) == expected); REQUIRE(fmt::to_string(buf) == expected);
} }
TEST_CASE("pad2", "[fmt_helper]") TEST_CASE("pad2", "[fmt_helper]")
{ {
test_pad2(0, "00"); test_pad2(0, "00");
@ -43,7 +42,6 @@ TEST_CASE("pad3", "[fmt_helper]")
test_pad3(-5, "-05"); test_pad3(-5, "-05");
} }
TEST_CASE("pad6", "[fmt_helper]") TEST_CASE("pad6", "[fmt_helper]")
{ {
test_pad6(0, "000000"); test_pad6(0, "000000");
@ -54,4 +52,3 @@ TEST_CASE("pad6", "[fmt_helper]")
test_pad6(12345, "012345"); test_pad6(12345, "012345");
test_pad6(123456, "123456"); test_pad6(123456, "123456");
} }