diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2018-04-30 05:26:07 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2018-04-30 05:26:07 +0000 |
| commit | 94edcc63822dd231e97bc48e2177c24593ac8e61 (patch) | |
| tree | 86dee75c1f48d3fb1e9ff8fd1897fe1e239412cb /clang-tidy/bugprone | |
| parent | aa3548e35fb8c3700fcd2c6a22e9200e58237773 (diff) | |
Fix up after clang r331155.
git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@331156 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'clang-tidy/bugprone')
| -rw-r--r-- | clang-tidy/bugprone/LambdaFunctionNameCheck.cpp | 2 | ||||
| -rw-r--r-- | clang-tidy/bugprone/MultipleStatementMacroCheck.cpp | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/clang-tidy/bugprone/LambdaFunctionNameCheck.cpp b/clang-tidy/bugprone/LambdaFunctionNameCheck.cpp index 60eb245c..55dbe8bf 100644 --- a/clang-tidy/bugprone/LambdaFunctionNameCheck.cpp +++ b/clang-tidy/bugprone/LambdaFunctionNameCheck.cpp @@ -81,7 +81,7 @@ void LambdaFunctionNameCheck::check(const MatchFinder::MatchResult &Result) { if (E->getLocation().isMacroID()) { auto ER = Result.SourceManager->getImmediateExpansionRange(E->getLocation()); - if (SuppressMacroExpansions.find(SourceRange(ER.first, ER.second)) != + if (SuppressMacroExpansions.find(ER.getAsRange()) != SuppressMacroExpansions.end()) { // This is a macro expansion for which we should not warn. return; diff --git a/clang-tidy/bugprone/MultipleStatementMacroCheck.cpp b/clang-tidy/bugprone/MultipleStatementMacroCheck.cpp index 9fa2f43c..942c8752 100644 --- a/clang-tidy/bugprone/MultipleStatementMacroCheck.cpp +++ b/clang-tidy/bugprone/MultipleStatementMacroCheck.cpp @@ -38,7 +38,7 @@ const Stmt *nextStmt(const MatchFinder::MatchResult &Result, const Stmt *S) { 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 @@ ExpansionRanges getExpansionRanges(SourceLocation Loc, 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 @@ void MultipleStatementMacroCheck::check( 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 |