From 1fb5c3a63a88e4758b196f1bda64eecce9b29d3f Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Sat, 31 Dec 2011 04:05:44 +0000 Subject: Implement support for module requirements, which indicate the language features needed for a particular module to be available. This allows mixed-language modules, where certain headers only work under some language variants (e.g., in C++, std.tuple might only be available in C++11 mode). llvm-svn: 147387 --- clang/lib/Lex/HeaderSearch.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'clang/lib/Lex/HeaderSearch.cpp') diff --git a/clang/lib/Lex/HeaderSearch.cpp b/clang/lib/Lex/HeaderSearch.cpp index 8a73fb95658..070daa0cd12 100644 --- a/clang/lib/Lex/HeaderSearch.cpp +++ b/clang/lib/Lex/HeaderSearch.cpp @@ -38,9 +38,10 @@ HeaderFileInfo::getControllingMacro(ExternalIdentifierLookup *External) { ExternalHeaderFileInfoSource::~ExternalHeaderFileInfoSource() {} -HeaderSearch::HeaderSearch(FileManager &FM, DiagnosticsEngine &Diags) +HeaderSearch::HeaderSearch(FileManager &FM, DiagnosticsEngine &Diags, + const LangOptions &LangOpts) : FileMgr(FM), Diags(Diags), FrameworkMap(64), - ModMap(FileMgr, *Diags.getClient()) + ModMap(FileMgr, *Diags.getClient(), LangOpts) { AngledDirIdx = 0; SystemDirIdx = 0; @@ -803,8 +804,8 @@ bool HeaderSearch::hasModuleMap(StringRef FileName, } Module *HeaderSearch::findModuleForHeader(const FileEntry *File) { - if (Module *Module = ModMap.findModuleForHeader(File)) - return Module; + if (Module *Mod = ModMap.findModuleForHeader(File)) + return Mod; return 0; } -- cgit v1.2.3