diff options
| author | bunnei <bunneidev@gmail.com> | 2015-09-30 11:06:47 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-09-30 11:06:47 -0400 |
| commit | bcaafb826eb666e1e883158a531d28c3b4c7f13d (patch) | |
| tree | b41935aeb11e3c188b1910ba1855354d5ad641f7 /src | |
| parent | ddc54615ca83188c4ede3866403cbf4627e703a7 (diff) | |
| parent | 57722fb192007b2c1befed33dfc6b0dbbdcfeb8a (diff) | |
Merge pull request #1177 from linkmauve/fix-msvc-todo
Use a constexpr function for country initialization in service/cfg
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/cfg/cfg.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/hle/service/cfg/cfg.h b/src/core/hle/service/cfg/cfg.h index 231528fd6..fc2a16a04 100644 --- a/src/core/hle/service/cfg/cfg.h +++ b/src/core/hle/service/cfg/cfg.h @@ -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: |