aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJason Merrill <jason@phydeaux.cygnus.com>1995-09-26 16:43:13 -0400
committerRichard Kenner <kenner@gcc.gnu.org>1995-09-26 16:43:13 -0400
commitf9bcb5472eb0a85ff3b42ecc5b46f7ba1a12e3a3 (patch)
treeafb22a7960124ad0afafe07897d9c27744083052 /gcc
parent8741664047034e6bb35eb06645ceeb3a08eb6a3a (diff)
downloadgcc-f9bcb5472eb0a85ff3b42ecc5b46f7ba1a12e3a3.zip
gcc-f9bcb5472eb0a85ff3b42ecc5b46f7ba1a12e3a3.tar.gz
gcc-f9bcb5472eb0a85ff3b42ecc5b46f7ba1a12e3a3.tar.bz2
(duplicate_decls): Turn off whining about virtual functions redeclared
inline for now. From-SVN: r10402
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/decl.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 686f52a..d5b149f 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -2672,6 +2672,9 @@ duplicate_decls (newdecl, olddecl)
if (DECL_THIS_INLINE (newdecl) && ! DECL_THIS_INLINE (olddecl))
{
+#if 0 /* I think this will be correct, but it's really annoying. We should
+ fix the compiler to find vtables by indirection so it isn't
+ necessary. (jason 8/25/95) */
if (DECL_VINDEX (olddecl) && ! DECL_ABSTRACT_VIRTUAL_P (olddecl))
{
cp_pedwarn ("virtual function `%#D' redeclared inline",
@@ -2679,7 +2682,9 @@ duplicate_decls (newdecl, olddecl)
cp_pedwarn_at ("previous non-inline declaration here",
olddecl);
}
- else if (TREE_ADDRESSABLE (olddecl))
+ else
+#endif
+ if (TREE_ADDRESSABLE (olddecl))
{
cp_pedwarn ("`%#D' was used before it was declared inline",
newdecl);