diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-12-20 02:22:15 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-12-20 02:22:15 +0000 |
| commit | 5b9268f26ac53a74d2c504279fe577d988d5615d (patch) | |
| tree | 5e408834de6e2933211c24bba04b91aacca2a551 /include/clang/Basic/DiagnosticASTKinds.td | |
| parent | 88d158c631c4c08831855f601990f36f2234f975 (diff) | |
Fix code that attempted to produce a diagnostic with one DiagnosticEngine, then
produce a note for that diagnostic either with a different DiagnosticEngine or
after calling DiagnosticEngine::Reset(). That didn't make any sense, and did the
wrong thing if the original diagnostic was suppressed.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@170636 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/clang/Basic/DiagnosticASTKinds.td')
| -rw-r--r-- | include/clang/Basic/DiagnosticASTKinds.td | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/clang/Basic/DiagnosticASTKinds.td b/include/clang/Basic/DiagnosticASTKinds.td index d869c9983b..f3606b8ec4 100644 --- a/include/clang/Basic/DiagnosticASTKinds.td +++ b/include/clang/Basic/DiagnosticASTKinds.td @@ -135,7 +135,8 @@ def err_odr_function_type_inconsistent : Error< "external function %0 declared with incompatible types in different " "translation units (%1 vs. %2)">; def warn_odr_tag_type_inconsistent : Warning< - "type %0 has incompatible definitions in different translation units">; + "type %0 has incompatible definitions in different translation units">, + InGroup<DiagGroup<"odr">>; def note_odr_tag_kind_here: Note< "%0 is a %select{struct|interface|union|class|enum}1 here">; def note_odr_field : Note<"field %0 has type %1 here">; |