From 12800ac46627b9a569390c19a9aeee9732f1281a Mon Sep 17 00:00:00 2001 From: gabime Date: Fri, 30 Sep 2016 14:08:31 +0300 Subject: [PATCH] fixed shadow warnings in gcc --- include/spdlog/details/async_logger_impl.h | 4 ++-- include/spdlog/sinks/ansicolor_sink.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/spdlog/details/async_logger_impl.h b/include/spdlog/details/async_logger_impl.h index 736d2e31..2092f06c 100644 --- a/include/spdlog/details/async_logger_impl.h +++ b/include/spdlog/details/async_logger_impl.h @@ -31,13 +31,13 @@ inline spdlog::async_logger::async_logger(const std::string& logger_name, } inline spdlog::async_logger::async_logger(const std::string& logger_name, - sinks_init_list sinks, + sinks_init_list sinks_list, size_t queue_size, const async_overflow_policy overflow_policy, const std::function& worker_warmup_cb, const std::chrono::milliseconds& flush_interval_ms, const std::function& worker_teardown_cb) : - async_logger(logger_name, sinks.begin(), sinks.end(), queue_size, overflow_policy, worker_warmup_cb, flush_interval_ms, worker_teardown_cb) {} + async_logger(logger_name, sinks_list.begin(), sinks_list.end(), queue_size, overflow_policy, worker_warmup_cb, flush_interval_ms, worker_teardown_cb) {} inline spdlog::async_logger::async_logger(const std::string& logger_name, sink_ptr single_sink, diff --git a/include/spdlog/sinks/ansicolor_sink.h b/include/spdlog/sinks/ansicolor_sink.h index a3b4292d..96e10148 100644 --- a/include/spdlog/sinks/ansicolor_sink.h +++ b/include/spdlog/sinks/ansicolor_sink.h @@ -33,7 +33,7 @@ public: virtual void log(const details::log_msg& msg) override; virtual void flush() override; - void set_color(level::level_enum level, const std::string& color); + void set_color(level::level_enum color_level, const std::string& color); /// Formatting codes const std::string reset = "\033[00m"; @@ -101,9 +101,9 @@ inline void ansicolor_sink::flush() sink_->flush(); } -inline void ansicolor_sink::set_color(level::level_enum level, const std::string& color) +inline void ansicolor_sink::set_color(level::level_enum color_level, const std::string& color) { - colors_[level] = color; + colors_[color_level] = color; } inline ansicolor_sink::~ansicolor_sink()