diff options
author | Jakub Jelinek <jakub@redhat.com> | 2016-12-27 16:17:19 +0100 |
---|---|---|
committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2016-12-27 16:17:19 +0100 |
commit | 2700d0e3ab767c765246cdc480ff7ad5792eb2e6 (patch) | |
tree | adf0e602fa885ee7d93a0b0e4d2f89ece747f58e /gcc/fortran/resolve.c | |
parent | d90866773eab1eb0865af8a00f15651979b1a08f (diff) | |
download | gcc-2700d0e3ab767c765246cdc480ff7ad5792eb2e6.zip gcc-2700d0e3ab767c765246cdc480ff7ad5792eb2e6.tar.gz gcc-2700d0e3ab767c765246cdc480ff7ad5792eb2e6.tar.bz2 |
gfortran.h (gfc_error): Rename overload with OPT argument to...
* gfortran.h (gfc_error): Rename overload with OPT argument to...
(gfc_error_opt): ... this.
* error.c (gfc_error): Rename overloads with OPT argument to...
(gfc_error_opt): ... this. Adjust callers.
(gfc_notify_std, gfc_error): Adjust callers.
* resolve.c (resolve_structure_cons, resolve_global_procedure): Use
gfc_error_opt instead of gfc_error.
* interface.c (argument_rank_mismatch, compare_parameter,
gfc_check_typebound_override): Likewise. Fix up formatting.
From-SVN: r243941
Diffstat (limited to 'gcc/fortran/resolve.c')
-rw-r--r-- | gcc/fortran/resolve.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 2c70e6c..7cf7a41 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -1312,10 +1312,10 @@ resolve_structure_cons (gfc_expr *expr, int init) if (s2 && !gfc_compare_interfaces (comp->ts.interface, s2, name, 0, 1, err, sizeof (err), NULL, NULL)) { - gfc_error (OPT_Wargument_mismatch, - "Interface mismatch for procedure-pointer component " - "%qs in structure constructor at %L: %s", - comp->name, &cons->expr->where, err); + gfc_error_opt (OPT_Wargument_mismatch, + "Interface mismatch for procedure-pointer " + "component %qs in structure constructor at %L:" + " %s", comp->name, &cons->expr->where, err); return false; } } @@ -2466,9 +2466,9 @@ resolve_global_procedure (gfc_symbol *sym, locus *where, if (!gfc_compare_interfaces (sym, def_sym, sym->name, 0, 1, reason, sizeof(reason), NULL, NULL)) { - gfc_error (OPT_Wargument_mismatch, - "Interface mismatch in global procedure %qs at %L: %s ", - sym->name, &sym->declared_at, reason); + gfc_error_opt (OPT_Wargument_mismatch, + "Interface mismatch in global procedure %qs at %L:" + " %s ", sym->name, &sym->declared_at, reason); goto done; } |