diff --git a/test/stressLinear.cxx b/test/stressLinear.cxx
index 3a298724fd61dc3e761c5a5aa8b88c76474c2ef5..b7eea6b8ac7c172c8940d0d562152dfb36db11f2 100644
--- a/test/stressLinear.cxx
+++ b/test/stressLinear.cxx
@@ -288,11 +288,12 @@ void mstress_allocation(Int_t msize)
   if (gVerbose)
     cout << "\n\n---> Test allocation and compatibility check" << endl;
 
+  Int_t i,j;
   Bool_t ok = kTRUE;
 
   TMatrixD m1(4,msize);
-  for (Int_t i = m1.GetRowLwb(); i <= m1.GetRowUpb(); i++)
-    for (Int_t j = m1.GetColLwb(); j <= m1.GetColUpb(); j++)
+  for (i = m1.GetRowLwb(); i <= m1.GetRowUpb(); i++)
+    for (j = m1.GetColLwb(); j <= m1.GetColUpb(); j++)
       m1(i,j) = TMath::Pi()*i+TMath::E()*j;
 
   TMatrixD m2(0,3,0,msize-1);
@@ -324,8 +325,8 @@ void mstress_allocation(Int_t msize)
   ok &= AreCompatible(m2,m3,gVerbose);
 
   TMatrixD m5(m1.GetNrows()+1,m1.GetNcols()+5);
-  for (Int_t i = m5.GetRowLwb(); i <= m5.GetRowUpb(); i++)
-    for (Int_t j = m5.GetColLwb(); j <= m5.GetColUpb(); j++)
+  for (i = m5.GetRowLwb(); i <= m5.GetRowUpb(); i++)
+    for (j = m5.GetColLwb(); j <= m5.GetColUpb(); j++)
       m5(i,j) = TMath::Pi()*i+TMath::E()*j;
 
   if (gVerbose)
@@ -347,12 +348,12 @@ void mstress_allocation(Int_t msize)
   if (gVerbose)
     cout << "m8 has to be equal to m7 after stretching and shrinking" << endl;
   TMatrixD m6(4,4);
-  for (Int_t i = m6.GetRowLwb(); i <= m6.GetRowUpb(); i++)
-    for (Int_t j = m6.GetColLwb(); j <= m6.GetColUpb(); j++)
+  for (i = m6.GetRowLwb(); i <= m6.GetRowUpb(); i++)
+    for (j = m6.GetColLwb(); j <= m6.GetColUpb(); j++)
       m6(i,j) = TMath::Pi()*i+TMath::E()*j;
   TMatrixD m8(3,3);
-  for (Int_t i = m8.GetRowLwb(); i <= m8.GetRowUpb(); i++)
-    for (Int_t j = m8.GetColLwb(); j <= m8.GetColUpb(); j++)
+  for (i = m8.GetRowLwb(); i <= m8.GetRowUpb(); i++)
+    for (j = m8.GetColLwb(); j <= m8.GetColUpb(); j++)
       m8(i,j) = TMath::Pi()*i+TMath::E()*j;
   TMatrixD m7(m8);
 
