diff options
| author | shuffle2 <godisgovernment@gmail.com> | 2017-06-05 21:11:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-05 21:11:04 -0700 |
| commit | c8166951a0bfce3a0dab457e62b40b8649dd3c3c (patch) | |
| tree | 60c742b5ba43f0759f8b1e28e51525ce63d285e4 /Source/Core/Common/Config/Section.cpp | |
| parent | 192fec50b9e3a98aa625684c0a6bd016bfedbcd5 (diff) | |
| parent | b6a99e1b9c372ffd7c4a4ff58ea2ba1b95a75dff (diff) | |
Merge pull request #5418 from MerryMage/config-again-and-again
VideoConfig: Port to layered configuration system
Diffstat (limited to 'Source/Core/Common/Config/Section.cpp')
| -rw-r--r-- | Source/Core/Common/Config/Section.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/Source/Core/Common/Config/Section.cpp b/Source/Core/Common/Config/Section.cpp index 5c7f52eb63..ac6741416a 100644 --- a/Source/Core/Common/Config/Section.cpp +++ b/Source/Core/Common/Config/Section.cpp @@ -2,7 +2,6 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include <array> #include <cstddef> #include <map> #include <memory> @@ -254,13 +253,7 @@ bool RecursiveSection::Exists(const std::string& key) const bool RecursiveSection::Get(const std::string& key, std::string* value, const std::string& default_value) const { - static constexpr std::array<LayerType, 7> search_order = {{ - // Skip the meta layer - LayerType::CurrentRun, LayerType::CommandLine, LayerType::Movie, LayerType::Netplay, - LayerType::LocalGame, LayerType::GlobalGame, LayerType::Base, - }}; - - for (auto layer_id : search_order) + for (auto layer_id : SEARCH_ORDER) { auto layers_it = Config::GetLayers()->find(layer_id); if (layers_it == Config::GetLayers()->end()) |