Removed shadowed variables and added compiler flag to prevent their appearance.

configure.ac

@@ -466,7 +466,7 @@ if test "$enable_warn" != "no"; then
     # We will do this by hand instead and only default to the macro for unknown compilers
     case "$ax_cv_c_compiler_vendor" in
           gnu | clang)
-             CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter"
+             CFLAGS="$CFLAGS -Wall -Wextra -Wshadow -Wno-unused-parameter"
           ;;
 	  intel)
              CFLAGS="$CFLAGS -w2 -Wunused-variable"

src/queue.c

@@ -188,7 +188,7 @@ struct task *queue_gettask(struct queue *q, const struct task *prev,
   /* Set some pointers we will use often. */
   int *qtid = q->tid;
   struct task *qtasks = q->tasks;
-  const int qcount = q->count;
+  const int old_qcount = q->count;
 
   /* Data for the sliding window in which to try the task with the
      best overlap with the previous task. */
@@ -201,7 +201,7 @@ struct task *queue_gettask(struct queue *q, const struct task *prev,
   int ind = -1;
 
   /* Loop over the queue entries. */
-  for (int k = 0; k < qcount; k++) {
+  for (int k = 0; k < old_qcount; k++) {
     if (k < queue_search_window) {
       window[window_count].ind = k;
       window[window_count].tid = qtid[k];

tests/test125cells.c

@@ -564,7 +564,7 @@ int main(int argc, char *argv[]) {
 
   /* Start the test */
   ticks time = 0;
-  for (size_t i = 0; i < runs; ++i) {
+  for (size_t n = 0; n < runs; ++n) {
 
     const ticks tic = getticks();
 
@@ -642,7 +642,7 @@ int main(int argc, char *argv[]) {
     time += toc - tic;
 
     /* Dump if necessary */
-    if (i == 0) {
+    if (n == 0) {
       sprintf(outputFileName, "swift_dopair_125_%s.dat",
               outputFileNameExtension);
       dump_particle_fields(outputFileName, main_cell, solution, 0);