mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 15:56:38 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix_string_view_init' into 'master'

Browse source 
Initialize string_view with explicit size (#6625)

Closes #6625

See merge request OpenMW/openmw!1665
This commit is contained in:
uramer 2022-02-16 17:15:54 +00:00
commit b81d4cc11c
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
components/to_utf8/to_utf8.cpp
View file

@ -57,13 +57,13 @@ namespace
switch (sourceEncoding)
{
case ToUTF8::WINDOWS_1252:
return ToUTF8::windows_1252;
return {ToUTF8::windows_1252, std::size(ToUTF8::windows_1252)};
case ToUTF8::WINDOWS_1250:
return ToUTF8::windows_1250;
return {ToUTF8::windows_1250, std::size(ToUTF8::windows_1250)};
case ToUTF8::WINDOWS_1251:
return ToUTF8::windows_1251;
return {ToUTF8::windows_1251, std::size(ToUTF8::windows_1251)};
case ToUTF8::CP437:
return ToUTF8::cp437;
return {ToUTF8::cp437, std::size(ToUTF8::cp437)};
}
throw std::logic_error("Invalid source encoding: " + std::to_string(sourceEncoding));
}