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/Serialization/ASTBitCodes.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/Serialization/ASTBitCodes.h')
| -rw-r--r-- | include/clang/Serialization/ASTBitCodes.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/clang/Serialization/ASTBitCodes.h b/include/clang/Serialization/ASTBitCodes.h index 2669d8e6d7..85f88ad007 100644 --- a/include/clang/Serialization/ASTBitCodes.h +++ b/include/clang/Serialization/ASTBitCodes.h @@ -611,7 +611,9 @@ namespace clang { /// \brief Specifies a library or framework to link against. SUBMODULE_LINK_LIBRARY = 10, /// \brief Specifies a configuration macro for this module. - SUBMODULE_CONFIG_MACRO = 11 + SUBMODULE_CONFIG_MACRO = 11, + /// \brief Specifies a conflict with another module. + SUBMODULE_CONFLICT = 12 }; /// \brief Record types used within a comments block. |