diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2011-01-06 06:29:28 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2011-01-06 06:29:28 +0000 |
| commit | 080afea2621be4c74bfa0fb9ab50e8174d238ba9 (patch) | |
| tree | 19843bb3ad737798f6c78ba2bae020242ad22ef8 | |
| parent | 5858e091a6efc0764db41e8dea81e62b185b7a77 (diff) | |
| download | bcm5719-llvm-080afea2621be4c74bfa0fb9ab50e8174d238ba9.tar.gz bcm5719-llvm-080afea2621be4c74bfa0fb9ab50e8174d238ba9.zip | |
Tweak the wording of this warning further based on a suggestion from Chris.
llvm-svn: 122951
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticSemaKinds.td | 2 | ||||
| -rw-r--r-- | clang/test/SemaCXX/ptrtomember.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index 40422df0cc4..01ea337392b 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -2770,7 +2770,7 @@ def err_not_tag_in_scope : Error< def err_cannot_form_pointer_to_member_of_reference_type : Error< "cannot form a pointer-to-member to member %0 of reference type %1">; def err_invalid_use_of_bound_member_func : Error< - "a bound member function may only be used to call itself">; + "a bound member function may only be called">; def err_incomplete_object_call : Error< "incomplete type in call to object of type %0">; def err_incomplete_pointer_to_member_return : Error< diff --git a/clang/test/SemaCXX/ptrtomember.cpp b/clang/test/SemaCXX/ptrtomember.cpp index f26f13f19cd..1038de9a1d3 100644 --- a/clang/test/SemaCXX/ptrtomember.cpp +++ b/clang/test/SemaCXX/ptrtomember.cpp @@ -22,11 +22,11 @@ struct S3 { }; void f3(S3* p, void (S3::*m)()) { - p->*m; // expected-error {{a bound member function may only be used to call it}} - (void)(p->*m); // expected-error {{a bound member function may only be used to call it}} - (void)(void*)(p->*m); // expected-error {{a bound member function may only be used to call it}} - (void)reinterpret_cast<void*>(p->*m); // expected-error {{a bound member function may only be used to call it}} - if (p->*m) {} // expected-error {{a bound member function may only be used to call it}} + p->*m; // expected-error {{a bound member function may only be called}} + (void)(p->*m); // expected-error {{a bound member function may only be called}} + (void)(void*)(p->*m); // expected-error {{a bound member function may only be called}} + (void)reinterpret_cast<void*>(p->*m); // expected-error {{a bound member function may only be called}} + if (p->*m) {} // expected-error {{a bound member function may only be called}} - p->m; // expected-error {{a bound member function may only be used to call it}} + p->m; // expected-error {{a bound member function may only be called}} } |
