diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/clang/Basic/DiagnosticSemaKinds.td | 4 | ||||
| -rw-r--r-- | include/clang/Sema/Overload.h | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td index dad311ceb4..2b96e0bef1 100644 --- a/include/clang/Basic/DiagnosticSemaKinds.td +++ b/include/clang/Basic/DiagnosticSemaKinds.td @@ -1594,7 +1594,9 @@ def note_ovl_candidate_bad_conv : Note<"candidate " " not viable: no known conversion from %2 to %3 for " "%select{%ordinal5 argument|object argument}4; " "%select{|dereference the argument with *|" - "take the address of the argument with &}6">; + "take the address of the argument with &|" + "remove *|" + "remove &}6">; def note_ovl_candidate_bad_arc_conv : Note<"candidate " "%select{function|function|constructor|" "function |function |constructor |" diff --git a/include/clang/Sema/Overload.h b/include/clang/Sema/Overload.h index b3948c3de0..4f3d3e8f6f 100644 --- a/include/clang/Sema/Overload.h +++ b/include/clang/Sema/Overload.h @@ -531,7 +531,9 @@ namespace clang { enum OverloadFixItKind { OFIK_Undefined = 0, OFIK_Dereference, - OFIK_TakeAddress + OFIK_TakeAddress, + OFIK_RemoveDereference, + OFIK_RemoveTakeAddress }; /// OverloadCandidate - A single candidate in an overload set (C++ 13.3). @@ -565,7 +567,7 @@ namespace clang { /// The FixIt hints which can be used to fix the Bad candidate. struct FixInfo { /// The list of Hints (all have to be applied). - SmallVector<FixItHint, 4> Hints; + SmallVector<FixItHint, 1> Hints; /// The number of Conversions fixed. This can be different from the size /// of the Hints vector since we allow multiple FixIts per conversion. |