commit 4bb15ab85397f37fba4fd9cba8aed3bd000272ad
author Richard Smith <richard-llvm@metafoo.co.uk> Mon Apr 30 05:26:07 2018 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Mon Apr 30 05:26:07 2018 +0000
tree 1f142e88283e5a765cea78549d85f5191c7612cc
parent b5f8171a1b955e07c13226d353f4ca53f75a0e8a

Fix up after clang r331155.

llvm-svn: 331156

clang-tools-extra/clang-tidy/bugprone/MultipleStatementMacroCheck.cpp

diff --git a/clang-tools-extra/clang-tidy/bugprone/MultipleStatementMacroCheck.cpp b/clang-tools-extra/clang-tidy/bugprone/MultipleStatementMacroCheck.cpp
index 9fa2f43..942c875 100644
--- a/clang-tools-extra/clang-tidy/bugprone/MultipleStatementMacroCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/MultipleStatementMacroCheck.cpp
@@ -38,7 +38,7 @@
   return nextStmt(Result, Parent);
 }
 
-using ExpansionRanges = std::vector<std::pair<SourceLocation, SourceLocation>>;
+using ExpansionRanges = std::vector<SourceRange>;
 
 /// \bried Get all the macro expansion ranges related to `Loc`.
 ///
@@ -47,8 +47,9 @@
                                    const MatchFinder::MatchResult &Result) {
   ExpansionRanges Locs;
   while (Loc.isMacroID()) {
-    Locs.push_back(Result.SourceManager->getImmediateExpansionRange(Loc));
-    Loc = Locs.back().first;
+    Locs.push_back(
+        Result.SourceManager->getImmediateExpansionRange(Loc).getAsRange());
+    Loc = Locs.back().getBegin();
   }
   return Locs;
 }
@@ -96,9 +97,9 @@
       InnerRanges.back() != NextRanges.back())
     return;
 
-  diag(InnerRanges.back().first, "multiple statement macro used without "
-                                 "braces; some statements will be "
-                                 "unconditionally executed");
+  diag(InnerRanges.back().getBegin(), "multiple statement macro used without "
+                                      "braces; some statements will be "
+                                      "unconditionally executed");
 }
 
 } // namespace bugprone