From bf6948c1d42ddd7487c41d63d02c10052aaac054 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 27 May 2019 10:28:45 -0400 Subject: [PATCH] DiscIO/VolumeVerifier: Use structured bindings where applicable Allows providing better names than "first" or "second". --- Source/Core/DiscIO/VolumeVerifier.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Source/Core/DiscIO/VolumeVerifier.cpp b/Source/Core/DiscIO/VolumeVerifier.cpp index 5b2b549e6a..e7d325d918 100644 --- a/Source/Core/DiscIO/VolumeVerifier.cpp +++ b/Source/Core/DiscIO/VolumeVerifier.cpp @@ -816,26 +816,26 @@ void VolumeVerifier::Finish() } } - for (auto pair : m_block_errors) + for (auto [partition, blocks] : m_block_errors) { - if (pair.second > 0) + if (blocks > 0) { - const std::string name = GetPartitionName(m_volume.GetPartitionType(pair.first)); + const std::string name = GetPartitionName(m_volume.GetPartitionType(partition)); std::string text = StringFromFormat( - GetStringT("Errors were found in %zu blocks in the %s partition.").c_str(), pair.second, + GetStringT("Errors were found in %zu blocks in the %s partition.").c_str(), blocks, name.c_str()); AddProblem(Severity::Medium, std::move(text)); } } - for (auto pair : m_unused_block_errors) + for (auto [partition, blocks] : m_unused_block_errors) { - if (pair.second > 0) + if (blocks > 0) { - const std::string name = GetPartitionName(m_volume.GetPartitionType(pair.first)); + const std::string name = GetPartitionName(m_volume.GetPartitionType(partition)); std::string text = StringFromFormat( - GetStringT("Errors were found in %zu unused blocks in the %s partition.").c_str(), - pair.second, name.c_str()); + GetStringT("Errors were found in %zu unused blocks in the %s partition.").c_str(), blocks, + name.c_str()); AddProblem(Severity::Low, std::move(text)); } }