diff options
| author | mitaclaw <140017135+mitaclaw@users.noreply.github.com> | 2024-09-28 20:19:03 -0700 |
|---|---|---|
| committer | mitaclaw <140017135+mitaclaw@users.noreply.github.com> | 2024-10-17 18:39:12 -0700 |
| commit | 5f3a8ff0de9d89ec162e1d2be7611b10f3d3740f (patch) | |
| tree | 5f0ac4cdb245eb84e5a57e7d380330c57b970c86 /Source/Core | |
| parent | be0b13da97121d9ca1b1d454cf3a36bcccb5173b (diff) | |
Modernize `std::unique` with ranges
The new return value is `std::ranges::subrange`.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Common/FileSearch.cpp | 3 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/MappingCommon.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Source/Core/Common/FileSearch.cpp b/Source/Core/Common/FileSearch.cpp index 4a54c978c9..a92c50f7d1 100644 --- a/Source/Core/Common/FileSearch.cpp +++ b/Source/Core/Common/FileSearch.cpp @@ -98,7 +98,8 @@ std::vector<std::string> DoFileSearch(const std::vector<std::string>& directorie // not because std::filesystem returns duplicates). Also note that this pathname-based uniqueness // isn't as thorough as std::filesystem::equivalent. std::ranges::sort(result); - result.erase(std::unique(result.begin(), result.end()), result.end()); + const auto unique_result = std::ranges::unique(result); + result.erase(unique_result.begin(), unique_result.end()); // Dolphin expects to be able to use "/" (DIR_SEP) everywhere. // std::filesystem uses the OS separator. diff --git a/Source/Core/InputCommon/ControllerInterface/MappingCommon.cpp b/Source/Core/InputCommon/ControllerInterface/MappingCommon.cpp index 1877e8294c..b50621bc92 100644 --- a/Source/Core/InputCommon/ControllerInterface/MappingCommon.cpp +++ b/Source/Core/InputCommon/ControllerInterface/MappingCommon.cpp @@ -129,7 +129,8 @@ BuildExpression(const std::vector<ciface::Core::DeviceContainer::InputDetection> // Remove duplicates std::ranges::sort(alternations); - alternations.erase(std::unique(alternations.begin(), alternations.end()), alternations.end()); + const auto unique_result = std::ranges::unique(alternations); + alternations.erase(unique_result.begin(), unique_result.end()); return fmt::to_string(fmt::join(alternations, "|")); } |
