From d56fa23eb945be089a6087ee846ebc8771c4f7b9 Mon Sep 17 00:00:00 2001 From: gabime Date: Sun, 21 May 2017 03:48:54 +0300 Subject: [PATCH] fixed compilation errors --- include/spdlog/sinks/ansicolor_sink.h | 4 ++-- include/spdlog/sinks/ostream_sink.h | 2 +- include/spdlog/sinks/stdout_sinks.h | 4 ++-- include/spdlog/tweakme.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/spdlog/sinks/ansicolor_sink.h b/include/spdlog/sinks/ansicolor_sink.h index 48d72f94..1e0a02d0 100644 --- a/include/spdlog/sinks/ansicolor_sink.h +++ b/include/spdlog/sinks/ansicolor_sink.h @@ -39,7 +39,7 @@ public: } virtual ~ansicolor_sink() { - flush(); + _flush(); } @@ -61,7 +61,7 @@ protected: { fwrite(msg.formatted.data(), sizeof(char), msg.formatted.size(), target_file_); } - flush(); + _flush(); } void _flush() override diff --git a/include/spdlog/sinks/ostream_sink.h b/include/spdlog/sinks/ostream_sink.h index feb5efa1..2fa78acf 100644 --- a/include/spdlog/sinks/ostream_sink.h +++ b/include/spdlog/sinks/ostream_sink.h @@ -32,7 +32,7 @@ protected: _ostream.flush(); } - void flush() override + void _flush() override { _ostream.flush(); } diff --git a/include/spdlog/sinks/stdout_sinks.h b/include/spdlog/sinks/stdout_sinks.h index b5109291..a52e112f 100644 --- a/include/spdlog/sinks/stdout_sinks.h +++ b/include/spdlog/sinks/stdout_sinks.h @@ -33,7 +33,7 @@ protected: void _sink_it(const details::log_msg& msg) override { fwrite(msg.formatted.data(), sizeof(char), msg.formatted.size(), stdout); - flush(); + _flush(); } void _flush() override @@ -62,7 +62,7 @@ protected: void _sink_it(const details::log_msg& msg) override { fwrite(msg.formatted.data(), sizeof(char), msg.formatted.size(), stderr); - flush(); + _flush(); } void _flush() override diff --git a/include/spdlog/tweakme.h b/include/spdlog/tweakme.h index 4d52ab76..3b580d04 100644 --- a/include/spdlog/tweakme.h +++ b/include/spdlog/tweakme.h @@ -125,5 +125,5 @@ // Uncomment to enable message counting feature. Adds %i logger pattern that // prints log message sequence id. // -// #define SPDLOG_ENABLE_MESSAGE_COUNTER + #define SPDLOG_ENABLE_MESSAGE_COUNTER ///////////////////////////////////////////////////////////////////////////////