summaryrefslogtreecommitdiff
path: root/src/common/logging/backend.cpp
diff options
context:
space:
mode:
authorGravatar James Rowe2018-04-05 22:42:09 -0600
committerGravatar James Rowe2018-04-05 22:42:09 -0600
commitf9945f8a3b9f2980dc9b3c9a76343df4d254faa2 (patch)
tree43a4ea01ad3c7a90942ad1d14f3233c5eb5634db /src/common/logging/backend.cpp
parentMerge pull request #308 from bunnei/misc-fixes-2 (diff)
downloadyuzu-f9945f8a3b9f2980dc9b3c9a76343df4d254faa2.tar.gz
yuzu-f9945f8a3b9f2980dc9b3c9a76343df4d254faa2.tar.xz
yuzu-f9945f8a3b9f2980dc9b3c9a76343df4d254faa2.zip
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/backend.cpp')
-rw-r--r--src/common/logging/backend.cpp5
1 files changed, 3 insertions, 2 deletions
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
146 PrintColoredMessage(entry); 146 PrintColoredMessage(entry);
147} 147}
148 148
149void LogMessage(Class log_class, Level log_level, const char* filename, unsigned int line_num, 149void FmtLogMessageImpl(Class log_class, Level log_level, const char* filename,
150 const char* function, const char* format, const fmt::format_args& args) { 150 unsigned int line_num, const char* function, const char* format,
151 const fmt::format_args& args) {
151 if (filter && !filter->CheckMessage(log_class, log_level)) 152 if (filter && !filter->CheckMessage(log_class, log_level))
152 return; 153 return;
153 Entry entry = 154 Entry entry =