summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>2015-08-15 07:59:39 +0000
committerjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>2015-08-15 07:59:39 +0000
commit1258bfbadd6743c2fb25c822fe03cd194faa8e02 (patch)
tree6295ecb8b68d3c738946dbc9f86b576014e091c3
parentdb0a53170ed9e71265f9a463e613adcf2a77147a (diff)
downloadgcc-1258bfbadd6743c2fb25c822fe03cd194faa8e02.tar.gz
PR c++/65974
* decl2.c (mark_vtable_entries): Suppress -Wdeprecated. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@226909 138bc75d-0d04-0410-961f-82ee72b054a4
-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 4384f30bcee..52691aaadeb 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-14 Patrick Palka <ppalka@gcc.gnu.org>
PR c++/66857
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index f5d1e52be86..b0368aee898 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -1742,6 +1742,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 00000000000..fc861ee2442
--- /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;
+}