ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Base] Qualify std namespace.

This commit is contained in:
gibbed 2019-08-04 04:39:22 -05:00
parent 8b1f728d85
commit 40cc8c52d7
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/xenia/base/logging.cc
View File

@ -264,8 +264,8 @@ void LogLineFormat(LogLevel log_level, const char prefix_char, const char* fmt,
va_list args; va_list args;
va_start(args, fmt); va_start(args, fmt);
int chars_written = vsnprintf(log_format_buffer_.data(), int chars_written = std::vsnprintf(log_format_buffer_.data(),
log_format_buffer_.capacity(), fmt, args); log_format_buffer_.capacity(), fmt, args);
va_end(args); va_end(args);
if (chars_written >= 0 && chars_written < log_format_buffer_.capacity()) { if (chars_written >= 0 && chars_written < log_format_buffer_.capacity()) {
logger_->AppendLine(xe::threading::current_thread_id(), log_level, logger_->AppendLine(xe::threading::current_thread_id(), log_level,
@ -282,8 +282,8 @@ void LogLineVarargs(LogLevel log_level, const char prefix_char, const char* fmt,
return; return;
} }
int chars_written = vsnprintf(log_format_buffer_.data(), int chars_written = std::vsnprintf(log_format_buffer_.data(),
log_format_buffer_.capacity(), fmt, args); log_format_buffer_.capacity(), fmt, args);
if (chars_written < 0) { if (chars_written < 0) {
return; return;
} }
@ -324,22 +324,22 @@ void FatalError(const char* fmt, ...) {
#if XE_PLATFORM_WIN32 #if XE_PLATFORM_WIN32
if (!xe::has_console_attached()) { if (!xe::has_console_attached()) {
va_start(args, fmt); va_start(args, fmt);
vsnprintf(log_format_buffer_.data(), log_format_buffer_.capacity(), fmt, std::vsnprintf(log_format_buffer_.data(), log_format_buffer_.capacity(),
args); fmt, args);
va_end(args); va_end(args);
MessageBoxA(NULL, log_format_buffer_.data(), "Xenia Error", MessageBoxA(NULL, log_format_buffer_.data(), "Xenia Error",
MB_OK | MB_ICONERROR | MB_APPLMODAL | MB_SETFOREGROUND); MB_OK | MB_ICONERROR | MB_APPLMODAL | MB_SETFOREGROUND);
} }
#endif // WIN32 #endif // WIN32
ShutdownLogging(); ShutdownLogging();
exit(1); std::exit(1);
} }
void FatalError(const wchar_t* fmt, ...) { void FatalError(const wchar_t* fmt, ...) {
va_list args; va_list args;
va_start(args, fmt); va_start(args, fmt);
vswprintf((wchar_t*)log_format_buffer_.data(), std::vswprintf((wchar_t*)log_format_buffer_.data(),
log_format_buffer_.capacity() >> 1, fmt, args); log_format_buffer_.capacity() >> 1, fmt, args);
va_end(args); va_end(args);
LogLine(LogLevel::Error, 'X', LogLine(LogLevel::Error, 'X',
@ -352,7 +352,7 @@ void FatalError(const wchar_t* fmt, ...) {
} }
#endif // WIN32 #endif // WIN32
ShutdownLogging(); ShutdownLogging();
exit(1); std::exit(1);
} }
void FatalError(const std::string& str) { FatalError(str.c_str()); } void FatalError(const std::string& str) { FatalError(str.c_str()); }