re PR c++/15214 (Warning non-virtual-dtor too strict)

PR c++/15214
        * class.c (finish_struct_1): Warn only if the dtor is non-private or
        the class has friends.

From-SVN: r82366
This commit is contained in:
Tom Marshall 2004-05-28 17:01:20 +00:00 committed by Jason Merrill
parent d1a7edafe6
commit 9fd8f60d1d
2 changed files with 16 additions and 1 deletions

View File

@ -1,3 +1,9 @@
2004-05-20 Tom Marshall <tmarshall@real.com>
PR c++/15214
* class.c (finish_struct_1): Warn only if the dtor is non-private or
the class has friends.
2004-05-27 Adam Nemet <anemet@lnxw.com>
PR c++/12883

View File

@ -5185,7 +5185,16 @@ finish_struct_1 (tree t)
if (warn_nonvdtor && TYPE_POLYMORPHIC_P (t) && TYPE_HAS_DESTRUCTOR (t)
&& DECL_VINDEX (TREE_VEC_ELT (CLASSTYPE_METHOD_VEC (t), 1)) == NULL_TREE)
warning ("`%#T' has virtual functions but non-virtual destructor", t);
{
tree dtor = TREE_VEC_ELT (CLASSTYPE_METHOD_VEC (t), 1);
/* Warn only if the dtor is non-private or the class has friends */
if (!TREE_PRIVATE (dtor) ||
(CLASSTYPE_FRIEND_CLASSES (t) ||
DECL_FRIENDLIST (TYPE_MAIN_DECL (t))))
warning ("%#T' has virtual functions but non-virtual destructor", t);
}
complete_vars (t);