add extra { } around for loops so the code is now agnostic

with regards to modern vs archaic for-loop declaration scope


git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/AHFinderDirect/trunk@773 f88db872-0e4f-0410-b76b-b9085cfa78c5

3 files changed, 34 insertions, 0 deletions

diff --git a/src/jtutil/test_array.cc b/src/jtutil/test_array.cc
index 1f4a001..cf13c6d 100644
--- a/src/jtutil/test_array.cc
+++ b/src/jtutil/test_array.cc
@@ -110,16 +110,19 @@ assert(A.N_i() == jtutil::how_many_in_range(min_i, max_i));
 printf("assigning values...\n");
 #define VALUE_1D(ix)	\
 		double(1000.0 + ix + delta)
+	  {
 	for (int i = min_i ; i <= max_i ; ++i)
 	{
 	if (print_flag)
 	   then printf("   assigning %d\n", i);
 	A(i) = VALUE_1D(i);
 	}
+	  }
 
 printf("checking N-D vs 1-D addresses...\n");
 const double* array_ptr = A.data_array();
 int sub = 0;
+	  {
 	for (int i = min_i ; i <= max_i ; ++i)
 	{
 	if (print_flag)
@@ -127,11 +130,13 @@ int sub = 0;
 	assert( &A(i) == &array_ptr[sub] );
 	sub += stride;
 	}
+	  }
 assert( A.N_array() == sub );
 assert( A.subscript_stride_i() == &A(min_i+1) - &A(min_i) );
 
 printf("checking what changes when we assign an array element...\n");
 double sumsq_of_diff = 0.0;
+	  {
 	for (int i = min_i ; i <= max_i ; ++i)
 	{
 	if (print_flag)
@@ -153,6 +158,7 @@ double sumsq_of_diff = 0.0;
 		}
 	A(i) = save_a;
 	}
+	  }
 double RMS_diff = sqrt(sumsq_of_diff / A.N_array());
 printf("==> everything looks ok (RMS_diff=%.3g)\n", double(RMS_diff));
 
@@ -220,6 +226,7 @@ assert(A.N_j() == jtutil::how_many_in_range(min_j, max_j));
 printf("assigning values...\n");
 #define VALUE_2D(ix,jx)	\
 		float(1000.0 + 10.0*jx + ix + delta)
+	  {
 	for (int i = min_i ; i <= max_i ; ++i)
 	{
 	for (int j = min_j ; j <= max_j ; ++j)
@@ -229,10 +236,12 @@ printf("assigning values...\n");
 	A(i,j) = VALUE_2D(i,j);
 	}
 	}
+	  }
 
 printf("checking N-D vs 1-D addresses...\n");
 const float* array_ptr = A.data_array();
 int sub = 0;
+	  {
 	for (int i = min_i ; i <= max_i ; ++i)
 	{
 	for (int j = min_j ; j <= max_j ; ++j)
@@ -243,12 +252,14 @@ int sub = 0;
 	sub += stride;
 	}
 	}
+	  }
 assert( A.N_array() == sub );
 assert( A.subscript_stride_i() == &A(min_i+1,min_j) - &A(min_i,min_j) );
 assert( A.subscript_stride_j() == &A(min_i,min_j+1) - &A(min_i,min_j) );
 
 printf("checking what changes when we assign an array element...\n");
 double sumsq_of_diff = 0.0;
+	  {
 	for (int i = min_i ; i <= max_i ; ++i)
 	{
 	for (int j = min_j ; j <= max_j ; ++j)
@@ -276,6 +287,7 @@ double sumsq_of_diff = 0.0;
 	A(i,j) = save_a;
 	}
 	}
+	  }
 double RMS_diff = sqrt(sumsq_of_diff / A.N_array());
 printf("==> everything looks ok (RMS_diff=%.3g)\n", double(RMS_diff));
 
@@ -348,6 +360,7 @@ assert(A.N_k() == jtutil::how_many_in_range(min_k, max_k));
 printf("assigning values...\n");
 #define VALUE_3D(ix,jx,kx)	\
 		double(1000.0 + 100.0*kx + 10.0*jx + ix + delta)
+	  {
 	for (int i = min_i ; i <= max_i ; ++i)
 	{
 	for (int j = min_j ; j <= max_j ; ++j)
@@ -360,10 +373,12 @@ printf("assigning values...\n");
 	}
 	}
 	}
+	  }
 
 printf("checking N-D vs 1-D addresses...\n");
 const double* array_ptr = A.data_array();
 int sub = 0;
+	  {
 	for (int i = min_i ; i <= max_i ; ++i)
 	{
 	for (int j = min_j ; j <= max_j ; ++j)
@@ -377,6 +392,7 @@ int sub = 0;
 	}
 	}
 	}
+	  }
 assert(sub == A.N_array());
 assert( A.subscript_stride_i()
 	== &A(min_i+1,min_j,min_k) - &A(min_i,min_j,min_k) );
@@ -387,6 +403,7 @@ assert( A.subscript_stride_k()
 
 printf("checking which things change when we assign an array element...\n");
 double sumsq_of_diff = 0.0;
+	  {
 	for (int i = min_i ; i <= max_i ; ++i)
 	{
 	for (int j = min_j ; j <= max_j ; ++j)
@@ -420,6 +437,7 @@ double sumsq_of_diff = 0.0;
 	}
 	}
 	}
+	  }
 double RMS_diff = sqrt(sumsq_of_diff / A.N_array());
 printf("==> everything looks ok (RMS_diff=%.3g)\n", RMS_diff);
 
