[cfe-commits] r123883 - in /cfe/trunk: include/clang/Basic/DiagnosticParseKinds.td test/CXX/class/class.mem/p8-0x.cpp

[Anders Carlsson]

Author: andersca
Date: Wed Jan 19 22:38:09 2011
New Revision: 123883

URL: http://llvm.org/viewvc/llvm-project?rev=123883&view=rev
Log:
Change the parser error to reflect that virt-specifiers are allowed on any class member.

Modified:
    cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td
    cfe/trunk/test/CXX/class/class.mem/p8-0x.cpp

Modified: cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td?rev=123883&r1=123882&r2=123883&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td Wed Jan 19 22:38:09 2011
@@ -391,7 +391,7 @@
 
 // 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">;

Modified: cfe/trunk/test/CXX/class/class.mem/p8-0x.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/class/class.mem/p8-0x.cpp?rev=123883&r1=123882&r2=123883&view=diff
==============================================================================
--- cfe/trunk/test/CXX/class/class.mem/p8-0x.cpp (original)
+++ cfe/trunk/test/CXX/class/class.mem/p8-0x.cpp Wed Jan 19 22:38:09 2011
@@ -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 {