diff options
author | James Rowe <jroweboy@gmail.com> | 2018-04-05 22:42:09 -0600 |
---|---|---|
committer | James Rowe <jroweboy@gmail.com> | 2018-04-05 22:42:09 -0600 |
commit | f9945f8a3b9f2980dc9b3c9a76343df4d254faa2 (patch) | |
tree | 43a4ea01ad3c7a90942ad1d14f3233c5eb5634db /src/common/logging/backend.cpp | |
parent | 20bd26dc7d322cc6409c9e09ee6c8908658d3bbd (diff) |
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
Diffstat (limited to 'src/common/logging/backend.cpp')
-rw-r--r-- | src/common/logging/backend.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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 = |