citra-emu
/
citra
Archived
1
0
Fork 0
Code

Merge pull request #3629 from jroweboy/update-fmtlib 

Update fmtlib to fix msvc warnings
This commit is contained in:
Weiyi Wang 2018-04-06 12:37:27 +03:00 committed by GitHub
parent a2e87075c5 501717e9db
commit 223dfd6cb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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); PrintColoredMessage(entry);
} }
void LogMessage(Class log_class, Level log_level, const char* filename, unsigned int line_num, void FmtLogMessageImpl(Class log_class, Level log_level, const char* filename,
const char* function, const char* format, const fmt::format_args& args) { unsigned int line_num, const char* function, const char* format,
const fmt::format_args& args) {
if (filter && !filter->CheckMessage(log_class, log_level)) if (filter && !filter->CheckMessage(log_class, log_level))
return; return;
Entry entry = 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 /// Logs a message to the global logger, using fmt
void LogMessage(Class log_class, Level log_level, const char* filename, unsigned int line_num, void FmtLogMessageImpl(Class log_class, Level log_level, const char* filename,
const char* function, const char* format, const fmt::format_args& args); unsigned int line_num, const char* function, const char* format,
const fmt::format_args& args);
template <typename... Args> template <typename... Args>
void FmtLogMessage(Class log_class, Level log_level, const char* filename, unsigned int line_num, void FmtLogMessage(Class log_class, Level log_level, const char* filename, unsigned int line_num,
const char* function, const char* format, const Args&... args) { 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 } // namespace Log