From de595fe2b782763109d9a3b64aaf8b070a7420ed Mon Sep 17 00:00:00 2001 From: gabime Date: Tue, 19 Dec 2017 23:09:27 +0200 Subject: [PATCH] Fix #529 (SPDLOG_TRACE macro problem) --- include/spdlog/spdlog.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/include/spdlog/spdlog.h b/include/spdlog/spdlog.h index 7121c31e..4e004e91 100644 --- a/include/spdlog/spdlog.h +++ b/include/spdlog/spdlog.h @@ -165,15 +165,13 @@ void drop_all(); /////////////////////////////////////////////////////////////////////////////// #ifdef SPDLOG_TRACE_ON -#define SPDLOG_STR_H(x) #x -#define SPDLOG_STR_HELPER(x) SPDLOG_STR_H(x) #ifdef _MSC_VER -#define SPDLOG_TRACE(logger, ...) logger->trace("[ " __FILE__ "(" SPDLOG_STR_HELPER(__LINE__) ") ] " __VA_ARGS__) +#define SPDLOG_TRACE(logger, s, ...) logger->trace(fmt::format("[ {}({}) ] {}", __FILE__, __LINE__, (s)).c_str(), ##__VA_ARGS__); #else -#define SPDLOG_TRACE(logger, ...) logger->trace("[ " __FILE__ ":" SPDLOG_STR_HELPER(__LINE__) " ] " __VA_ARGS__) +#define SPDLOG_TRACE(logger, s, ...) logger->trace(fmt::format("[ {}:{} ] {}", __FILE__, __LINE__, (s)).c_str(), ##__VA_ARGS__); #endif #else -#define SPDLOG_TRACE(logger, ...) +#define SPDLOG_TRACE(logger, s, ...) #endif #ifdef SPDLOG_DEBUG_ON