diff options
| author | bunnei <bunneidev@gmail.com> | 2015-09-21 21:29:55 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-09-21 21:29:55 -0400 |
| commit | 09f43c0975b303ca98072fbece37334b0d2b4e4b (patch) | |
| tree | 4590343a003cedb3116fbc2ecf1da83354e90c56 /src/core/settings.h | |
| parent | ca5ea5142deec687e42f86add5026c1ade2c1093 (diff) | |
| parent | 543192e045d1b0866c353f1f6af2f3a3d81319c7 (diff) | |
Merge pull request #1160 from lioncash/clang
Silence some clang warnings
Diffstat (limited to 'src/core/settings.h')
| -rw-r--r-- | src/core/settings.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/settings.h b/src/core/settings.h index 6ca0e1afc..0b05e5bee 100644 --- a/src/core/settings.h +++ b/src/core/settings.h @@ -19,22 +19,22 @@ enum Values { CUP, CDOWN, CLEFT, CRIGHT, NUM_INPUTS }; -static const std::array<const char*, NUM_INPUTS> Mapping = { +static const std::array<const char*, NUM_INPUTS> Mapping = {{ "pad_a", "pad_b", "pad_x", "pad_y", "pad_l", "pad_r", "pad_zl", "pad_zr", "pad_start", "pad_select", "pad_home", "pad_dup", "pad_ddown", "pad_dleft", "pad_dright", "pad_sup", "pad_sdown", "pad_sleft", "pad_sright", "pad_cup", "pad_cdown", "pad_cleft", "pad_cright" -}; -static const std::array<Values, NUM_INPUTS> All = { +}}; +static const std::array<Values, NUM_INPUTS> All = {{ A, B, X, Y, L, R, ZL, ZR, START, SELECT, HOME, DUP, DDOWN, DLEFT, DRIGHT, SUP, SDOWN, SLEFT, SRIGHT, CUP, CDOWN, CLEFT, CRIGHT -}; +}}; } |