ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1235 from lioncash/func 

VolumeGC: Use regular return type declaration for GetStringDecoder
This commit is contained in:
Lioncash 2014-10-09 01:20:57 -04:00
parent 86b81c55bf 6cfa579870
commit 67e44c0e63
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DiscIO/VolumeGC.cpp
View File

@ -161,7 +161,7 @@ bool CVolumeGC::IsDiscTwo() const
return discTwo; return discTwo;
} }
auto CVolumeGC::GetStringDecoder(ECountry country) -> StringDecoder CVolumeGC::StringDecoder CVolumeGC::GetStringDecoder(ECountry country)
{ {
return (COUNTRY_JAPAN == country || COUNTRY_TAIWAN == country) ? return (COUNTRY_JAPAN == country || COUNTRY_TAIWAN == country) ?
SHIFTJISToUTF8 : CP1252ToUTF8; SHIFTJISToUTF8 : CP1252ToUTF8;