aboutsummaryrefslogtreecommitdiff
path: root/clang/lib/Edit/EditedSource.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'clang/lib/Edit/EditedSource.cpp')
-rw-r--r--clang/lib/Edit/EditedSource.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/Edit/EditedSource.cpp b/clang/lib/Edit/EditedSource.cpp
index 74e6005faeb0..ee57660b8c72 100644
--- a/clang/lib/Edit/EditedSource.cpp
+++ b/clang/lib/Edit/EditedSource.cpp
@@ -60,7 +60,7 @@ void EditedSource::finishedCommit() {
MacroArgUse ArgUse;
std::tie(ExpLoc, ArgUse) = ExpArg;
auto &ArgUses = ExpansionToArgMap[ExpLoc];
- if (llvm::find(ArgUses, ArgUse) == ArgUses.end())
+ if (!llvm::is_contained(ArgUses, ArgUse))
ArgUses.push_back(ArgUse);
}
CurrCommitMacroArgExps.clear();
@@ -314,8 +314,8 @@ bool EditedSource::commit(const Commit &commit) {
static bool canBeJoined(char left, char right, const LangOptions &LangOpts) {
// FIXME: Should use TokenConcatenation to make sure we don't allow stuff like
// making two '<' adjacent.
- return !(Lexer::isIdentifierBodyChar(left, LangOpts) &&
- Lexer::isIdentifierBodyChar(right, LangOpts));
+ return !(Lexer::isAsciiIdentifierContinueChar(left, LangOpts) &&
+ Lexer::isAsciiIdentifierContinueChar(right, LangOpts));
}
/// Returns true if it is ok to eliminate the trailing whitespace between