From 068a0e3a6b9b346b88d9832e1a37d784addfc810 Mon Sep 17 00:00:00 2001 From: gabi Date: Fri, 10 Oct 2014 21:32:10 +0300 Subject: [PATCH] Some syntactic improvements --- include/c11log/details/line_logger.h | 5 ++--- include/c11log/logger.h | 17 +++++++---------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/include/c11log/details/line_logger.h b/include/c11log/details/line_logger.h index f1daeda7..ec3b3a21 100644 --- a/include/c11log/details/line_logger.h +++ b/include/c11log/details/line_logger.h @@ -6,12 +6,11 @@ #include "fast_oss.h" -// line_logger class. -// aggregates single log line (on the stack if possibe) and calls the logger upon destruction +// Line logger class - aggregates operator<< calls to fast ostream +// and logs upon destruction namespace c11log { - namespace details { class line_logger diff --git a/include/c11log/logger.h b/include/c11log/logger.h index 8d282536..288e82aa 100644 --- a/include/c11log/logger.h +++ b/include/c11log/logger.h @@ -29,7 +29,7 @@ public: using sink_ptr = std::shared_ptr; using sinks_vector_t = std::vector; using sinks_init_list = std::initializer_list; - using formatter_ptr = std::unique_ptr; + using formatter_ptr = std::unique_ptr; logger(const std::string& name, sinks_init_list, formatter_ptr = nullptr); logger(const std::string& name, sink_ptr, formatter_ptr = nullptr); @@ -37,12 +37,11 @@ public: logger& operator=(const logger&) = delete; ~logger() = default; - - void level(c11log::level::level_enum); - c11log::level::level_enum level() const; + void level(level::level_enum); + level::level_enum level() const; const std::string& name() const; - bool should_log(c11log::level::level_enum) const; + bool should_log(level::level_enum) const; template details::line_logger trace(const T&); template details::line_logger debug(const T&); @@ -60,11 +59,9 @@ public: details::line_logger critical(); details::line_logger fatal(); - private: friend details::line_logger; - - std::string _logger_name; + std::string _name; formatter_ptr _formatter; sinks_vector_t _sinks; std::atomic_int _level; @@ -97,7 +94,7 @@ inline std::shared_ptr c11log::get_logger(const std::string& nam inline c11log::logger::logger(const std::string& name, sinks_init_list sinks_list, formatter_ptr f) : - _logger_name(name), + _name(name), _formatter(std::move(f)), _sinks(sinks_list) { @@ -195,7 +192,7 @@ inline c11log::details::line_logger c11log::logger::fatal() inline const std::string& c11log::logger::name() const { - return _logger_name; + return _name; } inline void c11log::logger::level(c11log::level::level_enum level)