From 63a496dedb96263534f3eb152d66d59e8f08b125 Mon Sep 17 00:00:00 2001 From: Francois-Xavier Coudert Date: Sat, 4 Oct 2014 10:18:07 +0000 Subject: re PR fortran/36534 (Bogus: '__convert_s1_s4' at (1) is obsolescent in fortran 95) PR fortran/36534 * resolve.c (resolve_fl_procedure): Clean up obsolescence warning. * gfortran.dg/widechar_10.f90: New test. From-SVN: r215887 --- gcc/fortran/resolve.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gcc/fortran/resolve.c') diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 4b8f3b1..30ee175 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -11266,11 +11266,11 @@ resolve_fl_procedure (gfc_symbol *sym, int mp_flag) } /* Appendix B.2 of the standard. Contained functions give an - error anyway. Fixed-form is likely to be F77/legacy. Deferred - character length is an F2003 feature. */ - if (!sym->attr.contained - && gfc_current_form != FORM_FIXED - && !sym->ts.deferred) + error anyway. Deferred character length is an F2003 feature. + Don't warn on intrinsic conversion functions, which start + with two underscores. */ + if (!sym->attr.contained && !sym->ts.deferred + && (sym->name[0] != '_' || sym->name[1] != '_')) gfc_notify_std (GFC_STD_F95_OBS, "CHARACTER(*) function '%s' at %L", sym->name, &sym->declared_at); -- cgit v1.1