From a5e2bfa444c88c83f5d3a1618df2b47751d93f49 Mon Sep 17 00:00:00 2001
From: Chris Cannam <cannam@all-day-breakfast.com>
Date: Tue, 20 Sep 2022 09:30:48 +0100
Subject: [PATCH] Fix some (benign) shadowing warnings

---
 src/common/Window.h        | 19 ++++++++++++-------
 src/common/sysutils.h      |  6 +++---
 src/faster/R2Stretcher.cpp |  4 ++--
 src/finer/Guide.h          |  4 ++--
 src/finer/PhaseAdvance.h   |  6 +++---
 5 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/common/Window.h b/src/common/Window.h
index 2800c7e..7364948 100644
--- a/src/common/Window.h
+++ b/src/common/Window.h
@@ -121,22 +121,25 @@ void Window<T>::encache()
 
     const int n = m_size;
     v_set(m_cache, T(1.0), n);
-    int i;
 
     switch (m_type) {
 		
     case RectangularWindow:
-	for (i = 0; i < n; ++i) {
+    {
+	for (int i = 0; i < n; ++i) {
 	    m_cache[i] *= 0.5;
 	}
 	break;
+    }
 	    
     case BartlettWindow:
-	for (i = 0; i < n/2; ++i) {
+    {
+	for (int i = 0; i < n/2; ++i) {
 	    m_cache[i] *= (i / T(n/2));
 	    m_cache[i + n/2] *= (1.0 - (i / T(n/2)));
 	}
 	break;
+    }
 	    
     case HammingWindow:
         cosinewin(m_cache, 0.54, 0.46, 0.0, 0.0);
@@ -151,20 +154,22 @@ void Window<T>::encache()
 	break;
 	    
     case GaussianWindow:
-	for (i = 0; i < n; ++i) {
+    {
+	for (int i = 0; i < n; ++i) {
             m_cache[i] *= pow(2, - pow((i - (n-1)/2.0) / ((n-1)/2.0 / 3), 2));
 	}
 	break;
+    }
 	    
     case ParzenWindow:
     {
         int N = n-1;
-        for (i = 0; i < N/4; ++i) {
+        for (int i = 0; i < N/4; ++i) {
             T m = 2 * pow(1.0 - (T(N)/2 - i) / (T(N)/2), 3);
             m_cache[i] *= m;
             m_cache[N-i] *= m;
         }
-        for (i = N/4; i <= N/2; ++i) {
+        for (int i = N/4; i <= N/2; ++i) {
             int wn = i - N/2;
             T m = 1.0 - 6 * pow(wn / (T(N)/2), 2) * (1.0 - abs(wn) / (T(N)/2));
             m_cache[i] *= m;
@@ -241,7 +246,7 @@ void Window<T>::encache()
     }
 	
     m_area = 0;
-    for (i = 0; i < n; ++i) {
+    for (int i = 0; i < n; ++i) {
         m_area += m_cache[i];
     }
     m_area /= n;
diff --git a/src/common/sysutils.h b/src/common/sysutils.h
index 224bf5e..f4ccebb 100644
--- a/src/common/sysutils.h
+++ b/src/common/sysutils.h
@@ -108,9 +108,9 @@ void gettimeofday(struct timeval *p, void *tz);
 
 #ifdef _WIN32
 
-#define MLOCK(a,b)   1
-#define MUNLOCK(a,b) 1
-#define MUNLOCK_SAMPLEBLOCK(a) 1
+#define MLOCK(a,b)   (void)1
+#define MUNLOCK(a,b) (void)1
+#define MUNLOCK_SAMPLEBLOCK(a) (void)1
 
 namespace RubberBand {
 extern void system_memorybarrier();
diff --git a/src/faster/R2Stretcher.cpp b/src/faster/R2Stretcher.cpp
index f0a53ef..9c8356d 100644
--- a/src/faster/R2Stretcher.cpp
+++ b/src/faster/R2Stretcher.cpp
@@ -369,9 +369,9 @@ size_t
 R2Stretcher::roundUp(size_t value)
 {
     if (!(value & (value - 1))) return value;
-    int bits = 0;
+    size_t bits = 0;
     while (value) { ++bits; value >>= 1; }
-    value = 1 << bits;
+    value = size_t(1) << bits;
     return value;
 }
 
diff --git a/src/finer/Guide.h b/src/finer/Guide.h
index 83667b4..86edb4a 100644
--- a/src/finer/Guide.h
+++ b/src/finer/Guide.h
@@ -465,9 +465,9 @@ protected:
     int roundUp(int value) const {
         if (value < 1) return 1;
         if (!(value & (value - 1))) return value;
-        int bits = 0;
+        size_t bits = 0;
         while (value) { ++bits; value >>= 1; }
-        value = 1 << bits;
+        value = size_t(1) << bits;
         return value;
     }
 
diff --git a/src/finer/PhaseAdvance.h b/src/finer/PhaseAdvance.h
index 6015a22..d9b5f85 100644
--- a/src/finer/PhaseAdvance.h
+++ b/src/finer/PhaseAdvance.h
@@ -100,13 +100,13 @@ public:
         Profiler profiler("GuidedPhaseAdvance::advance");
         
         int myFftBand = 0;
-        int i = 0;
+        int bandi = 0;
         for (const auto &fband : guidance[0]->fftBands) {
             if (fband.fftSize == m_parameters.fftSize) {
-                myFftBand = i;
+                myFftBand = bandi;
                 break;
             }
-            ++i;
+            ++bandi;
         }
 
         int bs = m_parameters.fftSize / 2 + 1;