From 88ebae0c445edc2f934fb1525eb7a9774714fa70 Mon Sep 17 00:00:00 2001 From: Christopher Torres Date: Thu, 14 Apr 2016 18:06:51 -0400 Subject: [PATCH] Fix compile errors for Visual Studio --- include/spdlog/sinks/wincolor_sink.h | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/include/spdlog/sinks/wincolor_sink.h b/include/spdlog/sinks/wincolor_sink.h index 501b2335..4acff262 100644 --- a/include/spdlog/sinks/wincolor_sink.h +++ b/include/spdlog/sinks/wincolor_sink.h @@ -64,7 +64,7 @@ public: const short on_cyan = BACKGROUND_GREEN | BACKGROUND_BLUE; const short on_white = BACKGROUND_RED | BACKGROUND_GREEN | BACKGROUND_BLUE; - void set_color(level::level_enum level, const short& color); + void set_color( level::level_enum level, const short& color ); sink_ptr& wrapped_sink(); protected: @@ -77,8 +77,8 @@ protected: typedef wincolor_sink wincolor_sink_st; typedef wincolor_sink wincolor_sink_mt; - -inline wincolor_sink::wincolor_sink(sink_ptr wrapped_sink) : sink_(wrapped_sink) +template +inline wincolor_sink::wincolor_sink(sink_ptr wrapped_sink) : sink_(wrapped_sink) { colors_[level::trace] = cyan; colors_[level::debug] = cyan; @@ -93,7 +93,8 @@ inline wincolor_sink::wincolor_sink(sink_ptr wrapped_sink) : sink_(wrapped_sink) colors_[level::emerg] = bold | yellow | on_red; } -inline void wincolor_sink::_sink_it(const details::log_msg& msg) +template +inline void wincolor_sink::_sink_it( const details::log_msg& msg ) { // Wrap the originally formatted message in color codes SetConsoleTextAttribute(GetStdHandle( STD_OUTPUT_HANDLE ), colors_[msg.level]); @@ -103,22 +104,26 @@ inline void wincolor_sink::_sink_it(const details::log_msg& msg) SetConsoleTextAttribute(GetStdHandle( STD_OUTPUT_HANDLE ), reset); } -inline void wincolor_sink::flush() +template +inline void wincolor_sink::flush() { sink_->flush(); } -inline void wincolor_sink::set_color(level::level_enum level, const short& color) +template +inline void wincolor_sink::set_color( level::level_enum level, const short& color ) { colors_[level] = color; } -inline sink_ptr& wincolor_sink::wrapped_sink() +template +inline sink_ptr& wincolor_sink::wrapped_sink() { return sink_; } -inline wincolor_sink::~wincolor_sink() +template +inline wincolor_sink::~wincolor_sink() { flush(); }