]> granicus.if.org Git - clang/commit
<rdar://problem/12368093> Extend module maps with a 'conflict' declaration, and warn...
authorDouglas Gregor <dgregor@apple.com>
Wed, 20 Mar 2013 21:10:35 +0000 (21:10 +0000)
committerDouglas Gregor <dgregor@apple.com>
Wed, 20 Mar 2013 21:10:35 +0000 (21:10 +0000)
commit906d66acc5cf2679453e10a4f0a67feedd765b21
tree8c31690c89bdf0b16fedd5a2db26c49048824559
parentf8e2c06cea1548c437761cb65cfbf97d50a057a7
<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
25 files changed:
include/clang/Basic/DiagnosticGroups.td
include/clang/Basic/DiagnosticLexKinds.td
include/clang/Basic/DiagnosticSerializationKinds.td
include/clang/Basic/Module.h
include/clang/Frontend/ASTUnit.h
include/clang/Frontend/CompilerInstance.h
include/clang/Lex/ModuleLoader.h
include/clang/Lex/ModuleMap.h
include/clang/Serialization/ASTBitCodes.h
include/clang/Serialization/ASTReader.h
lib/Basic/Module.cpp
lib/Frontend/CompilerInstance.cpp
lib/Lex/ModuleMap.cpp
lib/Sema/Sema.cpp
lib/Sema/SemaDecl.cpp
lib/Serialization/ASTReader.cpp
lib/Serialization/ASTWriter.cpp
test/Modules/Inputs/Conflicts/conflict_a.h [new file with mode: 0644]
test/Modules/Inputs/Conflicts/conflict_b.h [new file with mode: 0644]
test/Modules/Inputs/Conflicts/module.map [new file with mode: 0644]
test/Modules/conflicts.m [new file with mode: 0644]
unittests/Basic/SourceManagerTest.cpp
unittests/Lex/LexerTest.cpp
unittests/Lex/PPCallbacksTest.cpp
unittests/Lex/PPConditionalDirectiveRecordTest.cpp