summaryrefslogtreecommitdiffstats
path: root/clang/unittests/Basic/SourceManagerTest.cpp
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2013-03-20 21:10:35 +0000
committerDouglas Gregor <dgregor@apple.com>2013-03-20 21:10:35 +0000
commitfb9126578ec3b320272da281ce60aa7cd11e8a06 (patch)
tree80741c94fb3866a65a264e1eaab661861bb0b165 /clang/unittests/Basic/SourceManagerTest.cpp
parentf83a664a4074ef5b15a209d6c9fa17253bff7681 (diff)
downloadbcm5719-llvm-fb9126578ec3b320272da281ce60aa7cd11e8a06.tar.gz
bcm5719-llvm-fb9126578ec3b320272da281ce60aa7cd11e8a06.zip
<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
Diffstat (limited to 'clang/unittests/Basic/SourceManagerTest.cpp')
-rw-r--r--clang/unittests/Basic/SourceManagerTest.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/unittests/Basic/SourceManagerTest.cpp b/clang/unittests/Basic/SourceManagerTest.cpp
index 130ea0a5a87..3f09cbb0f9e 100644
--- a/clang/unittests/Basic/SourceManagerTest.cpp
+++ b/clang/unittests/Basic/SourceManagerTest.cpp
@@ -61,7 +61,8 @@ class VoidModuleLoader : public ModuleLoader {
virtual void makeModuleVisible(Module *Mod,
Module::NameVisibilityKind Visibility,
- SourceLocation ImportLoc) { }
+ SourceLocation ImportLoc,
+ bool Complain) { }
};
TEST_F(SourceManagerTest, isBeforeInTranslationUnit) {
OpenPOWER on IntegriCloud