diff --git a/clang-tools-extra/clang-cast/Matcher.h b/clang-tools-extra/clang-cast/Matcher.h
--- a/clang-tools-extra/clang-cast/Matcher.h
+++ b/clang-tools-extra/clang-cast/Matcher.h
@@ -169,7 +169,9 @@
 // TODO: Is this okay to do?
 Matcher::~Matcher() {
   if (PublishSummary) {
-    for (auto const &[CXXCastKind, Freq] : Statistics) {
+    for (const auto &Pair : Statistics) {
+      const auto &CXXCastKind = Pair.first;
+      const auto &Freq = Pair.second;
       if (!Freq)
         continue;
       llvm::errs() << "The type " << cppCastToString(CXXCastKind)