diff options
| author | Paolo Carlini <paolo@gcc.gnu.org> | 2014-07-07 15:29:01 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2014-07-07 15:29:01 +0000 |
| commit | 8895d9a1d2c0a0c0a18426a959081b481d9c881c (patch) | |
| tree | c1adb4f486358be59c85ae5bb66895f8894c752a /gcc | |
| parent | 0f05a19962a367aaac5b6ae8f7638a2bd77e4b29 (diff) | |
| download | gcc-8895d9a1d2c0a0c0a18426a959081b481d9c881c.zip gcc-8895d9a1d2c0a0c0a18426a959081b481d9c881c.tar.gz gcc-8895d9a1d2c0a0c0a18426a959081b481d9c881c.tar.bz2 | |
class.c (check_for_override): Wrap the 'final' and 'override' keywords in %< and %>.
/cp
2014-07-07 Paolo Carlini <paolo.carlini@oracle.com>
* class.c (check_for_override): Wrap the 'final' and 'override'
keywords in %< and %>.
/testsuite
2014-07-07 Paolo Carlini <paolo.carlini@oracle.com>
* g++.dg/cpp0x/override1.C: Tweak expected error messages.
From-SVN: r212333
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/class.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | 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 93b05fa..dc56de6 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2014-07-07 Paolo Carlini <paolo.carlini@oracle.com> + + * class.c (check_for_override): Wrap the 'final' and 'override' + keywords in %< and %>. + 2014-07-06 Marek Polacek <polacek@redhat.com> PR c/6940 diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 1c28dd6..3a44dba 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 %<final%>, 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 %<override%>, 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 fae51c2..bc23150 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,4 +1,8 @@ -2014-06-24 Max Ostapenko <m.ostapenko@partner.samsung.com> +2014-07-07 Paolo Carlini <paolo.carlini@oracle.com> + + * g++.dg/cpp0x/override1.C: Tweak expected error messages. + +2014-07-07 Max Ostapenko <m.ostapenko@partner.samsung.com> * 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 e05693f..f5f00ee 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 <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,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; }; |