summaryrefslogtreecommitdiff
path: root/src/core/settings.h
diff options
context:
space:
mode:
authorGravatar Lioncash2015-09-16 08:38:12 -0400
committerGravatar Lioncash2015-09-16 08:51:53 -0400
commit751fbfdcc33420cb39aee30158706984efb4da40 (patch)
tree570330019bba030c78af7d7715b89a5b3de7ccc6 /src/core/settings.h
parentMerge pull request #1097 from yuriks/cfg-blocks (diff)
downloadyuzu-751fbfdcc33420cb39aee30158706984efb4da40.tar.gz
yuzu-751fbfdcc33420cb39aee30158706984efb4da40.tar.xz
yuzu-751fbfdcc33420cb39aee30158706984efb4da40.zip
general: Silence some warnings when using clang
Diffstat (limited to 'src/core/settings.h')
-rw-r--r--src/core/settings.h8
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 {
19 CUP, CDOWN, CLEFT, CRIGHT, 19 CUP, CDOWN, CLEFT, CRIGHT,
20 NUM_INPUTS 20 NUM_INPUTS
21}; 21};
22static const std::array<const char*, NUM_INPUTS> Mapping = { 22static const std::array<const char*, NUM_INPUTS> Mapping = {{
23 "pad_a", "pad_b", "pad_x", "pad_y", 23 "pad_a", "pad_b", "pad_x", "pad_y",
24 "pad_l", "pad_r", "pad_zl", "pad_zr", 24 "pad_l", "pad_r", "pad_zl", "pad_zr",
25 "pad_start", "pad_select", "pad_home", 25 "pad_start", "pad_select", "pad_home",
26 "pad_dup", "pad_ddown", "pad_dleft", "pad_dright", 26 "pad_dup", "pad_ddown", "pad_dleft", "pad_dright",
27 "pad_sup", "pad_sdown", "pad_sleft", "pad_sright", 27 "pad_sup", "pad_sdown", "pad_sleft", "pad_sright",
28 "pad_cup", "pad_cdown", "pad_cleft", "pad_cright" 28 "pad_cup", "pad_cdown", "pad_cleft", "pad_cright"
29}; 29}};
30static const std::array<Values, NUM_INPUTS> All = { 30static const std::array<Values, NUM_INPUTS> All = {{
31 A, B, X, Y, 31 A, B, X, Y,
32 L, R, ZL, ZR, 32 L, R, ZL, ZR,
33 START, SELECT, HOME, 33 START, SELECT, HOME,
34 DUP, DDOWN, DLEFT, DRIGHT, 34 DUP, DDOWN, DLEFT, DRIGHT,
35 SUP, SDOWN, SLEFT, SRIGHT, 35 SUP, SDOWN, SLEFT, SRIGHT,
36 CUP, CDOWN, CLEFT, CRIGHT 36 CUP, CDOWN, CLEFT, CRIGHT
37}; 37}};
38} 38}
39 39
40 40