aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2015-08-15 03:59:26 -0400
committerJason Merrill <jason@gcc.gnu.org>2015-08-15 03:59:26 -0400
commit60349f15cce1213fc4f3e36209332eb69dd24e95 (patch)
treee673324b5af190194eba7e55b16c42e32a79fe01
parent25a20a1c03b3e0d5815aaae4e41106315d2eeb33 (diff)
downloadgcc-60349f15cce1213fc4f3e36209332eb69dd24e95.zip
gcc-60349f15cce1213fc4f3e36209332eb69dd24e95.tar.gz
gcc-60349f15cce1213fc4f3e36209332eb69dd24e95.tar.bz2
re PR c++/65974 (Bogus deprecated-declarations warnings for inline definitions of deprecated virtual methods)
PR c++/65974 * decl2.c (mark_vtable_entries): Suppress -Wdeprecated. From-SVN: r226908
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/decl2.c3
-rw-r--r--gcc/testsuite/g++.dg/warn/deprecated-9.C16
3 files changed, 24 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e8008ce..a5a42ff1 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-14 Jason Merrill <jason@redhat.com>
+
+ PR c++/65974
+ * decl2.c (mark_vtable_entries): Suppress -Wdeprecated.
+
2015-08-12 Jason Merrill <jason@redhat.com>
PR c++/67104
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 8e7a453..74ba380 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -1747,6 +1747,9 @@ mark_vtable_entries (tree decl)
tree fnaddr;
unsigned HOST_WIDE_INT idx;
+ /* It's OK for the vtable to refer to deprecated virtual functions. */
+ warning_sentinel w(warn_deprecated_decl);
+
FOR_EACH_CONSTRUCTOR_VALUE (CONSTRUCTOR_ELTS (DECL_INITIAL (decl)),
idx, fnaddr)
{
diff --git a/gcc/testsuite/g++.dg/warn/deprecated-9.C b/gcc/testsuite/g++.dg/warn/deprecated-9.C
new file mode 100644
index 0000000..fc861ee
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/deprecated-9.C
@@ -0,0 +1,16 @@
+// PR c++/65974
+// { dg-options "-Wdeprecated" }
+
+struct S {
+ void bar();
+
+ __attribute__((deprecated("use bar() instead.")))
+ virtual void foo();
+};
+
+void S::foo() { bar(); }
+
+int main()
+{
+ return 0;
+}