From 6dd928dc3cae630448854d05cfdbb61e7212e160 Mon Sep 17 00:00:00 2001 From: gabime Date: Wed, 20 Dec 2017 00:04:16 +0200 Subject: [PATCH] Undo fix #529 (causes a warning under gcc and clang when no args passed) --- include/spdlog/spdlog.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/include/spdlog/spdlog.h b/include/spdlog/spdlog.h index 4e004e91..7121c31e 100644 --- a/include/spdlog/spdlog.h +++ b/include/spdlog/spdlog.h @@ -165,13 +165,15 @@ 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, s, ...) logger->trace(fmt::format("[ {}({}) ] {}", __FILE__, __LINE__, (s)).c_str(), ##__VA_ARGS__); +#define SPDLOG_TRACE(logger, ...) logger->trace("[ " __FILE__ "(" SPDLOG_STR_HELPER(__LINE__) ") ] " __VA_ARGS__) #else -#define SPDLOG_TRACE(logger, s, ...) logger->trace(fmt::format("[ {}:{} ] {}", __FILE__, __LINE__, (s)).c_str(), ##__VA_ARGS__); +#define SPDLOG_TRACE(logger, ...) logger->trace("[ " __FILE__ ":" SPDLOG_STR_HELPER(__LINE__) " ] " __VA_ARGS__) #endif #else -#define SPDLOG_TRACE(logger, s, ...) +#define SPDLOG_TRACE(logger, ...) #endif #ifdef SPDLOG_DEBUG_ON