diff options
Diffstat (limited to 'gcc/cp/search.c')
| -rw-r--r-- | gcc/cp/search.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/gcc/cp/search.c b/gcc/cp/search.c index b113477..166ac11 100644 --- a/gcc/cp/search.c +++ b/gcc/cp/search.c @@ -1889,22 +1889,16 @@ check_final_overrider (tree overrider, tree basefn) fail = 1; } } - else if (!pedantic - && can_convert (TREE_TYPE (base_type), TREE_TYPE (over_type), - tf_warning_or_error)) + else if (can_convert_standard (TREE_TYPE (base_type), + TREE_TYPE (over_type), + tf_warning_or_error)) /* GNU extension, allow trivial pointer conversions such as converting to void *, or qualification conversion. */ { - /* can_convert will permit user defined conversion from a - (reference to) class type. We must reject them. */ - if (CLASS_TYPE_P (non_reference (over_return))) - fail = 2; - else - { - warning (0, "deprecated covariant return type for %q+#D", - overrider); - warning (0, " overriding %q+#D", basefn); - } + if (pedwarn (DECL_SOURCE_LOCATION (overrider), 0, + "invalid covariant return type for %q#D", overrider)) + inform (DECL_SOURCE_LOCATION (basefn), + " overriding %q+#D", basefn); } else fail = 2; |