summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Lim Wee Soong <weesoong.lim@gmail.com>2018-04-03 04:31:54 +0200
committerDaniel Lim Wee Soong <weesoong.lim@gmail.com>2018-04-03 04:31:54 +0200
commitbb9093ed57d55d0c213edb73e2ba0f6276e833dc (patch)
tree044fd88fa563a796e4e1477590191978b68544ba
parentMerge pull request #262 from daniellimws/fmtlib-macros (diff)
downloadyuzu-bb9093ed57d55d0c213edb73e2ba0f6276e833dc.tar
yuzu-bb9093ed57d55d0c213edb73e2ba0f6276e833dc.tar.gz
yuzu-bb9093ed57d55d0c213edb73e2ba0f6276e833dc.tar.bz2
yuzu-bb9093ed57d55d0c213edb73e2ba0f6276e833dc.tar.lz
yuzu-bb9093ed57d55d0c213edb73e2ba0f6276e833dc.tar.xz
yuzu-bb9093ed57d55d0c213edb73e2ba0f6276e833dc.tar.zst
yuzu-bb9093ed57d55d0c213edb73e2ba0f6276e833dc.zip
-rw-r--r--src/common/logging/backend.cpp6
-rw-r--r--src/common/logging/log.h10
2 files changed, 11 insertions, 5 deletions
diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp
index 3db654913..625730c6a 100644
--- a/src/common/logging/backend.cpp
+++ b/src/common/logging/backend.cpp
@@ -146,12 +146,12 @@ void LogMessage(Class log_class, Level log_level, const char* filename, unsigned
PrintColoredMessage(entry);
}
-void FmtLogMessage(Class log_class, Level log_level, const char* filename, unsigned int line_num,
- const char* function, const char* format, const fmt::ArgList& args) {
+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) {
if (filter && !filter->CheckMessage(log_class, log_level))
return;
Entry entry =
- CreateEntry(log_class, log_level, filename, line_num, function, fmt::format(format, args));
+ CreateEntry(log_class, log_level, filename, line_num, function, fmt::vformat(format, args));
PrintColoredMessage(entry);
}
diff --git a/src/common/logging/log.h b/src/common/logging/log.h
index 8432628ae..3c9da7f55 100644
--- a/src/common/logging/log.h
+++ b/src/common/logging/log.h
@@ -104,9 +104,15 @@ void LogMessage(Class log_class, Level log_level, const char* filename, unsigned
#endif
;
+/// 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);
+
+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 fmt::ArgList& args);
-FMT_VARIADIC(void, FmtLogMessage, Class, Level, const char*, unsigned int, const char*, const char*)
+ const char* function, const char* format, const Args&... args) {
+ LogMessage(log_class, log_level, filename, line_num, function, format, fmt::make_args(args...));
+}
} // namespace Log