From 309204d53cdd99d0f1cdc7a20c1f8db2440ec227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ka=C4=9Fan=20Can=20=C5=9Eit?= Date: Sun, 11 Jan 2026 01:05:14 +0300 Subject: [PATCH] Rename local variables to avoid shadowing member functions (#3516) --- include/spdlog/logger-inl.h | 3 +-- include/spdlog/sinks/daily_file_sink.h | 14 +++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/include/spdlog/logger-inl.h b/include/spdlog/logger-inl.h index 768cee37..381f11cd 100644 --- a/include/spdlog/logger-inl.h +++ b/include/spdlog/logger-inl.h @@ -164,8 +164,7 @@ SPDLOG_INLINE void logger::dump_backtrace_() { } SPDLOG_INLINE bool logger::should_flush_(const details::log_msg &msg) const { - auto flush_level = flush_level_.load(std::memory_order_relaxed); - return (msg.level >= flush_level) && (msg.level != level::off); + return (msg.level >= flush_level()) && (msg.level != level::off); } SPDLOG_INLINE void logger::err_handler_(const std::string &msg) const { diff --git a/include/spdlog/sinks/daily_file_sink.h b/include/spdlog/sinks/daily_file_sink.h index 615c9f7b..fa2582de 100644 --- a/include/spdlog/sinks/daily_file_sink.h +++ b/include/spdlog/sinks/daily_file_sink.h @@ -88,8 +88,8 @@ public: } auto now = log_clock::now(); - auto filename = FileNameCalc::calc_filename(base_filename_, now_tm(now)); - file_helper_.open(filename, truncate_); + const auto new_filename = FileNameCalc::calc_filename(base_filename_, now_tm(now)); + file_helper_.open(new_filename, truncate_); rotation_tp_ = next_rotation_tp_(); if (max_files_ > 0) { @@ -107,8 +107,8 @@ protected: auto time = msg.time; bool should_rotate = time >= rotation_tp_; if (should_rotate) { - auto filename = FileNameCalc::calc_filename(base_filename_, now_tm(time)); - file_helper_.open(filename, truncate_); + const auto new_filename = FileNameCalc::calc_filename(base_filename_, now_tm(time)); + file_helper_.open(new_filename, truncate_); rotation_tp_ = next_rotation_tp_(); } memory_buf_t formatted; @@ -131,11 +131,11 @@ private: std::vector filenames; auto now = log_clock::now(); while (filenames.size() < max_files_) { - auto filename = FileNameCalc::calc_filename(base_filename_, now_tm(now)); - if (!path_exists(filename)) { + const auto new_filename = FileNameCalc::calc_filename(base_filename_, now_tm(now)); + if (!path_exists(new_filename)) { break; } - filenames.emplace_back(filename); + filenames.emplace_back(new_filename); now -= std::chrono::hours(24); } for (auto iter = filenames.rbegin(); iter != filenames.rend(); ++iter) {