From 8895d9a1d2c0a0c0a18426a959081b481d9c881c Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Mon, 7 Jul 2014 15:29:01 +0000 Subject: [PATCH] class.c (check_for_override): Wrap the 'final' and 'override' keywords in %< and %>. /cp 2014-07-07 Paolo Carlini * class.c (check_for_override): Wrap the 'final' and 'override' keywords in %< and %>. /testsuite 2014-07-07 Paolo Carlini * g++.dg/cpp0x/override1.C: Tweak expected error messages. From-SVN: r212333 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/class.c | 4 ++-- gcc/testsuite/ChangeLog | 6 +++++- gcc/testsuite/g++.dg/cpp0x/override1.C | 10 +++++----- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 93b05fa7326e..dc56de63ab14 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2014-07-07 Paolo Carlini + + * class.c (check_for_override): Wrap the 'final' and 'override' + keywords in %< and %>. + 2014-07-06 Marek Polacek PR c/6940 diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 1c28dd6fe986..3a44dba9db17 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -2771,9 +2771,9 @@ check_for_override (tree decl, tree ctype) TYPE_HAS_NONTRIVIAL_DESTRUCTOR (ctype) = true; } else if (DECL_FINAL_P (decl)) - error ("%q+#D marked final, but is not virtual", decl); + error ("%q+#D marked %, but is not virtual", decl); if (DECL_OVERRIDE_P (decl) && !overrides_found) - error ("%q+#D marked override, but does not override", decl); + error ("%q+#D marked %, but does not override", decl); } /* Warn about hidden virtual functions that are not overridden in t. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index fae51c2ffbe9..bc23150d66a4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,4 +1,8 @@ -2014-06-24 Max Ostapenko +2014-07-07 Paolo Carlini + + * g++.dg/cpp0x/override1.C: Tweak expected error messages. + +2014-07-07 Max Ostapenko * c-c++-common/asan/no-redundant-instrumentation-9.c: New test. diff --git a/gcc/testsuite/g++.dg/cpp0x/override1.C b/gcc/testsuite/g++.dg/cpp0x/override1.C index e05693fc5908..f5f00ee9f51b 100644 --- a/gcc/testsuite/g++.dg/cpp0x/override1.C +++ b/gcc/testsuite/g++.dg/cpp0x/override1.C @@ -18,7 +18,7 @@ struct D : B template 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 struct D3 : T @@ -38,14 +38,14 @@ 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; }; -- 2.47.2