From de3ef502a97c428236427d6583384bb7c85a81fc Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Wed, 30 Nov 2011 23:21:26 +0000 Subject: Promote ModuleMap::Module to a namespace-scope class in the Basic library, since modules cut across all of the libraries. Rename serialization::Module to serialization::ModuleFile to side-step the annoying naming conflict. Prune a bunch of ModuleMap.h includes that are no longer needed (most files only needed the Module type). llvm-svn: 145538 --- clang/lib/Sema/SemaDecl.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'clang/lib/Sema') diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index 0659a0f6f3a..48f4c4f0cba 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -9892,12 +9892,12 @@ Decl *Sema::ActOnFileScopeAsmDecl(Expr *expr, } DeclResult Sema::ActOnModuleImport(SourceLocation ImportLoc, ModuleIdPath Path) { - ModuleKey Module = PP.getModuleLoader().loadModule(ImportLoc, Path); - if (!Module) + Module *Mod = PP.getModuleLoader().loadModule(ImportLoc, Path); + if (!Mod) return true; // FIXME: Actually create a declaration to describe the module import. - (void)Module; + (void)Mod; return DeclResult((Decl *)0); } -- cgit v1.2.3