From f888b24b827087a9d8522c269a0de5c88c6bea0d Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Sun, 30 Jun 2019 11:19:56 +0000 Subject: [PATCH] Cleanup: llvm::bsearch -> llvm::partition_point after r364719 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@364720 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Tooling/Syntax/Tokens.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Tooling/Syntax/Tokens.cpp b/lib/Tooling/Syntax/Tokens.cpp index 1828d3d3e1..b42d5a2ca6 100644 --- a/lib/Tooling/Syntax/Tokens.cpp +++ b/lib/Tooling/Syntax/Tokens.cpp @@ -127,8 +127,8 @@ TokenBuffer::spelledForExpandedToken(const syntax::Token *Expanded) const { unsigned ExpandedIndex = Expanded - ExpandedTokens.data(); // Find the first mapping that produced tokens after \p Expanded. - auto It = llvm::bsearch(File.Mappings, [&](const Mapping &M) { - return ExpandedIndex < M.BeginExpanded; + auto It = llvm::partition_point(File.Mappings, [&](const Mapping &M) { + return M.BeginExpanded <= ExpandedIndex; }); // Our token could only be produced by the previous mapping. if (It == File.Mappings.begin()) { @@ -212,8 +212,8 @@ TokenBuffer::expansionStartingAt(const syntax::Token *Spelled) const { Spelled < (File.SpelledTokens.data() + File.SpelledTokens.size())); unsigned SpelledIndex = Spelled - File.SpelledTokens.data(); - auto M = llvm::bsearch(File.Mappings, [&](const Mapping &M) { - return SpelledIndex <= M.BeginSpelled; + auto M = llvm::partition_point(File.Mappings, [&](const Mapping &M) { + return M.BeginSpelled < SpelledIndex; }); if (M == File.Mappings.end() || M->BeginSpelled != SpelledIndex) return llvm::None; -- 2.40.0