diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/other/redecl2.C | 11 |
4 files changed, 24 insertions, 1 deletions
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 <aoliva@redhat.com> + + PR c++/17816 + * decl.c (redeclaration_error_message): Report redefinition of + pure virtual function. + 2005-02-11 Nathan Sidwell <nathan@codesourcery.com> 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 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 78c0963..e185aad 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2005-02-14 Alexandre Oliva <aoliva@redhat.com> + + PR c++/17816 + * g++.dg/other/redecl2.C: New. + 2005-02-14 Nathan Sidwell <nathan@codesourcery.com> PR c++/19891 diff --git a/gcc/testsuite/g++.dg/other/redecl2.C b/gcc/testsuite/g++.dg/other/redecl2.C new file mode 100644 index 0000000..591c258 --- /dev/null +++ b/gcc/testsuite/g++.dg/other/redecl2.C @@ -0,0 +1,11 @@ +// PR c++/17816 +// We failed to report duplicate definitions of pure virtual ns. + +// { dg-do compile } + +struct S { + virtual int foo() = 0; +}; + +int S::foo() { return 0; } // { dg-error "defined here" } +int S::foo() { return 0; } // { dg-error "redefinition" } |