diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2024-11-04 11:05:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-04 11:05:28 +0100 |
| commit | 59530966f99136ba4cc412e57e623992586f9db4 (patch) | |
| tree | 91266a34c390f7250d548fa627d78ac233deac95 | |
| parent | b8823457c14248b61ffb400c6af080db2aa799b0 (diff) | |
| parent | 0fd5e86677bf735f86a4dda4a3d89b72dd681255 (diff) | |
Merge pull request #13164 from jordan-woyak/saveable-deduction
Config/IsSettingSaveable: Use class template argument deduction.
| -rw-r--r-- | Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp b/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp index fd47ede19e..4e4b698851 100644 --- a/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp +++ b/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp @@ -6,19 +6,14 @@ #include <algorithm> #include <array> -#include "Common/Config/Config.h" -#include "Core/Config/AchievementSettings.h" -#include "Core/Config/GraphicsSettings.h" -#include "Core/Config/MainSettings.h" -#include "Core/Config/UISettings.h" #include "Core/Config/WiimoteSettings.h" namespace ConfigLoaders { bool IsSettingSaveable(const Config::Location& config_location) { - static constexpr std::array<Config::System, 3> systems_not_saveable = { - Config::System::GCPad, Config::System::WiiPad, Config::System::GCKeyboard}; + static constexpr std::array systems_not_saveable = {Config::System::GCPad, Config::System::WiiPad, + Config::System::GCKeyboard}; if (std::find(begin(systems_not_saveable), end(systems_not_saveable), config_location.system) == end(systems_not_saveable)) |