From 549d5fea316103e503ff3480ca4d789f6a2f5925 Mon Sep 17 00:00:00 2001 From: Treeston Date: Tue, 25 Dec 2018 12:36:20 +0100 Subject: Core/Utils: some code style adjustments, 6d6077e follow-up (cherry picked from commit 4c3af3b636d5e9279fb694c9d9a5a4422ad773d0) --- src/common/Utilities/Util.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/common/Utilities/Util.cpp') diff --git a/src/common/Utilities/Util.cpp b/src/common/Utilities/Util.cpp index 36099263c03..099de72c7af 100644 --- a/src/common/Utilities/Util.cpp +++ b/src/common/Utilities/Util.cpp @@ -251,9 +251,9 @@ bool Utf8toWStr(char const* utf8str, size_t csize, wchar_t* wstr, size_t& wsize) { try { - Trinity::BufferWriteGuard guard(wstr, wsize); - guard = utf8::utf8to16(utf8str, utf8str+csize, guard); - wsize -= guard.size(); // remaining unused space + Trinity::CheckedBufferOutputIterator out(wstr, wsize); + out = utf8::utf8to16(utf8str, utf8str+csize, out); + wsize -= out.remaining(); // remaining unused space wstr[wsize] = L'\0'; } catch (std::exception const&) -- cgit v1.2.3