mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-11-06 23:30:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace ThrowWinError with WindowsError class.

Browse Source
This commit is contained in:
Victor Zverovich 2014-06-30 17:32:08 -07:00
parent c6eb12d1d4
commit f4208771a8
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
format.cc
View File

@ -220,17 +220,17 @@ fmt::internal::UTF8ToUTF16::UTF8ToUTF16(fmt::StringRef s) {
CP_UTF8, MB_ERR_INVALID_CHARS, s.c_str(), -1, 0, 0); CP_UTF8, MB_ERR_INVALID_CHARS, s.c_str(), -1, 0, 0);
static const char ERROR[] = "cannot convert string from UTF-8 to UTF-16"; static const char ERROR[] = "cannot convert string from UTF-8 to UTF-16";
if (length == 0) if (length == 0)
ThrowWinError(GetLastError(), ERROR); throw WindowsError(GetLastError(), ERROR);
buffer_.resize(length); buffer_.resize(length);
length = MultiByteToWideChar( length = MultiByteToWideChar(
CP_UTF8, MB_ERR_INVALID_CHARS, s.c_str(), -1, &buffer_[0], length); CP_UTF8, MB_ERR_INVALID_CHARS, s.c_str(), -1, &buffer_[0], length);
if (length == 0) if (length == 0)
ThrowWinError(GetLastError(), ERROR); throw WindowsError(GetLastError(), ERROR);
} }
fmt::internal::UTF16ToUTF8::UTF16ToUTF8(fmt::WStringRef s) { fmt::internal::UTF16ToUTF8::UTF16ToUTF8(fmt::WStringRef s) {
if (int error_code = Convert(s)) { if (int error_code = Convert(s)) {
ThrowWinError(GetLastError(), throw WindowsError(GetLastError(),
"cannot convert string from UTF-16 to UTF-8"); "cannot convert string from UTF-16 to UTF-8");
} }
} }
@ -1094,9 +1094,7 @@ void fmt::ReportSystemError(
#ifdef _WIN32 #ifdef _WIN32
void fmt::WinErrorSink::operator()(const Writer &w) const { void fmt::WinErrorSink::operator()(const Writer &w) const {
Writer message; throw WindowsError(error_code_, w.c_str());
internal::FormatWinErrorMessage(message, error_code_, w.c_str());
throw SystemError(error_code_, message.c_str());
} }
void fmt::ReportWinError( void fmt::ReportWinError(