From d1fc3bbd80a4d4dff957b9eeb5ae463f3e8f55b1 Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Mon, 14 Feb 2005 12:01:15 +0000 Subject: re PR c++/17816 (duplicate definition of pure virtual function not diagnosed) gcc/cp/ChangeLog: PR c++/17816 * decl.c (redeclaration_error_message): Report redefinition of pure virtual function. gcc/testsuite/ChangeLog: PR c++/17816 * g++.dg/other/redecl2.C: New. From-SVN: r95008 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/decl.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'gcc/cp') diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7e39ce1..777f520 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2005-02-14 Alexandre Oliva + + PR c++/17816 + * decl.c (redeclaration_error_message): Report redefinition of + pure virtual function. + 2005-02-11 Nathan Sidwell PR c++/19891 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index a93cdf8..47732cb 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -1913,7 +1913,8 @@ redeclaration_error_message (tree newdecl, tree olddecl) /* If this is a pure function, its olddecl will actually be the original initialization to `0' (which we force to call abort()). Don't complain about redefinition in this case. */ - if (DECL_LANG_SPECIFIC (olddecl) && DECL_PURE_VIRTUAL_P (olddecl)) + if (DECL_LANG_SPECIFIC (olddecl) && DECL_PURE_VIRTUAL_P (olddecl) + && DECL_INITIAL (olddecl) == NULL_TREE) return 0; /* If both functions come from different namespaces, this is not -- cgit v1.1