Module: ppl/ppl Branch: master Commit: 2d2a72e2c4acc93b60eed10a89c103e3ab0d5e45 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2d2a72e2c4acc...
Author: Enea Zaffanella zaffanella@cs.unipr.it Date: Thu Aug 16 11:25:04 2012 +0200
Avoid outer-scope name hiding. Detected by ECLAIR service declhidn.
---
src/Linear_Expression_Impl.templates.hh | 6 ++-- src/termination.cc | 32 +++++++++++++++--------------- 2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/Linear_Expression_Impl.templates.hh b/src/Linear_Expression_Impl.templates.hh index 405cf65..9cb2940 100644 --- a/src/Linear_Expression_Impl.templates.hh +++ b/src/Linear_Expression_Impl.templates.hh @@ -618,9 +618,9 @@ Linear_Expression_Impl<Row>::sign_normalize() { for ( ; i != i_end; ++i) neg_assign(*i); // Negate the first coefficient, too. - typename Row::iterator i = row.begin(); - if (i != row.end() && i.index() == 0) - neg_assign(*i); + typename Row::iterator first = row.begin(); + if (first != row.end() && first.index() == 0) + neg_assign(*first); } PPL_ASSERT(OK()); } diff --git a/src/termination.cc b/src/termination.cc index e0bc1a3..5c37d78 100644 --- a/src/termination.cc +++ b/src/termination.cc @@ -389,20 +389,20 @@ fill_constraint_system_PR(const Constraint_System& cs_before, Variable u3_i(row_index); const Constraint::Expression& e_i = i->expression(); for (Constraint::Expression::const_iterator - i = e_i.lower_bound(Variable(n)), - i_end = e_i.end(); i != i_end; ++i) { - Coefficient_traits::const_reference A_ij_C = *i; - const Variable v = i.variable(); + j = e_i.lower_bound(Variable(n)), + j_end = e_i.end(); j != j_end; ++j) { + Coefficient_traits::const_reference A_ij_C = *j; + const Variable v = j.variable(); // - u3 A_C, in the context of the j-th constraint. sub_mul_assign(les_eq[v.id() - n], A_ij_C, u3_i); // u3 A_C, in the context of the (j+n)-th constraint. add_mul_assign(les_eq[v.id()], A_ij_C, u3_i); } - for (Constraint::Expression::const_iterator i = e_i.begin(), - i_end = e_i.lower_bound(Variable(n)); i != i_end; ++i) { - Coefficient_traits::const_reference Ap_ij_C = *i; + for (Constraint::Expression::const_iterator j = e_i.begin(), + j_end = e_i.lower_bound(Variable(n)); j != j_end; ++j) { + Coefficient_traits::const_reference Ap_ij_C = *j; // u3 Ap_C, in the context of the (j+n)-th constraint. - add_mul_assign(les_eq[i.variable().id() + n], Ap_ij_C, u3_i); + add_mul_assign(les_eq[j.variable().id() + n], Ap_ij_C, u3_i); } Coefficient_traits::const_reference b_C = e_i.inhomogeneous_term(); if (b_C != 0) @@ -437,20 +437,20 @@ fill_constraint_system_PR_original(const Constraint_System& cs, const Constraint::Expression& e_i = i->expression(); const Variable lambda1_i(row_index); const Variable lambda2_i(m + row_index); - for (Constraint::Expression::const_iterator i = e_i.begin(), - i_end = e_i.lower_bound(Variable(n)); i != i_end; ++i) { - Coefficient_traits::const_reference Ap_ij = *i; - const Variable v = i.variable(); + for (Constraint::Expression::const_iterator j = e_i.begin(), + j_end = e_i.lower_bound(Variable(n)); j != j_end; ++j) { + Coefficient_traits::const_reference Ap_ij = *j; + const Variable v = j.variable(); // lambda_1 A' add_mul_assign(les_eq[v.id()], Ap_ij, lambda1_i); // lambda_2 A' add_mul_assign(les_eq[v.id()+n+n], Ap_ij, lambda2_i); } for (Constraint::Expression::const_iterator - i = e_i.lower_bound(Variable(n)), - i_end = e_i.end(); i != i_end; ++i) { - Coefficient_traits::const_reference A_ij = *i; - const Variable v = i.variable(); + j = e_i.lower_bound(Variable(n)), + j_end = e_i.end(); j != j_end; ++j) { + Coefficient_traits::const_reference A_ij = *j; + const Variable v = j.variable(); // (lambda_1 - lambda_2) A add_mul_assign(les_eq[v.id()], A_ij, lambda1_i); sub_mul_assign(les_eq[v.id()], A_ij, lambda2_i);