mirror of
https://github.com/citra-mirror/citra.git
synced 2024-08-21 10:53:23 +02:00
Service/CFG: Use a constexpr function for country initialization
This fixes a TODO left over from when we supported MSVC 2013.
This commit is contained in:
parent
ddfefa9007
commit
57722fb192
@ -41,8 +41,9 @@ struct SaveConfigBlockEntry {
|
||||
u16 flags; ///< The flags of the block, possibly used for access control
|
||||
};
|
||||
|
||||
// TODO(Link Mauve): use a constexpr once MSVC starts supporting it.
|
||||
#define C(code) (u16)((code)[0] | ((code)[1] << 8))
|
||||
static constexpr u16 C(const char code[2]) {
|
||||
return code[0] | (code[1] << 8);
|
||||
}
|
||||
|
||||
static const std::array<u16, 187> country_codes = {{
|
||||
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
|
||||
}};
|
||||
|
||||
#undef C
|
||||
|
||||
/**
|
||||
* CFG::GetCountryCodeString service function
|
||||
* Inputs:
|
||||
|
Loading…
Reference in New Issue
Block a user