From e8403e17dfcc547484c8363a08333ae8a99d767c Mon Sep 17 00:00:00 2001 From: gabime Date: Sat, 1 Nov 2014 02:28:49 +0200 Subject: [PATCH] astyle --- example/bench.cpp | 8 +++++--- example/example.cpp | 3 ++- include/spdlog/common.h | 6 ++++-- include/spdlog/details/fast_istostr.h | 9 ++++++--- include/spdlog/details/logger_impl.h | 6 ++++-- include/spdlog/details/null_mutex.h | 6 ++++-- include/spdlog/details/pattern_formatter_impl.h | 8 +++++--- include/spdlog/details/registry.h | 9 ++++++--- include/spdlog/details/spdlog_impl.h | 3 --- include/spdlog/formatter.h | 3 ++- include/spdlog/sinks/null_sink.h | 6 ++++-- 11 files changed, 42 insertions(+), 25 deletions(-) diff --git a/example/bench.cpp b/example/bench.cpp index a11abc5d..1f7141b0 100644 --- a/example/bench.cpp +++ b/example/bench.cpp @@ -32,7 +32,8 @@ int main(int argc, char* argv[]) int file_size = 30 * 1024 * 1024; int rotating_files = 5; - try { + try + { if(argc > 1) howmany = atoi(argv[1]); @@ -49,7 +50,7 @@ int main(int argc, char* argv[]) auto daily_st = spdlog::daily_logger_st("daily_st", "logs/daily_st", flush_interval); bench(howmany, daily_st); - + bench(howmany, spdlog::create("null_st")); cout << "\n*******************************************************************************\n"; @@ -100,7 +101,8 @@ void bench_mt(int howmany, std::shared_ptr log, int thread_count auto start = system_clock::now(); for (int t = 0; t < thread_count; ++t) { - threads.push_back(std::thread([&]() { + threads.push_back(std::thread([&]() + { while (true) { int counter = ++msg_counter; diff --git a/example/example.cpp b/example/example.cpp index 2f7cad33..3ec57180 100644 --- a/example/example.cpp +++ b/example/example.cpp @@ -31,10 +31,11 @@ int main(int, char* []) spd::set_level(spd::level::WARN); console->info("This should not be displayed"); console->warn("This should!"); + spd::set_level(spd::level::INFO); // Change format pattern to all loggers spd::set_pattern(" **** %Y-%m-%d %H:%M:%S.%e %l **** %v"); - spd::get("console")->warn("This is another message with different format"); + spd::get("console")->info("This is another message with different format"); } catch (const spd::spdlog_ex& ex) { diff --git a/include/spdlog/common.h b/include/spdlog/common.h index 96118743..9fc5416e 100644 --- a/include/spdlog/common.h +++ b/include/spdlog/common.h @@ -6,7 +6,8 @@ namespace spdlog { class formatter; -namespace sinks { +namespace sinks +{ class sink; } @@ -45,7 +46,8 @@ class spdlog_ex : public std::exception { public: spdlog_ex(const std::string& msg) :_msg(msg) {}; - const char* what() const throw() override { + const char* what() const throw() override + { return _msg.c_str(); } private: diff --git a/include/spdlog/details/fast_istostr.h b/include/spdlog/details/fast_istostr.h index 3855d57a..4efeb515 100644 --- a/include/spdlog/details/fast_istostr.h +++ b/include/spdlog/details/fast_istostr.h @@ -5,10 +5,13 @@ //Source: http://stackoverflow.com/a/4351484/192001 //Modified version to pad zeros according to padding arg -namespace spdlog { -namespace details { +namespace spdlog +{ +namespace details +{ -const char digit_pairs[201] = { +const char digit_pairs[201] = +{ "00010203040506070809" "10111213141516171819" "20212223242526272829" diff --git a/include/spdlog/details/logger_impl.h b/include/spdlog/details/logger_impl.h index 2deadd3a..5fa2ee78 100644 --- a/include/spdlog/details/logger_impl.h +++ b/include/spdlog/details/logger_impl.h @@ -43,7 +43,8 @@ inline spdlog::formatter_ptr spdlog::logger::get_formatter() const template -inline spdlog::details::line_logger spdlog::logger::log(level::level_enum lvl, const Args&... args) { +inline spdlog::details::line_logger spdlog::logger::log(level::level_enum lvl, const Args&... args) +{ bool msg_enabled = should_log(lvl); details::line_logger l(this, lvl, msg_enabled); if (msg_enabled) @@ -52,7 +53,8 @@ inline spdlog::details::line_logger spdlog::logger::log(level::level_enum lvl, c } template -inline spdlog::details::line_logger spdlog::logger::log(const Args&... args) { +inline spdlog::details::line_logger spdlog::logger::log(const Args&... args) +{ return log(level::ALWAYS, args...); } diff --git a/include/spdlog/details/null_mutex.h b/include/spdlog/details/null_mutex.h index 54c354c5..3f7b7eea 100644 --- a/include/spdlog/details/null_mutex.h +++ b/include/spdlog/details/null_mutex.h @@ -2,8 +2,10 @@ // null, no cost mutex -namespace spdlog { -namespace details { +namespace spdlog +{ +namespace details +{ struct null_mutex { void lock() {} diff --git a/include/spdlog/details/pattern_formatter_impl.h b/include/spdlog/details/pattern_formatter_impl.h index 3ae6a307..0176f0a8 100644 --- a/include/spdlog/details/pattern_formatter_impl.h +++ b/include/spdlog/details/pattern_formatter_impl.h @@ -13,7 +13,8 @@ namespace spdlog { -namespace details { +namespace details +{ class flag_formatter { public: @@ -23,7 +24,8 @@ public: /////////////////////////////////////////////////////////////////////// // name & level pattern appenders /////////////////////////////////////////////////////////////////////// -namespace { +namespace +{ class name_formatter :public flag_formatter { void format(details::log_msg& msg) override @@ -425,7 +427,7 @@ inline void spdlog::pattern_formatter::handle_flag(char flag) { switch (flag) { - // logger name + // logger name case 'n': _formatters.push_back(std::unique_ptr(new details::name_formatter())); break; diff --git a/include/spdlog/details/registry.h b/include/spdlog/details/registry.h index c99f52d6..1b0ec967 100644 --- a/include/spdlog/details/registry.h +++ b/include/spdlog/details/registry.h @@ -11,10 +11,13 @@ #include "../logger.h" #include "../common.h" -namespace spdlog { -namespace details { +namespace spdlog +{ +namespace details +{ -class registry { +class registry +{ public: std::shared_ptr get(const std::string& logger_name) { diff --git a/include/spdlog/details/spdlog_impl.h b/include/spdlog/details/spdlog_impl.h index 84264465..6cfccfd0 100644 --- a/include/spdlog/details/spdlog_impl.h +++ b/include/spdlog/details/spdlog_impl.h @@ -57,9 +57,6 @@ inline std::shared_ptr spdlog::stderr_logger_st(const std::strin } - - - inline std::shared_ptr spdlog::create(const std::string& logger_name, spdlog::sinks_init_list sinks) { return details::registry::instance().create(logger_name, sinks); diff --git a/include/spdlog/formatter.h b/include/spdlog/formatter.h index 8575c073..d123aed3 100644 --- a/include/spdlog/formatter.h +++ b/include/spdlog/formatter.h @@ -3,7 +3,8 @@ #include "details/log_msg.h" namespace spdlog { -namespace details { +namespace details +{ class flag_formatter; } diff --git a/include/spdlog/sinks/null_sink.h b/include/spdlog/sinks/null_sink.h index c75c3884..07c05343 100644 --- a/include/spdlog/sinks/null_sink.h +++ b/include/spdlog/sinks/null_sink.h @@ -4,8 +4,10 @@ #include "../details/null_mutex.h" -namespace spdlog { -namespace sinks { +namespace spdlog +{ +namespace sinks +{ template class null_sink : public base_sink