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/log.h | |
| 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/log.h')
| -rw-r--r-- | src/common/logging/log.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/common/logging/log.h b/src/common/logging/log.h index 3c9da7f551..45821850c9 100644 --- a/src/common/logging/log.h +++ b/src/common/logging/log.h @@ -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 -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 <typename... Args> 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 |