Explorar o código

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
James Rowe %!s(int64=8) %!d(string=hai) anos
pai
achega
f9945f8a3b
Modificáronse 3 ficheiros con 9 adicións e 6 borrados
  1. 1 1
      externals/fmt
  2. 3 2
      src/common/logging/backend.cpp
  3. 5 3
      src/common/logging/log.h

+ 1 - 1
externals/fmt

@@ -1 +1 @@
-Subproject commit 4d35f94133ed14794e53c9f8627d047b408e0dc7
+Subproject commit 5859e58ba17073cf1c16536205450528f3530df0

+ 3 - 2
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 =

+ 5 - 3
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