N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1177 from linkmauve/fix-msvc-todo

Browse source 
Use a constexpr function for country initialization in service/cfg
This commit is contained in:
bunnei 2015-09-30 11:06:47 -04:00
commit bcaafb826e
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/core/hle/service/cfg/cfg.h
View file

@ -41,8 +41,9 @@ struct SaveConfigBlockEntry {
u16 flags; ///< The flags of the block, possibly used for access control u16 flags; ///< The flags of the block, possibly used for access control
}; };
// TODO(Link Mauve): use a constexpr once MSVC starts supporting it. static constexpr u16 C(const char code[2]) {
#define C(code) (u16)((code)[0] | ((code)[1] << 8)) return code[0] | (code[1] << 8);
}
static const std::array<u16, 187> country_codes = {{ static const std::array<u16, 187> country_codes = {{
0, C("JP"), 0, 0, 0, 0, 0, 0, // 0-7 0, C("JP"), 0, 0, 0, 0, 0, 0, // 0-7
@ -71,8 +72,6 @@ static const std::array<u16, 187> country_codes = {{
C("SM"), C("VA"), C("BM") // 184-186 C("SM"), C("VA"), C("BM") // 184-186
}}; }};
#undef C
/** /**
* CFG::GetCountryCodeString service function * CFG::GetCountryCodeString service function
* Inputs: * Inputs: