From: Ben Langmuir <blangmuir@apple.com>
Date: Thu, 13 Aug 2015 17:30:07 +0000 (+0000)
Subject: Attempt to fix build after r244912
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=25d834e010e5372740e7338df76150b3a070e7dc;p=clang

Attempt to fix build after r244912

Some compilers were less happy about converting a lambda to a comparator
function for array_pod_sort.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@244917 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Lex/ModuleMap.cpp b/lib/Lex/ModuleMap.cpp
index a1c2d23fa3..3825ceb0a6 100644
--- a/lib/Lex/ModuleMap.cpp
+++ b/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;