[PPL-devel] [GIT] ppl/ppl(master): Revert " Renamed some variables so that declarations in an outer scope are not hidden ."

[Patricia Hill]

Module: ppl/ppl
Branch: master
Commit: e9fee53d2e10691f6a6723c0c28631e573e84ffc
URL:    http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e9fee53d2e10691f6a6723c0c28631e573e84ffc

Author: Patricia Hill <p.m.hill at leeds.ac.uk>
Date:   Mon Feb 20 21:47:45 2012 +0000

Revert "Renamed some variables so that declarations in an outer scope are not hidden."

This reverts commit 97cc40667310524111a674be5ad3e8e9e4ec8c90.

---

 src/Grid.templates.hh        |    8 ++++----
 src/PIP_Problem.cc           |    6 +++---
 src/checked_float.inlines.hh |    6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Grid.templates.hh b/src/Grid.templates.hh
index 03d01ae..94d756f 100644
--- a/src/Grid.templates.hh
+++ b/src/Grid.templates.hh
@@ -270,7 +270,7 @@ Grid::reduce_reduced(M& sys,
 		     const dimension_type pivot_index,
 		     const dimension_type start,
 		     const dimension_type end,
-		     const Dimension_Kinds& sys_dim_kinds,
+		     const Dimension_Kinds& dim_kinds,
 		     const bool generators) {
   R& pivot = sys[pivot_index];
 
@@ -281,7 +281,7 @@ Grid::reduce_reduced(M& sys,
 
   PPL_DIRTY_TEMP_COEFFICIENT(pivot_dim_half);
   pivot_dim_half = (pivot_dim + 1) / 2;
-  Dimension_Kind row_kind = sys_dim_kinds[dim];
+  Dimension_Kind row_kind = dim_kinds[dim];
   Dimension_Kind line_or_equality, virtual_kind;
   int jump;
   if (generators) {
@@ -301,13 +301,13 @@ Grid::reduce_reduced(M& sys,
        row_index-- > 0;
        kinds_index += jump) {
     // Move over any virtual rows.
-    while (sys_dim_kinds[kinds_index] == virtual_kind)
+    while (dim_kinds[kinds_index] == virtual_kind)
       kinds_index += jump;
 
     // row_kind CONGRUENCE is included as PARAMETER
     if (row_kind == line_or_equality
 	|| (row_kind == PARAMETER
-	    && sys_dim_kinds[kinds_index] == PARAMETER)) {
+	    && dim_kinds[kinds_index] == PARAMETER)) {
       R& row = sys[row_index];
 
       const Coefficient& row_dim = row[dim];
diff --git a/src/PIP_Problem.cc b/src/PIP_Problem.cc
index ae9ccb3..bfe1c2c 100644
--- a/src/PIP_Problem.cc
+++ b/src/PIP_Problem.cc
@@ -177,10 +177,10 @@ PPL::PIP_Problem::solve() const {
           for (Variables_Set::const_iterator
                pi = param_begin; pi != param_end; ++pi, ++i) {
             if (*pi < c_space_dim) {
-              Coefficient_traits::const_reference coeff_pi
+              Coefficient_traits::const_reference x
                 = c.coefficient(Variable(*pi));
-              if (coeff_pi != 0)
-                itr = row.insert(itr, i, coeff_pi);
+              if (x != 0)
+                itr = row.insert(itr, i, x);
             } else
               break;
           }
diff --git a/src/checked_float.inlines.hh b/src/checked_float.inlines.hh
index 755e96a..6c2b97a 100644
--- a/src/checked_float.inlines.hh
+++ b/src/checked_float.inlines.hh
@@ -154,10 +154,10 @@ classify_float(const T v, bool nan, bool inf, bool sign) {
     return V_NAN;
   if (inf) {
     if (Policy::has_infinity) {
-      int sign_inf = f.u.binary.inf_sign();
-      if (sign_inf < 0)
+      int sign = f.u.binary.inf_sign();
+      if (sign < 0)
         return V_EQ_MINUS_INFINITY;
-      if (sign_inf > 0)
+      if (sign > 0)
         return V_EQ_PLUS_INFINITY;
     }
     else