Skip to content
Snippets Groups Projects
Commit f9945f8a authored by James Rowe's avatar James Rowe
Browse files

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
parent 20bd26dc
No related branches found
No related tags found
No related merge requests found
Subproject commit 4d35f94133ed14794e53c9f8627d047b408e0dc7 Subproject commit 5859e58ba17073cf1c16536205450528f3530df0
...@@ -146,8 +146,9 @@ void LogMessage(Class log_class, Level log_level, const char* filename, unsigned ...@@ -146,8 +146,9 @@ void LogMessage(Class log_class, Level log_level, const char* filename, unsigned
PrintColoredMessage(entry); PrintColoredMessage(entry);
} }
void LogMessage(Class log_class, Level log_level, const char* filename, unsigned int line_num, void FmtLogMessageImpl(Class log_class, Level log_level, const char* filename,
const char* function, const char* format, const fmt::format_args& args) { unsigned int line_num, const char* function, const char* format,
const fmt::format_args& args) {
if (filter && !filter->CheckMessage(log_class, log_level)) if (filter && !filter->CheckMessage(log_class, log_level))
return; return;
Entry entry = Entry entry =
......
...@@ -105,13 +105,15 @@ void LogMessage(Class log_class, Level log_level, const char* filename, unsigned ...@@ -105,13 +105,15 @@ void LogMessage(Class log_class, Level log_level, const char* filename, unsigned
; ;
/// Logs a message to the global logger, using fmt /// Logs a message to the global logger, using fmt
void LogMessage(Class log_class, Level log_level, const char* filename, unsigned int line_num, void FmtLogMessageImpl(Class log_class, Level log_level, const char* filename,
const char* function, const char* format, const fmt::format_args& args); unsigned int line_num, const char* function, const char* format,
const fmt::format_args& args);
template <typename... Args> template <typename... Args>
void FmtLogMessage(Class log_class, Level log_level, const char* filename, unsigned int line_num, void FmtLogMessage(Class log_class, Level log_level, const char* filename, unsigned int line_num,
const char* function, const char* format, const Args&... args) { 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 } // namespace Log
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment