commit 906d66acc5cf2679453e10a4f0a67feedd765b21
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 8c31690c89bdf0b16fedd5a2db26c49048824559
parent f8e2c06cea1548c437761cb65cfbf97d50a057a7

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


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

unittests/Basic/SourceManagerTest.cpp

diff --git a/unittests/Basic/SourceManagerTest.cpp b/unittests/Basic/SourceManagerTest.cpp
index 130ea0a..3f09cbb 100644
--- a/unittests/Basic/SourceManagerTest.cpp
+++ b/unittests/Basic/SourceManagerTest.cpp
@@ -61,7 +61,8 @@
 
   virtual void makeModuleVisible(Module *Mod,
                                  Module::NameVisibilityKind Visibility,
-                                 SourceLocation ImportLoc) { }
+                                 SourceLocation ImportLoc,
+                                 bool Complain) { }
 };
 
 TEST_F(SourceManagerTest, isBeforeInTranslationUnit) {