diff options
| author | Richard Trieu <rtrieu@google.com> | 2011-12-13 23:19:45 +0000 |
|---|---|---|
| committer | Richard Trieu <rtrieu@google.com> | 2011-12-13 23:19:45 +0000 |
| commit | a6dc7eff27a8c59bee42809270971931b811dd44 (patch) | |
| tree | c3d74da244ec16825dd5e2f21f278443cac8b0a7 /include/clang | |
| parent | 7209646add692c50503435bcffb13187a3349552 (diff) | |
Make the diagnostic message more consistant. Update the type comparison to
handle non-pointer types. This is for the extra info printed when function
types are compared.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@146525 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/clang')
| -rw-r--r-- | include/clang/Basic/DiagnosticSemaKinds.td | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td index 941944c8a4..84be9a269c 100644 --- a/include/clang/Basic/DiagnosticSemaKinds.td +++ b/include/clang/Basic/DiagnosticSemaKinds.td @@ -1023,7 +1023,7 @@ def err_init_conversion_failed : Error< "%select{rvalue|lvalue}2 of type %3" "%select{|: different classes (%5 vs %6)" "|: different number of parameters (%5 vs %6)" - "|: type mismatch in %ordinal5 parameter (%6 vs %7)" + "|: type mismatch at %ordinal5 parameter (%6 vs %7)" "|: different return type (%5 vs %6)" "|: different qualifiers (" "%select{none|const|restrict|const and restrict|volatile|const and volatile|" @@ -1855,7 +1855,7 @@ def note_ovl_candidate : Note<"candidate " "is an inherited constructor}0%1" "%select{| has different class (expected %3 but has %4)" "| has different number of parameters (expected %3 but has %4)" - "| has type mismatch in %ordinal3 parameter (expected %4 but has %5)" + "| has type mismatch at %ordinal3 parameter (expected %4 but has %5)" "| has different return type (%3 expected but has %4)" "| has different qualifiers (expected " "%select{none|const|restrict|const and restrict|volatile|const and volatile" |