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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 93b05fa7326eaef766a65a80ff626aec01fbca49..dc56de63ab147820c3fc2c982226c24a9c91eb31 100644 (file)
--- 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 1c28dd6fe98660a95cbe472b57da4d67cc1301ab..3a44dba9db175ec7383f8e2594edc276a8c4e0e1 100644 (file)
--- 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 fae51c2ffbe99de03a28df006334c69630e065da..bc23150d66a4e50c42e5fd6e42c35eca009cd2f9 100644 (file)
--- 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 e05693fc59088776c3dd6ba8dc353de3a78922b2..f5f00ee9f51b84cd956ded6dc213d9aeaa06c4b6 100644 (file)
--- 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;
 };