Fix build after CEF update (#3132)

Addendum to d28b420
multitheftauto · Jul 28, 2023 · 9980252 · 9980252
1 parent 269c4ac
commit 9980252
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/Shared/sdk/SharedUtil.Misc.h b/Shared/sdk/SharedUtil.Misc.h
@@ -234,6 +234,7 @@ namespace SharedUtil
 
     std::string UTF16ToMbUTF8(const std::wstring& ws);
     std::string UTF16ToMbUTF8(const wchar_t* ws);
+    std::string UTF16ToMbUTF8(const char16_t* ws);
 
     std::wstring ANSIToUTF16(const SString& s);
 

diff --git a/Shared/sdk/SharedUtil.Misc.hpp b/Shared/sdk/SharedUtil.Misc.hpp
@@ -1502,6 +1502,11 @@ std::string SharedUtil::UTF16ToMbUTF8(const wchar_t* input)
     return utf8_wcstombs(input);
 }
 
+std::string SharedUtil::UTF16ToMbUTF8(const char16_t* input)
+{
+    return UTF16ToMbUTF8(input);
+}
+
 // Get UTF8 confidence
 int SharedUtil::GetUTF8Confidence(const unsigned char* input, int len)
 {

diff --git a/Shared/sdk/WString.h b/Shared/sdk/WString.h
@@ -36,6 +36,8 @@ class WString : public std::wstring
 
     WString(const char* szText);
 
+    WString(const char16_t* szText) : std::wstring(szText ? (const wchar_t*)szText : L""){};
+
     explicit WString(const wchar_t* szFormat, ...) : std::wstring()
     {
         if (szFormat)