Skip to content

S
spdlog
Unverified Commit 536f5d82 authored by Gabi Melman's avatar Gabi Melman Committed by GitHub
Browse files
Options

Merge pull request #1055 from db-panda/v1.x 

Fix unexpected log macro expansion.
parents 7bf8f148 631416d5
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
include/spdlog/spdlog.h
View file @ 536f5d82
...@@ -327,8 +327,10 @@ inline void critical(const wchar_t *fmt, const Args &... args) ...@@ -327,8 +327,10 @@ inline void critical(const wchar_t *fmt, const Args &... args)
// //
#define SPDLOG_LOGGER_CALL(logger, level, ...) \ #define SPDLOG_LOGGER_CALL(logger, level, ...) \
if (logger->should_log(level)) \ do { \
logger->log(spdlog::source_loc{SPDLOG_FILE_BASENAME(__FILE__), __LINE__, SPDLOG_FUNCTION}, level, __VA_ARGS__) if (logger->should_log(level)) \
logger->log(spdlog::source_loc{SPDLOG_FILE_BASENAME(__FILE__), __LINE__, SPDLOG_FUNCTION}, level, __VA_ARGS__); \
} while (0)
#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_TRACE #if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_TRACE
#define SPDLOG_LOGGER_TRACE(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::trace, __VA_ARGS__) #define SPDLOG_LOGGER_TRACE(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::trace, __VA_ARGS__)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment