mirrors/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2024-12-25 18:11:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

clang-format

Browse Source
This commit is contained in:
gabime 2020-03-21 15:25:26 +02:00
parent 963f8d3485
commit 0a5ada6411
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
example/example.cpp
View File

@ -254,7 +254,6 @@ void android_example()
} }
#endif #endif
// Log patterns can contain custom flags. // Log patterns can contain custom flags.
// this will add custom flag '%*' which will be bound to a <my_formatter_flag> instance // this will add custom flag '%*' which will be bound to a <my_formatter_flag> instance
#include "spdlog/pattern_formatter.h" #include "spdlog/pattern_formatter.h"
@ -274,10 +273,10 @@ public:
}; };
void custom_flags_example() void custom_flags_example()
{ {
using spdlog::details::make_unique; // for pre c++14 using spdlog::details::make_unique; // for pre c++14
auto formatter = make_unique<spdlog::pattern_formatter>(); auto formatter = make_unique<spdlog::pattern_formatter>();
formatter->add_flag<my_formatter_flag>('*').set_pattern("[%n] [%*] [%^%l%$] %v"); formatter->add_flag<my_formatter_flag>('*').set_pattern("[%n] [%*] [%^%l%$] %v");
spdlog::set_formatter(std::move(formatter)); spdlog::set_formatter(std::move(formatter));
} }

4
include/spdlog/pattern_formatter-inl.h
View File

@ -1044,7 +1044,7 @@ SPDLOG_INLINE void pattern_formatter::handle_flag_(char flag, details::padding_i
{ {
// process custom flags // process custom flags
auto it = custom_handlers_.find(flag); auto it = custom_handlers_.find(flag);
if (it != custom_handlers_.end()) if (it != custom_handlers_.end())
{ {
auto custom_handler = it->second->clone(); auto custom_handler = it->second->clone();
custom_handler->set_padding_info(padding); custom_handler->set_padding_info(padding);
@ -1053,7 +1053,7 @@ SPDLOG_INLINE void pattern_formatter::handle_flag_(char flag, details::padding_i
} }
// process built-in flags // process built-in flags
switch (flag) switch (flag)
{ {
case ('+'): // default formatter case ('+'): // default formatter
formatters_.push_back(details::make_unique<details::full_formatter>(padding)); formatters_.push_back(details::make_unique<details::full_formatter>(padding));

6
tests/test_pattern_formatter.cpp
View File

@ -308,7 +308,9 @@ TEST_CASE("clone-formatter-2", "[pattern_formatter]")
class custom_test_flag : public spdlog::custom_flag_formatter class custom_test_flag : public spdlog::custom_flag_formatter
{ {
public: public:
custom_test_flag(std::string txt) : some_txt{std::move(txt)} {} custom_test_flag(std::string txt)
: some_txt{std::move(txt)}
{}
void format(const spdlog::details::log_msg &, const std::tm &, spdlog::memory_buf_t &dest) override void format(const spdlog::details::log_msg &, const std::tm &, spdlog::memory_buf_t &dest) override
{ {
@ -316,7 +318,7 @@ public:
{ {
throw spdlog::spdlog_ex("custom_flag_exception_test"); throw spdlog::spdlog_ex("custom_flag_exception_test");
} }
some_txt = std::string(padinfo_.width_, ' ') + some_txt; some_txt = std::string(padinfo_.width_, ' ') + some_txt;
dest.append(some_txt.data(), some_txt.data() + some_txt.size()); dest.append(some_txt.data(), some_txt.data() + some_txt.size());
} }
spdlog::details::padding_info get_padding_info() spdlog::details::padding_info get_padding_info()