Replaced use of std::u16string* with std::wstring*

2 files changed, 19 insertions, 10 deletions

diff --git a/zencore/include/zencore/string.h b/zencore/include/zencore/string.h
index c205b199d..9f1bc39d0 100644
--- a/zencore/include/zencore/string.h
+++ b/zencore/include/zencore/string.h
@@ -424,7 +424,7 @@ public:
 	inline std::wstring_view ToView() const { return std::wstring_view{Data(), Size()}; }
 	inline std::wstring		 toString() const { return std::wstring{Data(), Size()}; }
 
-	inline StringBuilderImpl& operator<<(const std::u16string_view str) { return Append((const wchar_t*)str.data(), str.size()); }
+	inline StringBuilderImpl& operator<<(const std::wstring_view str) { return Append((const wchar_t*)str.data(), str.size()); }
 	inline StringBuilderImpl& operator<<(const wchar_t* str) { return Append(str); }
 	using StringBuilderImpl:: operator<<;
 };
diff --git a/zencore/string.cpp b/zencore/string.cpp
index efa84ea73..7acdc16f0 100644
--- a/zencore/string.cpp
+++ b/zencore/string.cpp
@@ -30,6 +30,17 @@ utf16to8_impl(u16bit_iterator StartIt, u16bit_iterator EndIt, ::zen::StringBuild
 	}
 }
 
+template<typename u32bit_iterator>
+void
+utf32to8_impl(u32bit_iterator StartIt, u32bit_iterator EndIt, ::zen::StringBuilderBase& OutString)
+{
+	for (; StartIt != EndIt; ++StartIt)
+	{
+		wchar_t cp = *StartIt;
+		OutString.AppendCodepoint(cp);
+	}
+}
+
 //////////////////////////////////////////////////////////////////////////
 
 namespace zen {
@@ -164,26 +175,24 @@ Utf8ToWide(const std::u8string_view& Str8, WideStringBuilderBase& OutString)
 void
 WideToUtf8(const wchar_t* Wstr, StringBuilderBase& OutString)
 {
-	WideToUtf8(std::u16string_view{(char16_t*)Wstr}, OutString);
+	WideToUtf8(std::wstring_view{Wstr}, OutString);
 }
 
 void
 WideToUtf8(const std::wstring_view& Wstr, StringBuilderBase& OutString)
 {
-	WideToUtf8(std::u16string_view{(char16_t*)Wstr.data(), Wstr.size()}, OutString);
-}
-
-void
-WideToUtf8(const std::u16string_view& Wstr, StringBuilderBase& OutString)
-{
+#if ZEN_SIZEOF_WCHAR_T == 2
 	utf16to8_impl(begin(Wstr), end(Wstr), OutString);
+#else
+	utf32to8_impl(begin(Wstr), end(Wstr), OutString);
+#endif
 }
 
 std::string
 WideToUtf8(const wchar_t* Wstr)
 {
 	ExtendableStringBuilder<128> String;
-	WideToUtf8(std::u16string_view{(char16_t*)Wstr}, String);
+	WideToUtf8(std::wstring_view{Wstr}, String);
 
 	return String.c_str();
 }
@@ -192,7 +201,7 @@ std::string
 WideToUtf8(const std::wstring_view Wstr)
 {
 	ExtendableStringBuilder<128> String;
-	WideToUtf8(std::u16string_view{(char16_t*)Wstr.data(), Wstr.size()}, String);
+	WideToUtf8(std::wstring_view{Wstr.data(), Wstr.size()}, String);
 
 	return String.c_str();
 }