piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13726 from hoogmin/cpp23_ranges_patch

Browse Source 
Common: Replace Contains and ContainsSubrange with C++23 std::ranges equivalents
This commit is contained in:
Jordan Woyak
2025-07-07 21:05:28 -05:00
committed by GitHub
parent b23da4f15c d766c527c7
commit d55012f8d0
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/Common/Contains.h
View File

@ -5,9 +5,19 @@
#include <algorithm> #include <algorithm>
#include <iterator> #include <iterator>
#include <version>
namespace Common namespace Common
{ {
#if defined(__cpp_lib_ranges_contains) && __cpp_lib_ranges_contains >= 202202L
// Use the standard library functions if available (C++23)
inline constexpr auto& Contains = std::ranges::contains;
inline constexpr auto& ContainsSubrange = std::ranges::contains_subrange;
#else
// TODO C++23: This old implementation likely isn't needed once migrated to C++23. Remove them or
// this file itself. Ad hoc implementations for C++20
struct ContainsFn struct ContainsFn
{ {
template <std::input_iterator I, std::sentinel_for<I> S, class T, class Proj = std::identity> template <std::input_iterator I, std::sentinel_for<I> S, class T, class Proj = std::identity>
@ -54,8 +64,8 @@ struct ContainsSubrangeFn
} }
}; };
// TODO C++23: Replace with std::ranges::contains.
inline constexpr ContainsFn Contains{}; inline constexpr ContainsFn Contains{};
// TODO C++23: Replace with std::ranges::contains_subrange.
inline constexpr ContainsSubrangeFn ContainsSubrange{}; inline constexpr ContainsSubrangeFn ContainsSubrange{};
#endif
} // namespace Common } // namespace Common