Module: ppl/ppl Branch: master Commit: 96b0c536a8dcd3cf29759452003bca3172d7509c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=96b0c536a8dcd...
Author: Abramo Bagnara abramo.bagnara@gmail.com Date: Fri Feb 24 15:39:01 2012 +0100
Avoid to offset iterators twice.
---
src/Octagonal_Shape.templates.hh | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/Octagonal_Shape.templates.hh b/src/Octagonal_Shape.templates.hh index b029054..a18e48f 100644 --- a/src/Octagonal_Shape.templates.hh +++ b/src/Octagonal_Shape.templates.hh @@ -4429,8 +4429,8 @@ Octagonal_Shape<T>::refine(const Variable var, PPL_DIRTY_TEMP(N, minus_coeff_i); // Note: indices above `w' can be disregarded, as they all have // a zero coefficient in `sc_expr'. - for (Row_iterator m_iter = m_begin, m_iter_end = m_iter + (2*w_id) + 2; - m_iter != m_iter_end; ) { + for (Row_iterator m_iter = m_begin, m_end = m_begin + (2 * w_id + 2); + m_iter != m_end; ) { const dimension_type n_i = m_iter.index(); const dimension_type id = n_i/2; Row_reference m_i = *m_iter; @@ -4616,7 +4616,7 @@ Octagonal_Shape<T>::refine(const Variable var, PPL_DIRTY_TEMP_COEFFICIENT(minus_sc_i); // Note: indices above `w_id' can be disregarded, as they all have // a zero coefficient in `expr'. - for (Row_Iterator m_iter = m_begin, m_end = m_iter + (2*w_id) + 2; + for (Row_Iterator m_iter = m_begin, m_end = m_begin + (2 * w_id + 2); m_iter != m_end; ) { const dimension_type n_i = m_iter.index(); const dimension_type id = n_i/2; @@ -4700,7 +4700,7 @@ Octagonal_Shape<T>::refine(const Variable var, PPL_DIRTY_TEMP(N, coeff_i); PPL_DIRTY_TEMP(N, approx_i); PPL_DIRTY_TEMP_COEFFICIENT(minus_sc_i); - for (Row_Iterator m_iter = m_begin, m_end = m_iter + (2*w_id) + 2; + for (Row_Iterator m_iter = m_begin, m_end = m_begin + (2 * w_id + 2); m_iter != m_end; ) { const dimension_type n_i = m_iter.index(); const dimension_type id = n_i/2; @@ -4998,7 +4998,7 @@ Octagonal_Shape<T>::affine_image(const Variable var, // a zero coefficient in `sc_expr'. const Row_Iterator m_begin = matrix.row_begin(); for (Row_iterator m_iter = m_begin, - m_iter_end = m_iter + (2*w_id) + 2; m_iter != m_iter_end; ) { + m_end = m_begin + (2 * w_id + 2); m_iter != m_end; ) { const dimension_type n_i = m_iter.index(); const dimension_type id = n_i/2; Row_reference m_i = *m_iter; @@ -5931,8 +5931,8 @@ Octagonal_Shape<T> PPL_DIRTY_TEMP_COEFFICIENT(minus_sc_i); // Note: indices above `w' can be disregarded, as they all have // a zero coefficient in `sc_expr'. - for (Row_iterator m_iter = m_begin, m_iter_end = m_iter + (2*w_id) + 2; - m_iter != m_iter_end; ) { + for (Row_iterator m_iter = m_begin, m_end = m_begin + (2 * w_id + 2); + m_iter != m_end; ) { const dimension_type n_i = m_iter.index(); const dimension_type id = n_i/2; Row_reference m_i = *m_iter; @@ -6025,8 +6025,8 @@ Octagonal_Shape<T> PPL_DIRTY_TEMP_COEFFICIENT(minus_sc_i); PPL_DIRTY_TEMP(N, approx_i); // Approximate the homogeneous part of `-sc_expr'. - for (Row_iterator m_iter = m_begin, m_iter_end = m_iter + (2*w_id) + 2; - m_iter != m_iter_end; ) { + for (Row_iterator m_iter = m_begin, m_end = m_begin + (2 * w_id + 2); + m_iter != m_end; ) { const dimension_type n_i = m_iter.index(); const dimension_type id = n_i/2; Row_reference m_i = *m_iter; @@ -6491,8 +6491,8 @@ Octagonal_Shape<T>::bounded_affine_image(const Variable var, PPL_DIRTY_TEMP_COEFFICIENT(minus_sc_i); // Note: indices above `w' can be disregarded, as they all have // a zero coefficient in `sc_expr'. - for (Row_iterator m_iter = m_begin, m_iter_end = m_iter + (2*w_id) + 2; - m_iter != m_iter_end; ) { + for (Row_iterator m_iter = m_begin, m_end = m_begin + (2 * w_id + 2); + m_iter != m_end; ) { const dimension_type n_i = m_iter.index(); const dimension_type id = n_i/2; Row_reference m_i = *m_iter;