backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-20 09:57:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix messed up function declaration for u16string_to_wstring
Some checks are pending
Build (Linux, x86_64) / build-linux (push) Waiting to run
Details
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Details
Clang Format / clang-format (push) Waiting to run
Details

Browse source
This commit is contained in:
Tropical 2026-03-22 23:04:06 -05:00
parent f820e73cf8
commit 86811a4b0e
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Minecraft.World/Util/StringHelpers.cpp
View file

@ -63,7 +63,7 @@ std::wstring u16string_to_wstring(const std::u16string& converting) {
} }
std::u16string wstring_to_u16string(const std::wstring& converting) { std::u16string wstring_to_u16string(const std::wstring& converting) {
#if WCHAR_MAX == 0xFFFF #if WCHAR_MAX == 0xFFFF
// windows, UTF-16 // windows, UTF-16
return std::u16string(reinterpret_cast<const char16_t*>(converting.data()), return std::u16string(reinterpret_cast<const char16_t*>(converting.data()),
converting.size()); converting.size());

2
Minecraft.World/Util/StringHelpers.h
View file

@ -30,7 +30,7 @@ T _fromHEXString(const std::wstring& s) {
} }
std::wstring convStringToWstring(const std::string& converting); 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); std::u16string wstring_to_u16string(const std::wstring& converting);
const char* wstringtofilename(const std::wstring& name); const char* wstringtofilename(const std::wstring& name);
std::wstring filenametowstring(const char* name); std::wstring filenametowstring(const char* name);