diff options
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/resolve.c | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 100e04d..a693db8 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2015-02-26 Martin Liska <mliska@suse.cz> + + * resolve.c: Rename enum 'comparison' to 'compare_result' as + solution for -Wodr issue. + 2015-02-24 Thomas Schwinge <thomas@codesourcery.com> PR libgomp/64625 diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index b1111cc..675cb15 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -3809,11 +3809,11 @@ bad_op: typedef enum { CMP_LT, CMP_EQ, CMP_GT, CMP_UNKNOWN } -comparison; +compare_result; /* Compare two integer expressions. */ -static comparison +static compare_result compare_bound (gfc_expr *a, gfc_expr *b) { int i; @@ -3840,7 +3840,7 @@ compare_bound (gfc_expr *a, gfc_expr *b) /* Compare an integer expression with an integer. */ -static comparison +static compare_result compare_bound_int (gfc_expr *a, int b) { int i; @@ -3863,7 +3863,7 @@ compare_bound_int (gfc_expr *a, int b) /* Compare an integer expression with a mpz_t. */ -static comparison +static compare_result compare_bound_mpz_t (gfc_expr *a, mpz_t b) { int i; @@ -4002,7 +4002,7 @@ check_dimension (int i, gfc_array_ref *ar, gfc_array_spec *as) #define AR_START (ar->start[i] ? ar->start[i] : as->lower[i]) #define AR_END (ar->end[i] ? ar->end[i] : as->upper[i]) - comparison comp_start_end = compare_bound (AR_START, AR_END); + compare_result comp_start_end = compare_bound (AR_START, AR_END); /* Check for zero stride, which is not allowed. */ if (compare_bound_int (ar->stride[i], 0) == CMP_EQ) |