summaryrefslogtreecommitdiffstats
path: root/clang/test/CXX/class/class.mem
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@mac.com>2011-01-20 05:55:43 +0000
committerAnders Carlsson <andersca@mac.com>2011-01-20 05:55:43 +0000
commitb4801436d162dd3cfa523d2d16d77c7f59a3b650 (patch)
tree0ec1a5e0ab098949692c7285814601b39000443c /clang/test/CXX/class/class.mem
parent06f5223621d24da66cc7fea19bb2a066bd811f82 (diff)
downloadbcm5719-llvm-b4801436d162dd3cfa523d2d16d77c7f59a3b650.tar.gz
bcm5719-llvm-b4801436d162dd3cfa523d2d16d77c7f59a3b650.zip
Fix tests to be valid.
llvm-svn: 123887
Diffstat (limited to 'clang/test/CXX/class/class.mem')
-rw-r--r--clang/test/CXX/class/class.mem/p8-0x.cpp13
1 files changed, 11 insertions, 2 deletions
diff --git a/clang/test/CXX/class/class.mem/p8-0x.cpp b/clang/test/CXX/class/class.mem/p8-0x.cpp
index db8aeace642..ce676ae6ff5 100644
--- a/clang/test/CXX/class/class.mem/p8-0x.cpp
+++ b/clang/test/CXX/class/class.mem/p8-0x.cpp
@@ -1,11 +1,20 @@
// RUN: %clang_cc1 -fsyntax-only -std=c++0x -verify %s
-struct A {
+
+struct Base1 {
+ virtual void g();
+};
+
+struct A : Base1 {
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 {
+struct Base2 {
+ virtual void f();
+};
+
+struct B : Base2 {
virtual void f() override;
void g() override; // expected-error {{only virtual member functions can be marked 'override'}}
int h override; // expected-error {{only virtual member functions can be marked 'override'}}
OpenPOWER on IntegriCloud