diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-04-05 01:13:04 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-04-05 01:13:04 +0000 |
| commit | fa0a1f531f7d31ef90419c2ef36bfa0060a73b2c (patch) | |
| tree | d9dfcbd3d451555be70266b0ac5796ae128edd83 /clang/test/CXX/expr/expr.prim/expr.prim.general/p12-0x.cpp | |
| parent | 3cbdeba61aa2c231cb285be03f81534fa699033c (diff) | |
| download | bcm5719-llvm-fa0a1f531f7d31ef90419c2ef36bfa0060a73b2c.tar.gz bcm5719-llvm-fa0a1f531f7d31ef90419c2ef36bfa0060a73b2c.zip | |
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
Diffstat (limited to 'clang/test/CXX/expr/expr.prim/expr.prim.general/p12-0x.cpp')
| -rw-r--r-- | clang/test/CXX/expr/expr.prim/expr.prim.general/p12-0x.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/test/CXX/expr/expr.prim/expr.prim.general/p12-0x.cpp b/clang/test/CXX/expr/expr.prim/expr.prim.general/p12-0x.cpp index 606300b1b2f..249c9764608 100644 --- a/clang/test/CXX/expr/expr.prim/expr.prim.general/p12-0x.cpp +++ b/clang/test/CXX/expr/expr.prim/expr.prim.general/p12-0x.cpp @@ -26,7 +26,7 @@ namespace std { } class Poly { virtual ~Poly(); }; const std::type_info& k = typeid(S::m); -const std::type_info& m = typeid(*(Poly*)S::m); // expected-error {{invalid use of nonstatic data member}} +const std::type_info& m = typeid(*(Poly*)S::m); // expected-error {{invalid use of non-static data member}} const std::type_info& n = typeid(*(Poly*)(0*sizeof S::m)); namespace PR11956 { |
