diff options
| author | Douglas Gregor <dgregor@apple.com> | 2013-03-20 21:10:35 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2013-03-20 21:10:35 +0000 |
| commit | 906d66acc5cf2679453e10a4f0a67feedd765b21 (patch) | |
| tree | 8c31690c89bdf0b16fedd5a2db26c49048824559 /unittests/Lex | |
| parent | f8e2c06cea1548c437761cb65cfbf97d50a057a7 (diff) | |
| download | clang-906d66acc5cf2679453e10a4f0a67feedd765b21.tar.gz clang-906d66acc5cf2679453e10a4f0a67feedd765b21.tar.bz2 clang-906d66acc5cf2679453e10a4f0a67feedd765b21.tar.xz | |
<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
Diffstat (limited to 'unittests/Lex')
| -rw-r--r-- | unittests/Lex/LexerTest.cpp | 3 | ||||
| -rw-r--r-- | unittests/Lex/PPCallbacksTest.cpp | 3 | ||||
| -rw-r--r-- | unittests/Lex/PPConditionalDirectiveRecordTest.cpp | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/unittests/Lex/LexerTest.cpp b/unittests/Lex/LexerTest.cpp index 505be75ab4..c9b1840e1c 100644 --- a/unittests/Lex/LexerTest.cpp +++ b/unittests/Lex/LexerTest.cpp @@ -62,7 +62,8 @@ class VoidModuleLoader : public ModuleLoader { virtual void makeModuleVisible(Module *Mod, Module::NameVisibilityKind Visibility, - SourceLocation ImportLoc) { } + SourceLocation ImportLoc, + bool Complain) { } }; TEST_F(LexerTest, LexAPI) { diff --git a/unittests/Lex/PPCallbacksTest.cpp b/unittests/Lex/PPCallbacksTest.cpp index 13104cbc03..36bd5f9395 100644 --- a/unittests/Lex/PPCallbacksTest.cpp +++ b/unittests/Lex/PPCallbacksTest.cpp @@ -39,7 +39,8 @@ class VoidModuleLoader : public ModuleLoader { virtual void makeModuleVisible(Module *Mod, Module::NameVisibilityKind Visibility, - SourceLocation ImportLoc) { } + SourceLocation ImportLoc, + bool Complain) { } }; // Stub to collect data from InclusionDirective callbacks. diff --git a/unittests/Lex/PPConditionalDirectiveRecordTest.cpp b/unittests/Lex/PPConditionalDirectiveRecordTest.cpp index 856a8ff26d..082eced2d8 100644 --- a/unittests/Lex/PPConditionalDirectiveRecordTest.cpp +++ b/unittests/Lex/PPConditionalDirectiveRecordTest.cpp @@ -62,7 +62,8 @@ class VoidModuleLoader : public ModuleLoader { virtual void makeModuleVisible(Module *Mod, Module::NameVisibilityKind Visibility, - SourceLocation ImportLoc) { } + SourceLocation ImportLoc, + bool Complain) { } }; TEST_F(PPConditionalDirectiveRecordTest, PPRecAPI) { |