diff options
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 95aff1f..710484b 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,12 @@ +2009-04-28 Ben Elliston <bje@au.ibm.com> + + PR c++/35652 + Revert: + + 2009-03-27 Manuel Lopez-Ibanez <manu@gcc.gnu.org> + + * typeck.c (cp_pointer_sum): Adjust call to pointer_int_sum. + 2009-04-27 Ian Lance Taylor <iant@google.com> * semantics.c (finish_omp_clauses): Change type of c_kind to enum diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 69d5529..5486c54 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -4054,7 +4054,7 @@ cp_pointer_int_sum (enum tree_code resultcode, tree ptrop, tree intop) pointer_int_sum() anyway. */ complete_type (TREE_TYPE (res_type)); - return pointer_int_sum (input_location, resultcode, ptrop, + return pointer_int_sum (resultcode, ptrop, fold_if_not_in_template (intop)); } |