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

Fix unexpected log macro expansion.

Merge pull request #1055 from db-panda/v1.x
Fix unexpected log macro expansion.
536f5d82 · Gabi Melman · GitHub · 7bf8f148 · 631416d5 · 536f5d82
Unverified Commit 536f5d82 authored Apr 04, 2019 by Gabi Melman Committed by GitHub Apr 04, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

spdlog.h include/spdlog/spdlog.h +4 -2

No files found.
--- a/include/spdlog/spdlog.h
+++ b/include/spdlog/spdlog.h
@@ -327,8 +327,10 @@ inline void critical(const wchar_t *fmt, const Args &... args)
 //

 #define SPDLOG_LOGGER_CALL(logger, level, ...)                                                                                             \
-    if (logger->should_log(level))                                                                                                         \
-    logger->log(spdlog::source_loc{SPDLOG_FILE_BASENAME(__FILE__), __LINE__, SPDLOG_FUNCTION}, level, __VA_ARGS__)
+    do {                                                                                                                                   \
+        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
 #define SPDLOG_LOGGER_TRACE(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::trace, __VA_ARGS__)