From eb4a169cfb5067d9304a62101029fd418888e860 Mon Sep 17 00:00:00 2001 From: Paul Kunysch Date: Sat, 2 Nov 2019 09:40:37 +0100 Subject: [PATCH] Improve log macros --- include/spdlog/spdlog.h | 4 ++-- tests/test_macros.cpp | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/spdlog/spdlog.h b/include/spdlog/spdlog.h index 392a91c5..401d22eb 100644 --- a/include/spdlog/spdlog.h +++ b/include/spdlog/spdlog.h @@ -288,8 +288,8 @@ inline void critical(wstring_view_t fmt, const Args &... args) #define SPDLOG_LOGGER_CALL(logger, level, ...) \ do \ { \ - if (logger->should_log(level) || logger->should_backtrace()) \ - logger->log(spdlog::source_loc{__FILE__, __LINE__, SPDLOG_FUNCTION}, level, __VA_ARGS__); \ + if ((logger)->should_log(level) || (logger)->should_backtrace()) \ + (logger)->log(spdlog::source_loc{__FILE__, __LINE__, SPDLOG_FUNCTION}, level, __VA_ARGS__); \ } while (0) #if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_TRACE diff --git a/tests/test_macros.cpp b/tests/test_macros.cpp index 75f53ab2..83a95dbd 100644 --- a/tests/test_macros.cpp +++ b/tests/test_macros.cpp @@ -40,6 +40,14 @@ TEST_CASE("disable param evaluation", "[macros]") SPDLOG_TRACE("Test message {}", throw std::runtime_error("Should not be evaluated")); } +TEST_CASE("compile with reference to logger", "[macros]") +{ + auto logger = spdlog::create("refmacro"); + auto& ref = *logger; + SPDLOG_LOGGER_TRACE(&ref, "Test message 1"); + SPDLOG_LOGGER_DEBUG(&ref, "Test message 2"); +} + // ensure that even if right macro level is on- don't evaluate if the logger's level is not high enough TEST_CASE("disable param evaluation2", "[macros]") {