|
@@ -2506,7 +2506,7 @@ void ASTWriter::WritePreprocessor(const Preprocessor &PP, bool IsModule) {
|
|
|
MacroIdentifiers.push_back(Id.second);
|
|
|
// Sort the set of macro definitions that need to be serialized by the
|
|
|
// name of the macro, to provide a stable ordering.
|
|
|
- llvm::sort(MacroIdentifiers, llvm::less_ptr<IdentifierInfo>());
|
|
|
+ llvm::sort(MacroIdentifiers, llvm::deref<std::less<>>());
|
|
|
|
|
|
// Emit the macro directives as a list and associate the offset with the
|
|
|
// identifier they belong to.
|
|
@@ -3748,7 +3748,7 @@ void ASTWriter::WriteIdentifierTable(Preprocessor &PP,
|
|
|
IIs.push_back(ID.second);
|
|
|
// Sort the identifiers lexicographically before getting them references so
|
|
|
// that their order is stable.
|
|
|
- llvm::sort(IIs, llvm::less_ptr<IdentifierInfo>());
|
|
|
+ llvm::sort(IIs, llvm::deref<std::less<>>());
|
|
|
for (const IdentifierInfo *II : IIs)
|
|
|
if (Trait.isInterestingNonMacroIdentifier(II))
|
|
|
getIdentifierRef(II);
|
|
@@ -4924,7 +4924,7 @@ ASTFileSignature ASTWriter::WriteASTCore(Sema &SemaRef, StringRef isysroot,
|
|
|
IIs.push_back(II);
|
|
|
}
|
|
|
// Sort the identifiers to visit based on their name.
|
|
|
- llvm::sort(IIs, llvm::less_ptr<IdentifierInfo>());
|
|
|
+ llvm::sort(IIs, llvm::deref<std::less<>>());
|
|
|
for (const IdentifierInfo *II : IIs) {
|
|
|
for (IdentifierResolver::iterator D = SemaRef.IdResolver.begin(II),
|
|
|
DEnd = SemaRef.IdResolver.end();
|