diff options
author | Ben Langmuir <blangmuir@apple.com> | 2015-08-13 17:30:07 +0000 |
---|---|---|
committer | Ben Langmuir <blangmuir@apple.com> | 2015-08-13 17:30:07 +0000 |
commit | 41f81994fe1d93cdd882f8e2a36ca9679110313a (patch) | |
tree | 647c599db65aacd6c6d9f678605c1a30dc672225 /clang/lib | |
parent | 31117875c2888a8b341829bde1812b3989af1df1 (diff) | |
download | bcm5719-llvm-41f81994fe1d93cdd882f8e2a36ca9679110313a.tar.gz bcm5719-llvm-41f81994fe1d93cdd882f8e2a36ca9679110313a.zip |
Attempt to fix build after r244912
Some compilers were less happy about converting a lambda to a comparator
function for array_pod_sort.
llvm-svn: 244917
Diffstat (limited to 'clang/lib')
-rw-r--r-- | clang/lib/Lex/ModuleMap.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/clang/lib/Lex/ModuleMap.cpp b/clang/lib/Lex/ModuleMap.cpp index a1c2d23fa38..3825ceb0a6c 100644 --- a/clang/lib/Lex/ModuleMap.cpp +++ b/clang/lib/Lex/ModuleMap.cpp @@ -1855,6 +1855,11 @@ void ModuleMapParser::parseHeaderDecl(MMToken::TokenKind LeadingToken, } } +static int compareModuleHeaders(const Module::Header *A, + const Module::Header *B) { + return A->NameAsWritten.compare(B->NameAsWritten); +} + /// \brief Parse an umbrella directory declaration. /// /// umbrella-dir-declaration: @@ -1914,10 +1919,8 @@ void ModuleMapParser::parseUmbrellaDirDecl(SourceLocation UmbrellaLoc) { } // Sort header paths so that the pcm doesn't depend on iteration order. - llvm::array_pod_sort(Headers.begin(), Headers.end(), - [](const Module::Header *A, const Module::Header *B) { - return A->NameAsWritten.compare(B->NameAsWritten); - }); + llvm::array_pod_sort(Headers.begin(), Headers.end(), compareModuleHeaders); + for (auto &Header : Headers) Map.addHeader(ActiveModule, std::move(Header), ModuleMap::TextualHeader); return; |