From 220608e52a9dcff6a518537b7346628b7a9e23bb Mon Sep 17 00:00:00 2001 From: gabime Date: Wed, 19 Jun 2019 18:31:21 +0300 Subject: [PATCH] clang-format --- include/spdlog/details/thread_pool-inl.h | 11 ++++------- include/spdlog/sinks/ansicolor_sink.h | 3 +-- include/spdlog/sinks/syslog_sink.h | 24 ++++++++---------------- include/spdlog/spdlog.h | 2 +- 4 files changed, 14 insertions(+), 26 deletions(-) diff --git a/include/spdlog/details/thread_pool-inl.h b/include/spdlog/details/thread_pool-inl.h index bfb4908d..6d62acfa 100644 --- a/include/spdlog/details/thread_pool-inl.h +++ b/include/spdlog/details/thread_pool-inl.h @@ -22,19 +22,16 @@ SPDLOG_INLINE thread_pool::thread_pool(size_t q_max_items, size_t threads_n, std } for (size_t i = 0; i < threads_n; i++) { - threads_.emplace_back([this, on_thread_start] - { + threads_.emplace_back([this, on_thread_start] { on_thread_start(); this->thread_pool::worker_loop_(); }); } } -SPDLOG_INLINE thread_pool::thread_pool(size_t q_max_items, size_t threads_n): - thread_pool(q_max_items, threads_n, []{}) -{ - -} +SPDLOG_INLINE thread_pool::thread_pool(size_t q_max_items, size_t threads_n) + : thread_pool(q_max_items, threads_n, [] {}) +{} // message all threads to terminate gracefully join them SPDLOG_INLINE thread_pool::~thread_pool() diff --git a/include/spdlog/sinks/ansicolor_sink.h b/include/spdlog/sinks/ansicolor_sink.h index 4b7416ea..3b8cc898 100644 --- a/include/spdlog/sinks/ansicolor_sink.h +++ b/include/spdlog/sinks/ansicolor_sink.h @@ -40,7 +40,6 @@ public: void set_pattern(const std::string &pattern) final; void set_formatter(std::unique_ptr sink_formatter) override; - // Formatting codes const string_view_t reset = "\033[m"; const string_view_t bold = "\033[1m"; @@ -81,7 +80,7 @@ private: mutex_t &mutex_; bool should_do_colors_; std::unordered_map colors_; - void print_ccode_(const string_view_t&color_code); + void print_ccode_(const string_view_t &color_code); void print_range_(const fmt::memory_buffer &formatted, size_t start, size_t end); }; diff --git a/include/spdlog/sinks/syslog_sink.h b/include/spdlog/sinks/syslog_sink.h index 2b6d4848..ce216d09 100644 --- a/include/spdlog/sinks/syslog_sink.h +++ b/include/spdlog/sinks/syslog_sink.h @@ -19,9 +19,9 @@ class syslog_sink : public base_sink { public: - syslog_sink(std::string ident, int syslog_option, int syslog_facility, bool enable_formatting): - enable_formatting_{enable_formatting}, - ident_{std::move(ident)} + syslog_sink(std::string ident, int syslog_option, int syslog_facility, bool enable_formatting) + : enable_formatting_{enable_formatting} + , ident_{std::move(ident)} { priorities_[static_cast(level::trace)] = LOG_DEBUG; priorities_[static_cast(level::debug)] = LOG_DEBUG; @@ -48,7 +48,7 @@ protected: { string_view_t payload; - if(enable_formatting_) + if (enable_formatting_) { fmt::memory_buffer formatted; sink::formatter_->format(msg, formatted); @@ -86,23 +86,15 @@ using syslog_sink_st = syslog_sink; // Create and register a syslog logger template -inline std::shared_ptr syslog_logger_mt( - const std::string &logger_name, - const std::string &syslog_ident = "", - int syslog_option = 0, - int syslog_facility = LOG_USER, - bool enable_formatting = false) +inline std::shared_ptr syslog_logger_mt(const std::string &logger_name, const std::string &syslog_ident = "", int syslog_option = 0, + int syslog_facility = LOG_USER, bool enable_formatting = false) { return Factory::template create(logger_name, syslog_ident, syslog_option, syslog_facility, enable_formatting); } template -inline std::shared_ptr syslog_logger_st( - const std::string &logger_name, - const std::string &syslog_ident = "", - int syslog_option = 0, - int syslog_facility = LOG_USER, - bool enable_formatting = false) +inline std::shared_ptr syslog_logger_st(const std::string &logger_name, const std::string &syslog_ident = "", int syslog_option = 0, + int syslog_facility = LOG_USER, bool enable_formatting = false) { return Factory::template create(logger_name, syslog_ident, syslog_option, syslog_facility, enable_formatting); } diff --git a/include/spdlog/spdlog.h b/include/spdlog/spdlog.h index 9e8070c3..319d4d6f 100644 --- a/include/spdlog/spdlog.h +++ b/include/spdlog/spdlog.h @@ -268,7 +268,7 @@ inline void critical(const wchar_t *fmt, const Args &... args) do \ { \ if (logger->should_log(level)) \ - logger->force_log(spdlog::source_loc{__FILE__, __LINE__, SPDLOG_FUNCTION}, level, __VA_ARGS__); \ + logger->force_log(spdlog::source_loc{__FILE__, __LINE__, SPDLOG_FUNCTION}, level, __VA_ARGS__); \ } while (0) #if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_TRACE