@@ -497,6 +515,7 @@ assert(A.N_l() == jtutil::how_many_in_range(min_l, max_l));
 printf("assigning values...\n");
 #define VALUE_4D(ix,jx,kx,lx)	\
 		double(10000.0 + 1000.0*kx + 100.0*jx + 10.0*ix + lx + delta)
+	  {
 	for (int i = min_i ; i <= max_i ; ++i)
 	{
 	for (int j = min_j ; j <= max_j ; ++j)
@@ -512,10 +531,12 @@ printf("assigning values...\n");
 	}
 	}
 	}
+	  }
 
 printf("checking N-D vs 1-D addresses...\n");
 const double* array_ptr = A.data_array();
 int sub = 0;
+	  {
 	for (int i = min_i ; i <= max_i ; ++i)
 	{
 	for (int j = min_j ; j <= max_j ; ++j)
@@ -532,6 +553,7 @@ int sub = 0;
 	}
 	}
 	}
+	  }
 assert(sub == A.N_array());
 assert( A.subscript_stride_i()
 	== &A(min_i+1,min_j,min_k,min_l) - &A(min_i,min_j,min_k,min_l) );
@@ -544,6 +566,7 @@ assert( A.subscript_stride_l()
 
 printf("checking which things change when we assign an array element...\n");
 double sumsq_of_diff = 0.0;
+	  {
 	for (int i = min_i ; i <= max_i ; ++i)
 	{
 	for (int j = min_j ; j <= max_j ; ++j)
@@ -584,6 +607,7 @@ double sumsq_of_diff = 0.0;
 	}
 	}
 	}
+	  }
 double RMS_diff = sqrt(sumsq_of_diff / A.N_array());
 printf("==> everything looks ok (RMS_diff=%.3g)\n", RMS_diff);
 
diff --git a/src/jtutil/test_array2.cc b/src/jtutil/test_array2.cc
index 6410c52..9015cbd 100644
--- a/src/jtutil/test_array2.cc
+++ b/src/jtutil/test_array2.cc
@@ -17,6 +17,7 @@ int main()
 const int imin = 3, imax = 7, jmin = 10, jmax = 12;
 jtutil::array2d<double> A(imin,imax, jmin,jmax);
 
+	  {
 	for (int i = imin ; i <= imax ; ++i)
 	{
 	for (int j = jmin ; j <= jmax ; ++j)
@@ -24,6 +25,7 @@ jtutil::array2d<double> A(imin,imax, jmin,jmax);
 	A(i,j) = i*j;
 	}
 	}
+	  }
 
  print(A);
 cprint(A);
@@ -32,6 +34,7 @@ cprint(A);
 void print(jtutil::array2d<double>& Aref)
 {
 printf("=== nonconst ===\n");
+	  {
 	for (int i = Aref.min_i() ; i <= Aref.max_i() ; ++i)
 	{
 	for (int j = Aref.min_j() ; j <= Aref.max_j() ; ++j)
@@ -40,11 +43,13 @@ printf("=== nonconst ===\n");
 	       i, j, Aref(i,j), &Aref(i,j));
 	}
 	}
+	  }
 }
 
 void cprint(const jtutil::array2d<double>& Aref)
 {
 printf("=== const ===\n");
+	  {
 	for (int i = Aref.min_i() ; i <= Aref.max_i() ; ++i)
 	{
 	for (int j = Aref.min_j() ; j <= Aref.max_j() ; ++j)
@@ -53,4 +58,5 @@ printf("=== const ===\n");
 	       i, j, Aref(i,j), &Aref(i,j));
 	}
 	}
+	  }
 }
diff --git a/src/jtutil/test_linear_map.cc b/src/jtutil/test_linear_map.cc
index e756a7a..1243cc6 100644
--- a/src/jtutil/test_linear_map.cc
+++ b/src/jtutil/test_linear_map.cc
@@ -78,6 +78,7 @@ assert( fuzzy<double>::EQ(lm.clamp(max_fp +   0.4*delta_fp), max_fp) );
 assert( fuzzy<double>::EQ(lm.clamp(max_fp + 100.0*delta_fp), max_fp) );
 
 printf("checking delta roundings...\n");
+      {
     for (int i = 1 ; i <= 3 ; ++i)
     {
     printf("   testing i = %d...\n", i);
@@ -95,12 +96,14 @@ printf("checking delta roundings...\n");
     assert( lm.delta_int_of_delta_fp((di+0.01)*delta_fp, lm.round  ) == i   );
     assert( lm.delta_int_of_delta_fp((di+0.01)*delta_fp, lm.ceiling) == i+1 );
     }
+      }
 
 printf("this should produce a pair of warning messages...\n");
 assert( lm.delta_int_of_delta_fp(2.99*delta_fp, lm.warning) == 3 );
 assert( lm.delta_int_of_delta_fp(3.01*delta_fp, lm.warning) == 3 );
 
 printf("checking mappings...\n");
+  {
 int i;		// must declare these outside loop
 double x;	// because we have *two* loop variables!
 	for (i = min_int, x = min_fp ;
@@ -142,6 +145,7 @@ double x;	// because we have *two* loop variables!
 	assert( lm.zero_origin_int(i) == i - min_int );
 	assert( lm.map_int(lm.zero_origin_int(i)) == i );
 	}
+  }
 
 printf("this should produce a pair of warning messages...\n");
 assert( lm.int_of_fp(min_fp + 0.01*delta_fp,