citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

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
This commit is contained in:
James Rowe 2018-04-05 22:33:12 -06:00
parent a2e87075c5
commit 501717e9db
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
externals/fmt vendored

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

5
src/common/logging/backend.cpp
View File

@ -153,8 +153,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 =

8
src/common/logging/log.h
View File

@ -112,13 +112,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