From 869956a5dff03dcddf242ebc1897d41e5aba85a6 Mon Sep 17 00:00:00 2001 From: bunnei Date: Mon, 2 Apr 2018 22:40:21 -0400 Subject: [PATCH] logging: Fix new fmtlib-based definitions. --- src/common/logging/backend.cpp | 7 ++++--- src/common/logging/log.h | 6 ++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp index 3db6549135..4c22cadfda 100644 --- a/src/common/logging/backend.cpp +++ b/src/common/logging/backend.cpp @@ -146,13 +146,14 @@ void LogMessage(Class log_class, Level log_level, const char* filename, unsigned PrintColoredMessage(entry); } -void FmtLogMessage(Class log_class, Level log_level, const char* filename, unsigned int line_num, - const char* function, const char* format, const fmt::ArgList& args) { +void LogMessage(Class log_class, Level log_level, const char* filename, unsigned int line_num, + const char* function, const char* format, const fmt::format_args& args) { if (filter && !filter->CheckMessage(log_class, log_level)) return; Entry entry = - CreateEntry(log_class, log_level, filename, line_num, function, fmt::format(format, args)); + CreateEntry(log_class, log_level, filename, line_num, function, fmt::vformat(format, args)); PrintColoredMessage(entry); } + } // namespace Log diff --git a/src/common/logging/log.h b/src/common/logging/log.h index 8432628aeb..301fef78eb 100644 --- a/src/common/logging/log.h +++ b/src/common/logging/log.h @@ -104,9 +104,11 @@ void LogMessage(Class log_class, Level log_level, const char* filename, unsigned #endif ; +template void FmtLogMessage(Class log_class, Level log_level, const char* filename, unsigned int line_num, - const char* function, const char* format, const fmt::ArgList& args); -FMT_VARIADIC(void, FmtLogMessage, Class, Level, const char*, unsigned int, const char*, const char*) + const char* function, const char* format, const Args&... args) { + LogMessage(log_class, log_level, filename, line_num, function, format, fmt::make_args(args...)); +} } // namespace Log