From cfab5b6c03c37031b0f1f3e5c59227c551729f8c Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sat, 9 Oct 2021 14:27:37 +1100 Subject: util/unicode.cpp: string_view treatment for the last two holdouts. --- src/lib/util/unicode.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/lib/util/unicode.cpp') diff --git a/src/lib/util/unicode.cpp b/src/lib/util/unicode.cpp index 3b6f665f63a..ce917ec30aa 100644 --- a/src/lib/util/unicode.cpp +++ b/src/lib/util/unicode.cpp @@ -454,14 +454,14 @@ int utf16f_from_uchar(char16_t *utf16string, size_t count, char32_t uchar) // wstring_from_utf8 //------------------------------------------------- -std::wstring wstring_from_utf8(const std::string &utf8string) +std::wstring wstring_from_utf8(std::string_view utf8string) { #ifdef _WIN32 // for some reason, using codecvt yields bad results on MinGW (but not MSVC) return osd::text::to_wstring(utf8string); #else std::wstring_convert> converter; - return converter.from_bytes(utf8string); + return converter.from_bytes(string.data(), string.data() + string.length()); #endif } @@ -470,14 +470,14 @@ std::wstring wstring_from_utf8(const std::string &utf8string) // utf8_from_wstring //------------------------------------------------- -std::string utf8_from_wstring(const std::wstring &string) +std::string utf8_from_wstring(std::wstring_view string) { #ifdef _WIN32 // for some reason, using codecvt yields bad results on MinGW (but not MSVC) return osd::text::from_wstring(string); #else std::wstring_convert> converter; - return converter.to_bytes(string); + return converter.to_bytes(string.data(), string.data() + string.length()); #endif } -- cgit v1.2.3-70-g09d2