commit fb9126578ec3b320272da281ce60aa7cd11e8a06
author Douglas Gregor <dgregor@apple.com> Wed Mar 20 21:10:35 2013 +0000
committer Douglas Gregor <dgregor@apple.com> Wed Mar 20 21:10:35 2013 +0000
tree 80741c94fb3866a65a264e1eaab661861bb0b165
parent f83a664a4074ef5b15a209d6c9fa17253bff7681

<rdar://problem/12368093> Extend module maps with a 'conflict' declaration, and warn when a newly-imported module conflicts with an already-imported module.

llvm-svn: 177577

clang/lib/Sema/SemaDecl.cpp

diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index 1cffce0..d046f64 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -11826,7 +11826,8 @@
   Consumer.HandleImplicitImportDecl(ImportD);
 
   // Make the module visible.
-  PP.getModuleLoader().makeModuleVisible(Mod, Module::AllVisible, Loc);
+  PP.getModuleLoader().makeModuleVisible(Mod, Module::AllVisible, Loc,
+                                         /*Complain=*/false);
 }
 
 void Sema::ActOnPragmaRedefineExtname(IdentifierInfo* Name,