From 3b51a207727fb292c908b87ebf01d891d1703041 Mon Sep 17 00:00:00 2001 From: Alexander Pitzer Date: Fri, 28 Oct 2016 11:39:06 +0200 Subject: [PATCH 1/2] fix missing mutex and template parameter in the wincolor_sink --- include/spdlog/sinks/wincolor_sink.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/spdlog/sinks/wincolor_sink.h b/include/spdlog/sinks/wincolor_sink.h index 5555d801..4c5f95c2 100644 --- a/include/spdlog/sinks/wincolor_sink.h +++ b/include/spdlog/sinks/wincolor_sink.h @@ -73,6 +73,7 @@ public: private: HANDLE out_handle_; std::map colors_; + Mutex _mutex; // set color and return the orig console attributes (for resetting later) WORD set_console_attribs(WORD attribs) @@ -91,7 +92,7 @@ template class wincolor_stdout_sink: public wincolor_sink { public: - wincolor_stdout_sink():wincolor_sink(GetStdHandle(STD_OUTPUT_HANDLE)) + wincolor_stdout_sink(): wincolor_sink(GetStdHandle(STD_OUTPUT_HANDLE)) {} }; @@ -105,7 +106,7 @@ template class wincolor_stderr_sink: public wincolor_sink { public: - wincolor_stderr_sink():wincolor_sink(GetStdHandle(STD_ERROR_HANDLE)) + wincolor_stderr_sink():wincolor_sink(GetStdHandle(STD_ERROR_HANDLE)) {} }; From 7a0f371931ca1f3078cd178798ec895b7959a02a Mon Sep 17 00:00:00 2001 From: Alexander Pitzer Date: Fri, 28 Oct 2016 12:20:11 +0200 Subject: [PATCH 2/2] force to use inherited mutex --- include/spdlog/sinks/wincolor_sink.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/spdlog/sinks/wincolor_sink.h b/include/spdlog/sinks/wincolor_sink.h index 4c5f95c2..c831a184 100644 --- a/include/spdlog/sinks/wincolor_sink.h +++ b/include/spdlog/sinks/wincolor_sink.h @@ -66,14 +66,13 @@ public: // change the color for the given level void set_color(level::level_enum level, WORD color) { - std::lock_guard lock(_mutex); + std::lock_guard lock(base_sink::_mutex); colors_[level] = color; } private: HANDLE out_handle_; std::map colors_; - Mutex _mutex; // set color and return the orig console attributes (for resetting later) WORD set_console_attribs(WORD attribs)