]> granicus.if.org Git - clang/commitdiff
Attempt to fix build after r244912
authorBen Langmuir <blangmuir@apple.com>
Thu, 13 Aug 2015 17:30:07 +0000 (17:30 +0000)
committerBen Langmuir <blangmuir@apple.com>
Thu, 13 Aug 2015 17:30:07 +0000 (17:30 +0000)
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

lib/Lex/ModuleMap.cpp

index a1c2d23fa38a88aafc6ba691a45c84ba9a14c7e9..3825ceb0a6c16ab46b317e620b173e1032df17bb 100644 (file)
@@ -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;