From f5270d75eb845d4c162fef2482353ee67f1fba35 Mon Sep 17 00:00:00 2001
From: peri4 <peri4ko@yandex.ru>
Date: Thu, 21 Nov 2024 16:28:19 +0300
Subject: [PATCH] multi-utf16 fix

---
 libs/main/core/picout.cpp   | 2 +-
 libs/main/text/pistring.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/main/core/picout.cpp b/libs/main/core/picout.cpp
index 809e3753..5a8e73f0 100644
--- a/libs/main/core/picout.cpp
+++ b/libs/main/core/picout.cpp
@@ -366,7 +366,7 @@ PICout & PICout::operator<<(PIFlags<PICoutManipulators::PICoutFormat> v) {
 
 void PICout::stdoutPIString(const PIString & str, PICoutStdStream s) {
 #ifdef HAS_LOCALE
-	std::wstring_convert<std::codecvt_utf8<char16_t>, char16_t> utf8conv;
+	std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> utf8conv;
 	getStdStream(s) << utf8conv.to_bytes((char16_t *)&(const_cast<PIString &>(str).front()),
 										 (char16_t *)&(const_cast<PIString &>(str).front()) + str.size());
 #else
diff --git a/libs/main/text/pistring.cpp b/libs/main/text/pistring.cpp
index 67760cfc..a3959233 100644
--- a/libs/main/text/pistring.cpp
+++ b/libs/main/text/pistring.cpp
@@ -320,7 +320,7 @@ void PIString::appendFromChars(const char * c, int s, const char * codepage) {
 	d.enlarge(sz);
 	MultiByteToWideChar((uint)(uintptr_t)codepage, MB_ERR_INVALID_CHARS, c, s, (LPWSTR)d.data(old_sz), sz);
 #  else
-	std::wstring_convert<std::codecvt_utf8<char16_t>, char16_t> ucs2conv;
+	std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> ucs2conv;
 	std::u16string ucs2 = ucs2conv.from_bytes(c, c + s);
 	d.enlarge(ucs2.size());
 	ucs2.copy((char16_t *)d.data(old_sz), ucs2.size());
@@ -488,7 +488,7 @@ void PIString::buildData(const char * cp) const {
 	data_size_ = sz;
 	return;
 #  else
-	std::wstring_convert<std::codecvt_utf8<char16_t>, char16_t> ucs2conv;
+	std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> ucs2conv;
 	std::string u8str = ucs2conv.to_bytes((char16_t *)d.data(), (char16_t *)d.data() + d.size());
 	data_             = (char *)malloc(u8str.size() + 1);
 	strcpy(data_, u8str.c_str());