From: Chandler Carruth <chandlerc@gmail.com>
Date: Thu, 6 Jan 2011 06:29:28 +0000 (+0000)
Subject: Tweak the wording of this warning further based on a suggestion from Chris.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=914c9a61b7ef96ed259a464f20e51d166b5f68b0;p=clang

Tweak the wording of this warning further based on a suggestion from Chris.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@122951 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td
index 40422df0cc..01ea337392 100644
--- a/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/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/test/SemaCXX/ptrtomember.cpp b/test/SemaCXX/ptrtomember.cpp
index f26f13f19c..1038de9a1d 100644
--- a/test/SemaCXX/ptrtomember.cpp
+++ b/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}}
 }