From f9945f8a3b9f2980dc9b3c9a76343df4d254faa2 Mon Sep 17 00:00:00 2001
From: James Rowe <jroweboy@gmail.com>
Date: Thu, 5 Apr 2018 22:42:09 -0600
Subject: 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
---
src/common/logging/backend.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'src/common/logging/backend.cpp')
diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp
index 625730c6a5..26cd75a3e3 100644
--- a/src/common/logging/backend.cpp
+++ b/src/common/logging/backend.cpp
@@ -146,8 +146,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 =
--
cgit v1.2.3-70-g09d2