From f25f0e0e40fa6888d6ae655277797932b4ce6d2a Mon Sep 17 00:00:00 2001 From: Sam Lunt Date: Mon, 16 Oct 2017 13:32:16 -0500 Subject: [PATCH] add (void)0 when logging is disabled --- include/spdlog/spdlog.h | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/include/spdlog/spdlog.h b/include/spdlog/spdlog.h index 6907086b..1e732659 100644 --- a/include/spdlog/spdlog.h +++ b/include/spdlog/spdlog.h @@ -165,24 +165,23 @@ 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_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__) +# else +# define SPDLOG_TRACE(logger, ...) logger->trace("[ " __FILE__ ":" SPDLOG_STR_HELPER(__LINE__) " ] " __VA_ARGS__) +# endif #else -#define SPDLOG_TRACE(logger, ...) logger->trace("[ " __FILE__ ":" SPDLOG_STR_HELPER(__LINE__) " ] " __VA_ARGS__) -#endif -#else -#define SPDLOG_TRACE(logger, ...) +# define SPDLOG_TRACE(logger, ...) (void)0 #endif #ifdef SPDLOG_DEBUG_ON -#define SPDLOG_DEBUG(logger, ...) logger->debug(__VA_ARGS__) +# define SPDLOG_DEBUG(logger, ...) logger->debug(__VA_ARGS__) #else -#define SPDLOG_DEBUG(logger, ...) +# define SPDLOG_DEBUG(logger, ...) (void)0 #endif } - #include "details/spdlog_impl.h"