diff --git a/Source/Android/jni/ButtonManager.cpp b/Source/Android/jni/ButtonManager.cpp index 554cc6f0e2..7530e37cfd 100644 --- a/Source/Android/jni/ButtonManager.cpp +++ b/Source/Android/jni/ButtonManager.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include #include #include #include @@ -16,8 +17,8 @@ namespace ButtonManager { namespace { -const std::string touchScreenKey = "Touchscreen"; -const std::vector configStrings = { +constexpr char touchScreenKey[] = "Touchscreen"; +constexpr std::array configStrings{{ // GC "InputA", "InputB", @@ -169,9 +170,9 @@ const std::vector configStrings = { "TurntableCrossRight", // Rumble "Rumble", -}; +}}; -const std::vector configTypes = { +constexpr std::array configTypes{{ // GC BUTTON_A, BUTTON_B, @@ -323,7 +324,7 @@ const std::vector configTypes = { TURNTABLE_CROSSFADE_RIGHT, // Rumble RUMBLE, -}; +}}; std::unordered_map m_controllers;