Change the parser error to reflect that virt-specifiers are allowed on any class...

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

diff --git a/include/clang/Basic/DiagnosticParseKinds.td b/include/clang/Basic/DiagnosticParseKinds.td
index 29cbf22e936da0580c7d477203899a6a203c96d5..3da1f5d80e1d8ced523365aa313a955d52e6f0b7 100644 (file)
--- 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 123cf90d1906c5dc17513031313a0c67f10dd749..db8aeace6421bf8c4b3117e2ea20ce0e98078c61 100644 (file)
--- 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 {