From 501717e9db34a2366eda0cf358fde2a5c4ed5c61 Mon Sep 17 00:00:00 2001 From: James Rowe Date: Thu, 5 Apr 2018 22:33:12 -0600 Subject: [PATCH] Update fmtlib to fix msvc warnings Additionally, when updating fmtlib, there was a change in fmtlib broke how the old logging macro was overloaded, so this works around that by just naming the fmtlib macro impl something different --- externals/fmt | 2 +- src/common/logging/backend.cpp | 5 +++-- src/common/logging/log.h | 8 +++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/externals/fmt b/externals/fmt index 4d35f94133..5859e58ba1 160000 --- a/externals/fmt +++ b/externals/fmt @@ -1 +1 @@ -Subproject commit 4d35f94133ed14794e53c9f8627d047b408e0dc7 +Subproject commit 5859e58ba17073cf1c16536205450528f3530df0 diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp index 768f3f22fe..eb57f88ce5 100644 --- a/src/common/logging/backend.cpp +++ b/src/common/logging/backend.cpp @@ -153,8 +153,9 @@ void LogMessage(Class log_class, Level log_level, const char* filename, unsigned PrintColoredMessage(entry); } -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) { +void FmtLogMessageImpl(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 = diff --git a/src/common/logging/log.h b/src/common/logging/log.h index c72f925f5b..4ce19e3f6d 100644 --- a/src/common/logging/log.h +++ b/src/common/logging/log.h @@ -112,13 +112,15 @@ void LogMessage(Class log_class, Level log_level, const char* filename, unsigned ; /// Logs a message to the global logger, using fmt -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); +void FmtLogMessageImpl(Class log_class, Level log_level, const char* filename, + unsigned int line_num, const char* function, const char* format, + const fmt::format_args& args); template void FmtLogMessage(Class log_class, Level log_level, const char* filename, unsigned int line_num, const char* function, const char* format, const Args&... args) { - LogMessage(log_class, log_level, filename, line_num, function, format, fmt::make_args(args...)); + FmtLogMessageImpl(log_class, log_level, filename, line_num, function, format, + fmt::make_args(args...)); } } // namespace Log