Merge pull request #468 from p-alik/master

code formatting (astyle and dos2unix)
This commit is contained in:
Gabi Melman 2017-06-29 12:20:32 +03:00 committed by GitHub
commit f06f3f1468
12 changed files with 45 additions and 44 deletions

View File

@ -495,7 +495,7 @@ class full_formatter SPDLOG_FINAL:public flag_formatter
// pattern_formatter inline impl // pattern_formatter inline impl
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
inline spdlog::pattern_formatter::pattern_formatter(const std::string& pattern, pattern_time_type pattern_time) inline spdlog::pattern_formatter::pattern_formatter(const std::string& pattern, pattern_time_type pattern_time)
: _pattern_time(pattern_time) : _pattern_time(pattern_time)
{ {
compile_pattern(pattern); compile_pattern(pattern);
} }

View File

@ -42,7 +42,8 @@ public:
_flush(); _flush();
} }
void set_color(level::level_enum color_level, const std::string& color) { void set_color(level::level_enum color_level, const std::string& color)
{
std::lock_guard<Mutex> lock(base_sink<Mutex>::_mutex); std::lock_guard<Mutex> lock(base_sink<Mutex>::_mutex);
colors_[color_level] = color; colors_[color_level] = color;
} }