summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-04-06 16:25:30 +0200
committerGitHub <noreply@github.com>2018-04-06 16:25:30 +0200
commit68183e7b5a8084e3fd2ec7b5f1e82576ffc20fe3 (patch)
tree43a4ea01ad3c7a90942ad1d14f3233c5eb5634db
parentMerge pull request #308 from bunnei/misc-fixes-2 (diff)
parentUpdate fmtlib to fix msvc warnings (diff)
downloadyuzu-68183e7b5a8084e3fd2ec7b5f1e82576ffc20fe3.tar
yuzu-68183e7b5a8084e3fd2ec7b5f1e82576ffc20fe3.tar.gz
yuzu-68183e7b5a8084e3fd2ec7b5f1e82576ffc20fe3.tar.bz2
yuzu-68183e7b5a8084e3fd2ec7b5f1e82576ffc20fe3.tar.lz
yuzu-68183e7b5a8084e3fd2ec7b5f1e82576ffc20fe3.tar.xz
yuzu-68183e7b5a8084e3fd2ec7b5f1e82576ffc20fe3.tar.zst
yuzu-68183e7b5a8084e3fd2ec7b5f1e82576ffc20fe3.zip
m---------externals/fmt0
-rw-r--r--src/common/logging/backend.cpp5
-rw-r--r--src/common/logging/log.h8
3 files changed, 8 insertions, 5 deletions
diff --git a/externals/fmt b/externals/fmt
-Subproject 4d35f94133ed14794e53c9f8627d047b408e0dc
+Subproject 5859e58ba17073cf1c16536205450528f3530df
diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp
index 625730c6a..26cd75a3e 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 =
diff --git a/src/common/logging/log.h b/src/common/logging/log.h
index 3c9da7f55..45821850c 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