diff options
| author | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2015-01-27 18:44:35 +0000 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2015-01-27 19:44:35 +0100 |
| commit | 47da0bf6fbf3ca60bfd8a44a557dcf69bd4c053b (patch) | |
| tree | 4ff4d2b88bc9080362f66598286ba4d9eeff820b /gcc/fortran/interface.c | |
| parent | 6e17947e9f37f70e9f1093608885a8a02945cd79 (diff) | |
| download | gcc-47da0bf6fbf3ca60bfd8a44a557dcf69bd4c053b.zip gcc-47da0bf6fbf3ca60bfd8a44a557dcf69bd4c053b.tar.gz gcc-47da0bf6fbf3ca60bfd8a44a557dcf69bd4c053b.tar.bz2 | |
re PR fortran/64771 (ICE(segfault) when passing coarrays around; ICE in gfc_zero_size_array in arith.c:1637)
2015-01-27 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
PR fortran/64771
* interface.c: Remove <algorithm>.
(check_dummy_characteristics): Use MAX instead of std::max.
From-SVN: r220182
Diffstat (limited to 'gcc/fortran/interface.c')
| -rw-r--r-- | gcc/fortran/interface.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c index 0463a58..837dc8c 100644 --- a/gcc/fortran/interface.c +++ b/gcc/fortran/interface.c @@ -63,8 +63,6 @@ along with GCC; see the file COPYING3. If not see formal argument list points to symbols within the same namespace as the program unit name. */ -#include <algorithm> /* For std::max. */ - #include "config.h" #include "system.h" #include "coretypes.h" @@ -1215,7 +1213,7 @@ check_dummy_characteristics (gfc_symbol *s1, gfc_symbol *s2, } if (s1->as->type == AS_EXPLICIT) - for (i = 0; i < s1->as->rank + std::max(0, s1->as->corank-1); i++) + for (i = 0; i < s1->as->rank + MAX (0, s1->as->corank-1); i++) { shape1 = gfc_subtract (gfc_copy_expr (s1->as->upper[i]), gfc_copy_expr (s1->as->lower[i])); |