From 57722fb192007b2c1befed33dfc6b0dbbdcfeb8a Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Wed, 30 Sep 2015 04:02:48 +0100 Subject: [PATCH] Service/CFG: Use a constexpr function for country initialization MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes a TODO left over from when we supported MSVC 2013. --- src/core/hle/service/cfg/cfg.h | 7 +++---- 1 file 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 country_codes = {{ 0, C("JP"), 0, 0, 0, 0, 0, 0, // 0-7 @@ -71,8 +72,6 @@ static const std::array country_codes = {{ C("SM"), C("VA"), C("BM") // 184-186 }}; -#undef C - /** * CFG::GetCountryCodeString service function * Inputs: