diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-01-22 16:52:41 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-01-22 16:52:41 +0000 |
| commit | 5df539a1004bc4db5c38b33ba3e219595a10ae3c (patch) | |
| tree | 8f7162c2eeb96f9bef560b568c3a039187a31953 /include | |
| parent | d2e0a8dd949ab874c6d66f97106bd5c270e2fa7d (diff) | |
| download | src-5df539a1004bc4db5c38b33ba3e219595a10ae3c.tar.gz src-5df539a1004bc4db5c38b33ba3e219595a10ae3c.zip | |
Vendor import of clang release_40 branch r292732:vendor/clang/clang-release_40-r292732
Notes
Notes:
svn path=/vendor/clang/dist/; revision=312627
svn path=/vendor/clang/clang-release_40-r292732/; revision=312628; tag=vendor/clang/clang-release_40-r292732
Diffstat (limited to 'include')
| -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 3971cf60d5e0..2d74eecc276e 100644 --- a/include/clang/Basic/DiagnosticSemaKinds.td +++ b/include/clang/Basic/DiagnosticSemaKinds.td @@ -3337,8 +3337,8 @@ def note_ovl_candidate : Note<"candidate " def note_ovl_candidate_inherited_constructor : Note< "constructor from base class %0 inherited here">; def note_ovl_candidate_inherited_constructor_slice : Note< - "constructor inherited from base class cannot be used to initialize from " - "an argument of the derived class type">; + "candidate %select{constructor|template}0 ignored: " + "inherited constructor cannot be used to %select{copy|move}1 object">; def note_ovl_candidate_illegal_constructor : Note< "candidate %select{constructor|template}0 ignored: " "instantiation %select{takes|would take}0 its own class type by value">; |