From fa0a1f531f7d31ef90419c2ef36bfa0060a73b2c Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Thu, 5 Apr 2012 01:13:04 +0000 Subject: Improve diagnostics for invalid use of non-static members / this: * s/nonstatic/non-static/ in the diagnostics, since the latter form outvoted the former by 28-2 in our diagnostics. * Fix the "use of member in static member function" diagnostic to correctly detect this situation inside a block or lambda. * Produce a more specific "invalid use of non-static member" diagnostic for the case where a nested class member refers to a member of a lexically-surrounding class. llvm-svn: 154073 --- clang/test/CXX/expr/expr.prim/expr.prim.general/p4-0x.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'clang/test/CXX/expr/expr.prim/expr.prim.general/p4-0x.cpp') diff --git a/clang/test/CXX/expr/expr.prim/expr.prim.general/p4-0x.cpp b/clang/test/CXX/expr/expr.prim/expr.prim.general/p4-0x.cpp index b9f0414e917..4e57b74f08a 100644 --- a/clang/test/CXX/expr/expr.prim/expr.prim.general/p4-0x.cpp +++ b/clang/test/CXX/expr/expr.prim/expr.prim.general/p4-0x.cpp @@ -2,9 +2,9 @@ struct S { S *p = this; // ok - decltype(this) q; // expected-error {{invalid use of 'this' outside of a nonstatic member function}} + decltype(this) q; // expected-error {{invalid use of 'this' outside of a non-static member function}} - int arr[sizeof(this)]; // expected-error {{invalid use of 'this' outside of a nonstatic member function}} + int arr[sizeof(this)]; // expected-error {{invalid use of 'this' outside of a non-static member function}} int sz = sizeof(this); // ok }; -- cgit v1.2.3