From 40cc8c52d78a53186a2a6abaa7a7627a09b79f36 Mon Sep 17 00:00:00 2001 From: gibbed Date: Sun, 4 Aug 2019 04:39:22 -0500 Subject: [PATCH] [Base] Qualify std namespace. --- src/xenia/base/logging.cc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/xenia/base/logging.cc b/src/xenia/base/logging.cc index 36bfbe923..238969513 100644 --- a/src/xenia/base/logging.cc +++ b/src/xenia/base/logging.cc @@ -264,8 +264,8 @@ void LogLineFormat(LogLevel log_level, const char prefix_char, const char* fmt, va_list args; va_start(args, fmt); - int chars_written = vsnprintf(log_format_buffer_.data(), - log_format_buffer_.capacity(), fmt, args); + int chars_written = std::vsnprintf(log_format_buffer_.data(), + log_format_buffer_.capacity(), fmt, args); va_end(args); if (chars_written >= 0 && chars_written < log_format_buffer_.capacity()) { 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; } - int chars_written = vsnprintf(log_format_buffer_.data(), - log_format_buffer_.capacity(), fmt, args); + int chars_written = std::vsnprintf(log_format_buffer_.data(), + log_format_buffer_.capacity(), fmt, args); if (chars_written < 0) { return; } @@ -324,22 +324,22 @@ void FatalError(const char* fmt, ...) { #if XE_PLATFORM_WIN32 if (!xe::has_console_attached()) { va_start(args, fmt); - vsnprintf(log_format_buffer_.data(), log_format_buffer_.capacity(), fmt, - args); + std::vsnprintf(log_format_buffer_.data(), log_format_buffer_.capacity(), + fmt, args); va_end(args); MessageBoxA(NULL, log_format_buffer_.data(), "Xenia Error", MB_OK | MB_ICONERROR | MB_APPLMODAL | MB_SETFOREGROUND); } #endif // WIN32 ShutdownLogging(); - exit(1); + std::exit(1); } void FatalError(const wchar_t* fmt, ...) { va_list args; va_start(args, fmt); - vswprintf((wchar_t*)log_format_buffer_.data(), - log_format_buffer_.capacity() >> 1, fmt, args); + std::vswprintf((wchar_t*)log_format_buffer_.data(), + log_format_buffer_.capacity() >> 1, fmt, args); va_end(args); LogLine(LogLevel::Error, 'X', @@ -352,7 +352,7 @@ void FatalError(const wchar_t* fmt, ...) { } #endif // WIN32 ShutdownLogging(); - exit(1); + std::exit(1); } void FatalError(const std::string& str) { FatalError(str.c_str()); }