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 /include/clang/Frontend/CompilerInstance.h | |
| parent | f8e2c06cea1548c437761cb65cfbf97d50a057a7 (diff) | |
<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 'include/clang/Frontend/CompilerInstance.h')
| -rw-r--r-- | include/clang/Frontend/CompilerInstance.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/clang/Frontend/CompilerInstance.h b/include/clang/Frontend/CompilerInstance.h index 273fcc1082..0d674629fd 100644 --- a/include/clang/Frontend/CompilerInstance.h +++ b/include/clang/Frontend/CompilerInstance.h @@ -663,7 +663,8 @@ public: virtual void makeModuleVisible(Module *Mod, Module::NameVisibilityKind Visibility, - SourceLocation ImportLoc); + SourceLocation ImportLoc, + bool Complain); }; |