From 86811a4b0e3e2587894b36bbe8a1f85fe1be37fd Mon Sep 17 00:00:00 2001 From: Tropical <42101043+tropicaaal@users.noreply.github.com> Date: Sun, 22 Mar 2026 23:04:06 -0500 Subject: [PATCH] fix messed up function declaration for u16string_to_wstring --- Minecraft.World/Util/StringHelpers.cpp | 2 +- Minecraft.World/Util/StringHelpers.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Minecraft.World/Util/StringHelpers.cpp b/Minecraft.World/Util/StringHelpers.cpp index fb6c878f0..c5998b565 100644 --- a/Minecraft.World/Util/StringHelpers.cpp +++ b/Minecraft.World/Util/StringHelpers.cpp @@ -63,7 +63,7 @@ std::wstring u16string_to_wstring(const std::u16string& converting) { } std::u16string wstring_to_u16string(const std::wstring& converting) { - #if WCHAR_MAX == 0xFFFF +#if WCHAR_MAX == 0xFFFF // windows, UTF-16 return std::u16string(reinterpret_cast(converting.data()), converting.size()); diff --git a/Minecraft.World/Util/StringHelpers.h b/Minecraft.World/Util/StringHelpers.h index 72a84533f..871e46d87 100644 --- a/Minecraft.World/Util/StringHelpers.h +++ b/Minecraft.World/Util/StringHelpers.h @@ -30,7 +30,7 @@ T _fromHEXString(const std::wstring& s) { } std::wstring convStringToWstring(const std::string& converting); -std::wstring wstring_to_u16string(const std::u16string& converting); +std::wstring u16string_to_wstring(const std::u16string& converting); std::u16string wstring_to_u16string(const std::wstring& converting); const char* wstringtofilename(const std::wstring& name); std::wstring filenametowstring(const char* name);