diff options
Diffstat (limited to 'clang-tools-extra/clang-tidy')
4 files changed, 11 insertions, 10 deletions
diff --git a/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp b/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp index 1939a36ac77..d3c1754fceb 100644 --- a/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp +++ b/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp @@ -374,7 +374,7 @@ static bool LineIsMarkedWithNOLINTinMacro(SourceManager &SM, SourceLocation Loc, return true; if (!Loc.isMacroID()) return false; - Loc = SM.getImmediateExpansionRange(Loc).first; + Loc = SM.getImmediateExpansionRange(Loc).getBegin(); } return false; } diff --git a/clang-tools-extra/clang-tidy/bugprone/LambdaFunctionNameCheck.cpp b/clang-tools-extra/clang-tidy/bugprone/LambdaFunctionNameCheck.cpp index 60eb245c65d..55dbe8bf3e5 100644 --- a/clang-tools-extra/clang-tidy/bugprone/LambdaFunctionNameCheck.cpp +++ b/clang-tools-extra/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-tools-extra/clang-tidy/bugprone/MultipleStatementMacroCheck.cpp b/clang-tools-extra/clang-tidy/bugprone/MultipleStatementMacroCheck.cpp index 9fa2f43c1f7..942c8752f35 100644 --- a/clang-tools-extra/clang-tidy/bugprone/MultipleStatementMacroCheck.cpp +++ b/clang-tools-extra/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 diff --git a/clang-tools-extra/clang-tidy/modernize/UseNullptrCheck.cpp b/clang-tools-extra/clang-tidy/modernize/UseNullptrCheck.cpp index 3d872ce6aa4..476c549e2a4 100644 --- a/clang-tools-extra/clang-tidy/modernize/UseNullptrCheck.cpp +++ b/clang-tools-extra/clang-tidy/modernize/UseNullptrCheck.cpp @@ -332,7 +332,7 @@ private: NullMacros.end(); } - MacroLoc = SM.getExpansionRange(ArgLoc).first; + MacroLoc = SM.getExpansionRange(ArgLoc).getBegin(); ArgLoc = Expansion.getSpellingLoc().getLocWithOffset(LocInfo.second); if (ArgLoc.isFileID()) @@ -387,7 +387,7 @@ private: continue; } - MacroLoc = SM.getImmediateExpansionRange(Loc).first; + MacroLoc = SM.getImmediateExpansionRange(Loc).getBegin(); if (MacroLoc.isFileID() && MacroLoc == TestMacroLoc) { // Match made. return true; |
