Fix #529 (SPDLOG_TRACE macro problem)

This commit is contained in:
gabime 2017-12-19 23:09:27 +02:00
parent d460c3026a
commit de595fe2b7
1 changed files with 3 additions and 5 deletions

View File

@ -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