diff options
| -rw-r--r-- | include/clang/Basic/DiagnosticParseKinds.td | 2 | ||||
| -rw-r--r-- | test/CXX/class/class.mem/p8-0x.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/clang/Basic/DiagnosticParseKinds.td b/include/clang/Basic/DiagnosticParseKinds.td index 29cbf22e93..3da1f5d80e 100644 --- a/include/clang/Basic/DiagnosticParseKinds.td +++ b/include/clang/Basic/DiagnosticParseKinds.td @@ -391,7 +391,7 @@ def warn_deleted_function_accepted_as_extension: ExtWarn< // C++0x override control def err_duplicate_virt_specifier : Error< - "member function already marked '%0'">; + "class member already marked '%0'">; def err_scoped_enum_missing_identifier : Error< "scoped enumeration requires a name">; diff --git a/test/CXX/class/class.mem/p8-0x.cpp b/test/CXX/class/class.mem/p8-0x.cpp index 123cf90d19..db8aeace64 100644 --- a/test/CXX/class/class.mem/p8-0x.cpp +++ b/test/CXX/class/class.mem/p8-0x.cpp @@ -1,8 +1,8 @@ // RUN: %clang_cc1 -fsyntax-only -std=c++0x -verify %s struct A { - virtual void f() new new; // expected-error {{member function already marked 'new'}} - virtual void g() override override; // expected-error {{member function already marked 'override'}} - virtual void h() final final; // expected-error {{member function already marked 'final'}} + virtual void f() new new; // expected-error {{class member already marked 'new'}} + virtual void g() override override; // expected-error {{class member already marked 'override'}} + virtual void h() final final; // expected-error {{class member already marked 'final'}} }; struct B { |