Author: Sam McCall Date: 2020-07-01T11:28:25+02:00 New Revision: 7dcc3858e72666dc12240c8a4bd278775cd807ea
URL: https://github.com/llvm/llvm-project/commit/7dcc3858e72666dc12240c8a4bd278775cd807ea DIFF: https://github.com/llvm/llvm-project/commit/7dcc3858e72666dc12240c8a4bd278775cd807ea.diff LOG: [clangd] Fix name conflict again, unbreak GCC. NFC Added: Modified: clang-tools-extra/clangd/unittests/ConfigTesting.h Removed: ################################################################################ diff --git a/clang-tools-extra/clangd/unittests/ConfigTesting.h b/clang-tools-extra/clangd/unittests/ConfigTesting.h index fd0ecf53f360..5541c6fffe59 100644 --- a/clang-tools-extra/clangd/unittests/ConfigTesting.h +++ b/clang-tools-extra/clangd/unittests/ConfigTesting.h @@ -32,10 +32,10 @@ struct CapturedDiags { Out.Pos.character = D.getColumnNo(); // Zero-based - bug in SourceMgr? if (!D.getRanges().empty()) { const auto &R = D.getRanges().front(); - Out.Range.emplace(); - Out.Range->start.line = Out.Range->end.line = Out.Pos.line; - Out.Range->start.character = R.first; - Out.Range->end.character = R.second; + Out.Rng.emplace(); + Out.Rng->start.line = Out.Rng->end.line = Out.Pos.line; + Out.Rng->start.character = R.first; + Out.Rng->end.character = R.second; } }; } @@ -43,7 +43,7 @@ struct CapturedDiags { std::string Message; llvm::SourceMgr::DiagKind Kind; Position Pos; - llvm::Optional<Range> Range; + llvm::Optional<Range> Rng; friend void PrintTo(const Diag &D, std::ostream *OS) { *OS << (D.Kind == llvm::SourceMgr::DK_Error ? "error: " : "warning: ") @@ -56,7 +56,7 @@ struct CapturedDiags { MATCHER_P(DiagMessage, M, "") { return arg.Message == M; } MATCHER_P(DiagKind, K, "") { return arg.Kind == K; } MATCHER_P(DiagPos, P, "") { return arg.Pos == P; } -MATCHER_P(DiagRange, R, "") { return arg.Range == R; } +MATCHER_P(DiagRange, R, "") { return arg.Rng == R; } inline Position toPosition(llvm::SMLoc L, const llvm::SourceMgr &SM) { auto LineCol = SM.getLineAndColumn(L); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
