Imported from /home/lorry/working-area/delta_gcc-tarball/gcc-5.1.0.tar.bz2.gcc-5.1.0

1 files changed, 17 insertions, 5 deletions

diff --git a/gcc/testsuite/g++.dg/cpp0x/override1.C b/gcc/testsuite/g++.dg/cpp0x/override1.C
index e05693fc59..7686a286fc 100644
--- a/gcc/testsuite/g++.dg/cpp0x/override1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/override1.C
@@ -4,8 +4,11 @@ struct B
   virtual void f() final {}
   virtual void g() {}
   virtual void x() const {}
+  virtual void y() final;
 };
 
+void B::y() {} // { dg-error "overriding" }
+
 struct B2
 {
   virtual void h() {}
@@ -14,11 +17,12 @@ struct B2
 struct D : B
 {
   virtual void g() override final {} // { dg-error "overriding" }
+  virtual void y() override final {} // { dg-error "virtual" }
 };
 
 template <class T> struct D2 : T
 {
-  void h() override {} // { dg-error "marked override, but does not override" }
+  void h() override {} // { dg-error "marked 'override', but does not override" }
 };
 
 template <class T> struct D3 : T
@@ -38,20 +42,28 @@ struct B3
 
 struct B4
 {
-  void f() final {} // { dg-error "marked final, but is not virtual" }
+  void f() final {} // { dg-error "marked 'final', but is not virtual" }
 };
 
 struct D5 : B
 {
-  void ff() override {} // { dg-error "marked override, but does not override" }
-  virtual void fff() override {} // { dg-error "marked override, but does not override" }
-  virtual void x() override {} // { dg-error "marked override, but does not override" }
+  void ff() override {} // { dg-error "marked 'override', but does not override" }
+  virtual void fff() override {} // { dg-error "marked 'override', but does not override" }
+  virtual void x() override {} // { dg-error "marked 'override', but does not override" }
   void g() override;
 };
 
 void D5::g() override {} // { dg-error "not allowed outside a class definition" }
 void g() override {} // { dg-error "not allowed outside a class definition" }
 
+struct B5
+{
+  friend void f() final; // { dg-error "may not have virt-specifiers" }
+  friend void g() override; // { dg-error "may not have virt-specifiers" }
+  template <class T> void h() final; // { dg-error "may not have virt-specifiers" }
+  template <class T> void i() override; // { dg-error "may not have virt-specifiers" }
+};
+
 int main()
 {
   D2<B> d;