@@ -950,13 +951,14 @@ void mstress_special_creation(Int_t dim)
   {
     if (gVerbose)
       cout << "check to see that Haar matrix has *exactly* orthogonal columns" << endl;
+    Int_t j;
     const Int_t order = 5;
     const TMatrixD haar = THaarMatrixD(order);
     ok &= ( haar.GetNrows() == (1<<order) &&
                haar.GetNrows() == haar.GetNcols() ) ? kTRUE : kFALSE;
     TVectorD colj(1<<order);
     TVectorD coll(1<<order);
-    for (Int_t j = haar.GetColLwb(); j <= haar.GetColUpb(); j++) {
+    for (j = haar.GetColLwb(); j <= haar.GetColUpb(); j++) {
       colj = TMatrixDColumn_const(haar,j);
       ok &= (TMath::Abs(colj*colj-1.0) <= 1.0e-15 ) ? kTRUE : kFALSE;
       for (Int_t l = j+1; l <= haar.GetColUpb(); l++) {
@@ -972,7 +974,7 @@ void mstress_special_creation(Int_t dim)
     const TMatrixD haar_sub = THaarMatrixD(order,no_sub_cols);
     ok &= ( haar_sub.GetNrows() == (1<<order) &&
                haar_sub.GetNcols() == no_sub_cols ) ? kTRUE : kFALSE;
-    for (Int_t j = haar_sub.GetColLwb(); j <= haar_sub.GetColUpb(); j++) {
+    for (j = haar_sub.GetColLwb(); j <= haar_sub.GetColUpb(); j++) {
       colj = TMatrixDColumn_const(haar,j);
       coll = TMatrixDColumn_const(haar_sub,j);
       ok &= VerifyVectorIdentity(colj,coll,gVerbose);
@@ -1331,6 +1333,7 @@ void mstress_mm_multiplications()
 
     const Int_t verbose = (gVerbose && nr==0 && iloop==gNrLoop);
 
+    Int_t i,j;
     if (msize <= 5) {
        iloop++;
        continue;  // some references to m(3,..)
@@ -1357,14 +1360,14 @@ void mstress_mm_multiplications()
       TMatrixD m = THilbertMatrixD(msize+3,msize);
       m(1,3) = TMath::Pi();
       TVectorD v(msize);
-      for (Int_t i = v.GetLwb(); i <= v.GetUpb(); i++)
+      for (i = v.GetLwb(); i <= v.GetUpb(); i++)
         v(i) = 1+i;
       TMatrixD diag(msize,msize);
       TMatrixDDiag d = TMatrixDDiag(diag);
       d = v;
       TMatrixD eth = m;
-      for (Int_t i = eth.GetRowLwb(); i <= eth.GetRowUpb(); i++)
-        for (Int_t j = eth.GetColLwb(); j <= eth.GetColUpb(); j++)
+      for (i = eth.GetRowLwb(); i <= eth.GetRowUpb(); i++)
+        for (j = eth.GetColLwb(); j <= eth.GetColUpb(); j++)
           eth(i,j) *= v(j);
       m *= diag;
       ok &= VerifyMatrixIdentity(m,eth,verbose,epsilon);
@@ -1378,7 +1381,7 @@ void mstress_mm_multiplications()
       m(2,3) = TMath::Pi();
       TMatrixD eth = m;
       TMatrixD p(msize,msize);
-      for (Int_t i = p.GetRowLwb(); i <= p.GetRowUpb(); i++)
+      for (i = p.GetRowLwb(); i <= p.GetRowUpb(); i++)
         p(p.GetRowUpb()+p.GetRowLwb()-i,i) = 1;
       m *= p;
       m *= p;
@@ -1493,6 +1496,7 @@ void mstress_sym_mm_multiplications(Int_t msize)
     cout << "\n---> Verify symmetric matrix multiplications "
             "for matrices of the characteristic size " << msize << endl;
 
+  Int_t i,j;
   Bool_t ok = kTRUE;
 
   const Double_t epsilon = EPSILON*msize/100;
@@ -1547,13 +1551,13 @@ void mstress_sym_mm_multiplications(Int_t msize)
     ms(1,3) = TMath::Pi();
     ms(3,1) = TMath::Pi();
     TVectorD v(msize);
-    for (Int_t i = v.GetLwb(); i <= v.GetUpb(); i++)
+    for (i = v.GetLwb(); i <= v.GetUpb(); i++)
       v(i) = 1+i;
     TMatrixDSym diag(msize);
     TMatrixDDiag(diag,0) = v;
     TMatrixDSym eth = ms;
-    for (Int_t i = eth.GetRowLwb(); i <= eth.GetRowUpb(); i++)
-      for (Int_t j = eth.GetColLwb(); j <= eth.GetColUpb(); j++)
+    for (i = eth.GetRowLwb(); i <= eth.GetRowUpb(); i++)
+      for (j = eth.GetColLwb(); j <= eth.GetColUpb(); j++)
         eth(i,j) *= v(j);
     TMatrixD m2 = ms * diag;
     ok &= VerifyMatrixIdentity(m2,eth,gVerbose,epsilon);
@@ -1568,7 +1572,7 @@ void mstress_sym_mm_multiplications(Int_t msize)
     ms(3,2) = TMath::Pi();
     TMatrixDSym eth = ms;
     TMatrixDSym p(msize);
-    for (Int_t i = p.GetRowLwb(); i <= p.GetRowUpb(); i++)
+    for (i = p.GetRowLwb(); i <= p.GetRowUpb(); i++)
       p(p.GetRowUpb()+p.GetRowLwb()-i,i) = 1;
     TMatrixD m2 = ms * p;
     m2 *= p;
@@ -1947,6 +1951,7 @@ void vstress_allocation(Int_t msize)
   if (gVerbose)
     cout << "\n\n---> Test allocation and compatibility check" << endl;
 
+  Int_t i;
   Bool_t ok = kTRUE;
   TVectorD v1(msize);
   TVectorD v2(0,msize-1);
@@ -1983,13 +1988,13 @@ void vstress_allocation(Int_t msize)
     if (gVerbose)
       cout << "Check that shrinking does not change remaining elements" << endl;
     TVectorD vb(-1,msize);
-    for (Int_t i = vb.GetLwb(); i <= vb.GetUpb(); i++)
+    for (i = vb.GetLwb(); i <= vb.GetUpb(); i++)
       vb(i) = i+TMath::Pi();
     TVectorD v = vb;
     ok &= ( v == vb ) ? kTRUE : kFALSE;
     ok &= ( v != 0 ) ? kTRUE : kFALSE;
     v.ResizeTo(0,msize/2);
-    for (Int_t i = v.GetLwb(); i <= v.GetUpb(); i++)
+    for (i = v.GetLwb(); i <= v.GetUpb(); i++)
       ok &= ( v(i) == vb(i) ) ? kTRUE : kFALSE;
     if (gVerbose)
       cout << "Check that expansion expands by zeros" << endl;
@@ -1997,11 +2002,11 @@ void vstress_allocation(Int_t msize)
     const Int_t old_lwb    = v.GetLwb();
     v.ResizeTo(vb);
     ok &= ( !(v == vb) ) ? kTRUE : kFALSE;
-    for (Int_t i = old_lwb; i < old_lwb+old_nelems; i++)
+    for (i = old_lwb; i < old_lwb+old_nelems; i++)
       ok &= ( v(i) == vb(i) ) ? kTRUE : kFALSE;
-    for (Int_t i = v.GetLwb(); i < old_lwb; i++)
+    for (i = v.GetLwb(); i < old_lwb; i++)
       ok &= ( v(i) == 0 ) ? kTRUE : kFALSE;
-    for (Int_t i = old_lwb+old_nelems; i <= v.GetUpb(); i++)
+    for (i = old_lwb+old_nelems; i <= v.GetUpb(); i++)
       ok &= ( v(i) == 0 ) ? kTRUE : kFALSE;
   }
 
@@ -2369,7 +2374,7 @@ void vstress_matrix_slices(Int_t vsize)
   TVectorD vr(0,vsize+1);
   TMatrixD m(0,vsize,0,vsize+1);
 
-  Int_t i;
+  Int_t i,j;
   if (gVerbose)
     cout << "\nCheck modifying the matrix column-by-column" << endl;
   m = pattern;
@@ -2394,7 +2399,7 @@ void vstress_matrix_slices(Int_t vsize)
     ok &= ( !( m == pattern ) && !( m != pattern ) ) ? kTRUE : kFALSE;
     {
       TMatrixDColumn mc(m,i);
-      for (Int_t j = m.GetRowLwb(); j <= m.GetRowUpb(); j++)
+      for (j = m.GetRowLwb(); j <= m.GetRowUpb(); j++)
         mc(j) *= 4;
     }
     vc = TMatrixDColumn(m,i);
@@ -2428,7 +2433,7 @@ void vstress_matrix_slices(Int_t vsize)
     ok &= ( !( m == pattern ) && !( m != pattern ) ) ? kTRUE : kFALSE;
     {
       TMatrixDRow mr(m,i);
-      for (Int_t j = m.GetColLwb(); j <= m.GetColUpb(); j++)
+      for (j = m.GetColLwb(); j <= m.GetColUpb(); j++)
         mr(j) *= 8;
     }
     vr = TMatrixDRow(m,i);
@@ -2458,7 +2463,7 @@ void vstress_matrix_slices(Int_t vsize)
   ok &= ( !( m == pattern ) && !( m != pattern ) ) ? kTRUE : kFALSE;
   {
     TMatrixDDiag md(m);
-    for (Int_t j = 0; j < md.GetNdiags(); j++)
+    for (j = 0; j < md.GetNdiags(); j++)
       md(j) /= 1.5;
   }
   vc = TMatrixDDiag(m);
@@ -2490,7 +2495,7 @@ void vstress_matrix_slices(Int_t vsize)
   ok &= ( !(m1 == pattern+10) ) ? kTRUE : kFALSE;
 
   m *= TMatrixDDiag(m1);
-  for (Int_t i = m.GetColLwb(); i <= m.GetColUpb(); i++) {
+  for (i = m.GetColLwb(); i <= m.GetColUpb(); i++) {
     vc1 = TMatrixDColumn(mm,i);
     vc1 *= vr(i);                    // Do a column-wise multiplication
     vc2 = TMatrixDColumn(m,i);
diff --git a/test/testbits.cxx b/test/testbits.cxx
index c849a7f7c7e9ea29312c4e5f04ab692cf9f155af..482383e34d0ca63eea1274c31e58045c350ab051 100644
--- a/test/testbits.cxx
+++ b/test/testbits.cxx
@@ -105,15 +105,16 @@ static void assert_bits_by_int(const TBits &bits,
 
 static void set_bits(TBits &bits,
                      UInt_t nbits) {
-    for (UInt_t i=0;
+    UInt_t i,j;
+    for (i=0;
          i<8;
          ++i) {
-        for (UInt_t j=i*8;
+        for (j=i*8;
              j<i*8+i && j<nbits;
              ++j) {
             bits.SetBitNumber(j);
         }
-        for (UInt_t j=i*8+i;
+        for (j=i*8+i;
              j<i*8+8 && j<nbits;
              ++j) {
             bits.ResetBitNumber(j);
@@ -123,15 +124,16 @@ static void set_bits(TBits &bits,
 
 static void assert_bits(const TBits &bits,
                         UInt_t nbits) {
-    for (UInt_t i=0;
+    UInt_t i,j;
+    for (i=0;
          i<8;
          ++i) {
-        for (UInt_t j=i*8;
+        for (j=i*8;
              j<i*8+i && j<nbits;
              ++j) {
             A(bits.TestBitNumber(j));
         }
-        for (UInt_t j=i*8+i;
+        for (j=i*8+i;
              j<i*8+8 && j<nbits;
              ++j) {
             A(!bits.TestBitNumber(j));
diff --git a/test/vmatrix.cxx b/test/vmatrix.cxx
index 56ef54a6c6ff1aa4a37c45b1934824fe809eea91..6ed180d5e2d0114f84ba0dc8174158d69f32da2f 100644
--- a/test/vmatrix.cxx
+++ b/test/vmatrix.cxx
@@ -1,4 +1,4 @@
-// @(#)root/test:$Name:  $:$Id: stress_matrix.cxx,v 1.15 2002/10/25 10:47:51 rdm Exp $
+// @(#)root/test:$Name:  $:$Id: vmatrix.cxx,v 1.17 2004/01/25 22:18:18 brun Exp $
 // Author: Fons Rademakers and Eddy Offermann  Nov 2003
 
 //////////////////////////////////////////////////////////////////////////
@@ -144,9 +144,10 @@ void stress_allocation()
 
   Bool_t ok = kTRUE;
 
+  Int_t i,j;
   TMatrixD m1(4,20);
-  for (Int_t i = m1.GetRowLwb(); i <= m1.GetRowUpb(); i++)
-    for (Int_t j = m1.GetColLwb(); j <= m1.GetColUpb(); j++)
+  for (i = m1.GetRowLwb(); i <= m1.GetRowUpb(); i++)
+    for (j = m1.GetColLwb(); j <= m1.GetColUpb(); j++)
       m1(i,j) = TMath::Pi()*i+TMath::E()*j;
 
   TMatrixD m2(0,3,0,19);
@@ -178,8 +179,8 @@ void stress_allocation()
   ok &= AreCompatible(m2,m3,gVerbose);
 
   TMatrixD m5(m1.GetNrows()+1,m1.GetNcols()+5);
-  for (Int_t i = m5.GetRowLwb(); i <= m5.GetRowUpb(); i++)
-    for (Int_t j = m5.GetColLwb(); j <= m5.GetColUpb(); j++)
+  for (i = m5.GetRowLwb(); i <= m5.GetRowUpb(); i++)
+    for (j = m5.GetColLwb(); j <= m5.GetColUpb(); j++)
       m5(i,j) = TMath::Pi()*i+TMath::E()*j;
 
   if (gVerbose)
@@ -201,12 +202,12 @@ void stress_allocation()
   if (gVerbose)
     cout << "m8 has to be equal to m7 after stretching and shrinking" << endl;
   TMatrixD m6(4,4);
-  for (Int_t i = m6.GetRowLwb(); i <= m6.GetRowUpb(); i++)
-    for (Int_t j = m6.GetColLwb(); j <= m6.GetColUpb(); j++)
+  for (i = m6.GetRowLwb(); i <= m6.GetRowUpb(); i++)
+    for (j = m6.GetColLwb(); j <= m6.GetColUpb(); j++)
       m6(i,j) = TMath::Pi()*i+TMath::E()*j;
   TMatrixD m8(3,3);
-  for (Int_t i = m8.GetRowLwb(); i <= m8.GetRowUpb(); i++)
-    for (Int_t j = m8.GetColLwb(); j <= m8.GetColUpb(); j++)
+  for (i = m8.GetRowLwb(); i <= m8.GetRowUpb(); i++)
+    for (j = m8.GetColLwb(); j <= m8.GetColUpb(); j++)
       m8(i,j) = TMath::Pi()*i+TMath::E()*j;
   TMatrixD m7(m8);
 
@@ -721,6 +722,7 @@ void stress_special_creation(Int_t dim)
   if (gVerbose)
     cout << "\n---> Check creating some special matrices of dimension " << dim << endl;
 
+  Int_t j;
   Bool_t ok = kTRUE;
   {
     if (gVerbose)
@@ -734,7 +736,7 @@ void stress_special_creation(Int_t dim)
     m1.Apply(mh);
 #else
     for (Int_t i = m1.GetRowLwb(); i <= m1.GetRowUpb(); i++)
-      for (Int_t j = m1.GetColLwb(); j <= m1.GetColUpb(); j++)
+      for (j = m1.GetColLwb(); j <= m1.GetColUpb(); j++)
         m1(i,j) = 1./(i+j+1);
 #endif
     ok &= ( m1 != 0 ) ? kTRUE : kFALSE;
@@ -809,7 +811,7 @@ void stress_special_creation(Int_t dim)
                haar.GetNrows() == haar.GetNcols() ) ? kTRUE : kFALSE;
     TVectorD colj(1<<order);
     TVectorD coll(1<<order);
-    for (Int_t j = haar.GetColLwb(); j <= haar.GetColUpb(); j++) {
+    for (j = haar.GetColLwb(); j <= haar.GetColUpb(); j++) {
       colj = TMatrixDColumn_const(haar,j);
       ok &= (TMath::Abs(colj*colj-1.0) <= 1.0e-15 ) ? kTRUE : kFALSE;
       for (Int_t l = j+1; l <= haar.GetColUpb(); l++) {
@@ -825,7 +827,7 @@ void stress_special_creation(Int_t dim)
     const TMatrixD haar_sub = THaarMatrixD(order,no_sub_cols);
     ok &= ( haar_sub.GetNrows() == (1<<order) &&
                haar_sub.GetNcols() == no_sub_cols ) ? kTRUE : kFALSE;
-    for (Int_t j = haar_sub.GetColLwb(); j <= haar_sub.GetColUpb(); j++) {
+    for (j = haar_sub.GetColLwb(); j <= haar_sub.GetColUpb(); j++) {
       colj = TMatrixDColumn_const(haar,j);
       coll = TMatrixDColumn_const(haar_sub,j);
       ok &= VerifyVectorIdentity(colj,coll,gVerbose);
@@ -1099,6 +1101,7 @@ void stress_mm_multiplications(Int_t msize)
 
   const Double_t epsilon = EPSILON*msize/100;
 
+  Int_t i,j;
   Bool_t ok = kTRUE;
   {
     if (gVerbose)
@@ -1116,14 +1119,14 @@ void stress_mm_multiplications(Int_t msize)
     TMatrixD m = THilbertMatrixD(msize+3,msize);
     m(1,3) = TMath::Pi();
     TVectorD v(msize);
-    for (Int_t i = v.GetLwb(); i <= v.GetUpb(); i++)
+    for (i = v.GetLwb(); i <= v.GetUpb(); i++)
       v(i) = 1+i;
     TMatrixD diag(msize,msize);
     TMatrixDDiag d = TMatrixDDiag(diag);
     d = v;
     TMatrixD eth = m;
-    for (Int_t i = eth.GetRowLwb(); i <= eth.GetRowUpb(); i++)
-      for (Int_t j = eth.GetColLwb(); j <= eth.GetColUpb(); j++)
+    for (i = eth.GetRowLwb(); i <= eth.GetRowUpb(); i++)
+      for (j = eth.GetColLwb(); j <= eth.GetColUpb(); j++)
         eth(i,j) *= v(j);
     m *= diag;
     ok &= VerifyMatrixIdentity(m,eth,gVerbose,epsilon);
@@ -1136,7 +1139,7 @@ void stress_mm_multiplications(Int_t msize)
     m(2,3) = TMath::Pi();
     TMatrixD eth = m;
     TMatrixD p(msize,msize);
-    for (Int_t i = p.GetRowLwb(); i <= p.GetRowUpb(); i++)
+    for (i = p.GetRowLwb(); i <= p.GetRowUpb(); i++)
       p(p.GetRowUpb()+p.GetRowLwb()-i,i) = 1;
     m *= p;
     m *= p;
@@ -1212,6 +1215,7 @@ void stress_sym_mm_multiplications(Int_t msize)
 
   Bool_t ok = kTRUE;
 
+  Int_t i,j;
   const Double_t epsilon = EPSILON*msize/100;
 
   {
@@ -1264,13 +1268,13 @@ void stress_sym_mm_multiplications(Int_t msize)
     m(1,3) = TMath::Pi();
     m(3,1) = TMath::Pi();
     TVectorD v(msize);
-    for (Int_t i = v.GetLwb(); i <= v.GetUpb(); i++)
+    for (i = v.GetLwb(); i <= v.GetUpb(); i++)
       v(i) = 1+i;
     TMatrixDSym diag(msize);
     (TMatrixDDiag)diag = v;
     TMatrixDSym eth = m;
-    for (Int_t i = eth.GetRowLwb(); i <= eth.GetRowUpb(); i++)
-      for (Int_t j = eth.GetColLwb(); j <= eth.GetColUpb(); j++)
+    for (i = eth.GetRowLwb(); i <= eth.GetRowUpb(); i++)
+      for (j = eth.GetColLwb(); j <= eth.GetColUpb(); j++)
         eth(i,j) *= v(j);
     TMatrixD m2 = m * diag;
     ok &= VerifyMatrixIdentity(m2,eth,gVerbose,epsilon);
@@ -1285,7 +1289,7 @@ void stress_sym_mm_multiplications(Int_t msize)
     m(3,2) = TMath::Pi();
     TMatrixDSym eth = m;
     TMatrixDSym p(msize);
-    for (Int_t i = p.GetRowLwb(); i <= p.GetRowUpb(); i++)
+    for (i = p.GetRowLwb(); i <= p.GetRowUpb(); i++)
       p(p.GetRowUpb()+p.GetRowLwb()-i,i) = 1;
     TMatrixD m2 = m * p;
     m2 *= p;
diff --git a/test/vvector.cxx b/test/vvector.cxx
index ce25b69b5aa147da0318964b8ba1ac0ce4663de7..8ce1fa2be5d42091501af2869514b41e1b15da3e 100644
--- a/test/vvector.cxx
+++ b/test/vvector.cxx
@@ -1,4 +1,4 @@
-// @(#)root/test:$Name:  $:$Id: stress_vector.cxx,v 1.14 2002/10/25 10:47:51 rdm Exp $
+// @(#)root/test:$Name:  $:$Id: vvector.cxx,v 1.16 2004/01/25 22:18:18 brun Exp $
 // Author: Fons Rademakers and Eddy Offermann  Nov 2003
 
 //////////////////////////////////////////////////////////////////////////
@@ -146,13 +146,14 @@ void stress_allocation()
     if (gVerbose)
       cout << "Check that shrinking does not change remaining elements" << endl;
     TVectorD vb(-1,20);
-    for (Int_t i = vb.GetLwb(); i <= vb.GetUpb(); i++)
+    Int_t i;
+    for (i = vb.GetLwb(); i <= vb.GetUpb(); i++)
       vb(i) = i+TMath::Pi();
     TVectorD v = vb;
     ok &= ( v == vb ) ? kTRUE : kFALSE;
     ok &= ( v != 0 ) ? kTRUE : kFALSE;
     v.ResizeTo(0,10);
-    for (Int_t i = v.GetLwb(); i <= v.GetUpb(); i++)
+    for (i = v.GetLwb(); i <= v.GetUpb(); i++)
       ok &= ( v(i) == vb(i) ) ? kTRUE : kFALSE;
     if (gVerbose)
       cout << "Check that expansion expands by zeros" << endl;
@@ -160,11 +161,11 @@ void stress_allocation()
     const Int_t old_lwb    = v.GetLwb();
     v.ResizeTo(vb);
     ok &= ( !(v == vb) ) ? kTRUE : kFALSE;
-    for (Int_t i = old_lwb; i < old_lwb+old_nelems; i++)
+    for (i = old_lwb; i < old_lwb+old_nelems; i++)
       ok &= ( v(i) == vb(i) ) ? kTRUE : kFALSE;
-    for (Int_t i = v.GetLwb(); i < old_lwb; i++)
+    for (i = v.GetLwb(); i < old_lwb; i++)
       ok &= ( v(i) == 0 ) ? kTRUE : kFALSE;
-    for (Int_t i = old_lwb+old_nelems; i <= v.GetUpb(); i++)
+    for (i = old_lwb+old_nelems; i <= v.GetUpb(); i++)
       ok &= ( v(i) == 0 ) ? kTRUE : kFALSE;
   }
 
@@ -533,7 +534,7 @@ void stress_matrix_slices(Int_t vsize)
   TVectorD vr(0,vsize+1);
   TMatrixD m(0,vsize,0,vsize+1);
 
-  Int_t i;
+  Int_t i,j;
   if (gVerbose)
     cout << "\nCheck modifying the matrix column-by-column" << endl;
   m = pattern;
@@ -558,7 +559,7 @@ void stress_matrix_slices(Int_t vsize)
     ok &= ( !( m == pattern ) && !( m != pattern ) ) ? kTRUE : kFALSE;
     {
       TMatrixDColumn mc(m,i);
-      for (Int_t j = m.GetRowLwb(); j <= m.GetRowUpb(); j++)
+      for (j = m.GetRowLwb(); j <= m.GetRowUpb(); j++)
         mc(j) *= 4;
     }
     vc = TMatrixDColumn(m,i);
@@ -592,7 +593,7 @@ void stress_matrix_slices(Int_t vsize)
     ok &= ( !( m == pattern ) && !( m != pattern ) ) ? kTRUE : kFALSE;
     {
       TMatrixDRow mr(m,i);
-      for (Int_t j = m.GetColLwb(); j <= m.GetColUpb(); j++)
+      for (j = m.GetColLwb(); j <= m.GetColUpb(); j++)
         mr(j) *= 8;
     }
     vr = TMatrixDRow(m,i);
@@ -622,7 +623,7 @@ void stress_matrix_slices(Int_t vsize)
   ok &= ( !( m == pattern ) && !( m != pattern ) ) ? kTRUE : kFALSE;
   {
     TMatrixDDiag md(m);
-    for (Int_t j = 0; j < md.GetNdiags(); j++)
+    for (j = 0; j < md.GetNdiags(); j++)
       md(j) /= 1.5;
   }
   vc = TMatrixDDiag(m);
@@ -654,7 +655,7 @@ void stress_matrix_slices(Int_t vsize)
   ok &= ( !(m1 == pattern+10) ) ? kTRUE : kFALSE;
 
   m *= TMatrixDDiag(m1);
-  for (Int_t i = m.GetColLwb(); i <= m.GetColUpb(); i++) {
+  for (i = m.GetColLwb(); i <= m.GetColUpb(); i++) {
     vc1 = TMatrixDColumn(mm,i);
     vc1 *= vr(i);                    // Do a column-wise multiplication
     vc2 = TMatrixDColumn(m,i);