summaryrefslogtreecommitdiffstats
path: root/src/core/settings.h
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2015-09-16 14:38:12 +0200
committerLioncash <mathew1800@gmail.com>2015-09-16 14:51:53 +0200
commit751fbfdcc33420cb39aee30158706984efb4da40 (patch)
tree570330019bba030c78af7d7715b89a5b3de7ccc6 /src/core/settings.h
parentMerge pull request #1097 from yuriks/cfg-blocks (diff)
downloadyuzu-751fbfdcc33420cb39aee30158706984efb4da40.tar
yuzu-751fbfdcc33420cb39aee30158706984efb4da40.tar.gz
yuzu-751fbfdcc33420cb39aee30158706984efb4da40.tar.bz2
yuzu-751fbfdcc33420cb39aee30158706984efb4da40.tar.lz
yuzu-751fbfdcc33420cb39aee30158706984efb4da40.tar.xz
yuzu-751fbfdcc33420cb39aee30158706984efb4da40.tar.zst
yuzu-751fbfdcc33420cb39aee30158706984efb4da40.zip
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 {
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
-};
+}};
}