Modernize code to C++17 (#3104)

1 files changed, 3 insertions, 6 deletions

diff --git a/src/passes/ReReloop.cpp b/src/passes/ReReloop.cpp
index 0559343d4..4499bb07b 100644
--- a/src/passes/ReReloop.cpp
+++ b/src/passes/ReReloop.cpp
@@ -228,9 +228,8 @@ struct ReReloop final : public Pass {
       for (Index i = 0; i < num; i++) {
         targetValues[targets[i]].insert(i);
       }
-      for (auto& iter : targetValues) {
-        parent.addSwitchBranch(
-          before, parent.getBreakTarget(iter.first), iter.second);
+      for (auto& [name, indices] : targetValues) {
+        parent.addSwitchBranch(before, parent.getBreakTarget(name), indices);
       }
       // the default may be among the targets, in which case, we can't add it
       // simply as it would be a duplicate, so create a temp block
@@ -328,9 +327,7 @@ struct ReReloop final : public Pass {
     std::cout << "rerelooping " << function->name << '\n';
     for (auto* block : relooper->Blocks) {
       std::cout << block << " block:\n" << block->Code << '\n';
-      for (auto& pair : block->BranchesOut) {
-        auto* target = pair.first;
-        auto* branch = pair.second;
+      for (auto& [target, branch] : block->BranchesOut) {
         std::cout << "branch to " << target << "\n";
         if (branch->Condition) {
           std::cout << "  with condition\n" << branch->Condition << '\n';