From 8b9f92a0af0f467ffa0bde5f4e6239e57fbd4b5e Mon Sep 17 00:00:00 2001 From: mitaclaw <140017135+mitaclaw@users.noreply.github.com> Date: Sun, 29 Sep 2024 11:19:33 -0700 Subject: Modernize `std::sort` with ranges and projections In PPCTables.cpp, the code is currently unused so I was unable to test it. In CustomPipeline.cpp, a pointer to member function cannot be used due to 16.4.5.2.1 of the C++ Standard regarding "addressable functions". https://eel.is/c++draft/namespace.std#6 In Fs.cpp and DirectoryBlob.cpp, these examples used projections in a previous iteration of this commit, but no longer do. Still, they remain in this commit because the PR they would actually belong to is already merged. --- Source/Core/DiscIO/VolumeVerifier.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Source/Core/DiscIO/VolumeVerifier.cpp') diff --git a/Source/Core/DiscIO/VolumeVerifier.cpp b/Source/Core/DiscIO/VolumeVerifier.cpp index 18ef37102e..dc67760ce2 100644 --- a/Source/Core/DiscIO/VolumeVerifier.cpp +++ b/Source/Core/DiscIO/VolumeVerifier.cpp @@ -1053,8 +1053,7 @@ void VolumeVerifier::SetUpHashing() m_scrubber.SetupScrub(m_volume); } - std::sort(m_groups.begin(), m_groups.end(), - [](const GroupToVerify& a, const GroupToVerify& b) { return a.offset < b.offset; }); + std::ranges::sort(m_groups, {}, &GroupToVerify::offset); if (m_hashes_to_calculate.crc32) m_crc32_context = Common::StartCRC32(); -- cgit v1.2.3