From 728663bdc03dfe20343c45ff36f5fb080b49ffec Mon Sep 17 00:00:00 2001 From: mitaclaw <140017135+mitaclaw@users.noreply.github.com> Date: Sat, 28 Sep 2024 22:30:41 -0700 Subject: Modernize `std::binary_search` with ranges In VolumeVerifier.cpp, constructing a `std::string_view` of the volume's GameID is unnecessary, as `std::`(`ranges::`)`binary_search` supports heterogeneous lookup. The usage in GameFile.cpp is a perfect example. --- Source/Core/DiscIO/VolumeVerifier.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'Source/Core/DiscIO/VolumeVerifier.cpp') diff --git a/Source/Core/DiscIO/VolumeVerifier.cpp b/Source/Core/DiscIO/VolumeVerifier.cpp index 5a4a9c6856..8e31eff4eb 100644 --- a/Source/Core/DiscIO/VolumeVerifier.cpp +++ b/Source/Core/DiscIO/VolumeVerifier.cpp @@ -722,8 +722,7 @@ bool VolumeVerifier::ShouldHaveChannelPartition() const }; static_assert(std::ranges::is_sorted(channel_discs)); - return std::binary_search(channel_discs.cbegin(), channel_discs.cend(), - std::string_view(m_volume.GetGameID())); + return std::ranges::binary_search(channel_discs, m_volume.GetGameID()); } bool VolumeVerifier::ShouldHaveInstallPartition() const @@ -755,8 +754,7 @@ bool VolumeVerifier::ShouldBeDualLayer() const }; static_assert(std::ranges::is_sorted(dual_layer_discs)); - return std::binary_search(dual_layer_discs.cbegin(), dual_layer_discs.cend(), - std::string_view(m_volume.GetGameID())); + return std::ranges::binary_search(dual_layer_discs, m_volume.GetGameID()); } void VolumeVerifier::CheckVolumeSize() -- cgit v1.2.3