From e7989601f95b0ced3b343d270bb0b9f2267e3d78 Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Sun, 14 Jul 2024 18:27:24 -0400
Subject: [PATCH] Fix compile warnings in residfp

---
 src/sound/resid-fp/FilterModelConfig6581.cpp | 14 +++++++-------
 src/sound/resid-fp/FilterModelConfig8580.cpp | 10 +++++-----
 src/sound/resid-fp/WaveformCalculator.cpp    |  4 ++++
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/sound/resid-fp/FilterModelConfig6581.cpp b/src/sound/resid-fp/FilterModelConfig6581.cpp
index 7a80802e9..143b9e91c 100644
--- a/src/sound/resid-fp/FilterModelConfig6581.cpp
+++ b/src/sound/resid-fp/FilterModelConfig6581.cpp
@@ -131,9 +131,9 @@ FilterModelConfig6581::FilterModelConfig6581() :
         vmax);
 #endif
 
-    #pragma omp parallel sections
+//    #pragma omp parallel sections
     {
-        #pragma omp section
+//        #pragma omp section
         {
 #ifdef _OPENMP
             OpAmp opampModel(
@@ -167,7 +167,7 @@ FilterModelConfig6581::FilterModelConfig6581() :
             }
         }
 
-        #pragma omp section
+//        #pragma omp section
         {
 #ifdef _OPENMP
             OpAmp opampModel(
@@ -199,7 +199,7 @@ FilterModelConfig6581::FilterModelConfig6581() :
             }
         }
 
-        #pragma omp section
+//        #pragma omp section
         {
 #ifdef _OPENMP
             OpAmp opampModel(
@@ -230,7 +230,7 @@ FilterModelConfig6581::FilterModelConfig6581() :
             }
         }
 
-        #pragma omp section
+//        #pragma omp section
         {
 #ifdef _OPENMP
             OpAmp opampModel(
@@ -261,7 +261,7 @@ FilterModelConfig6581::FilterModelConfig6581() :
             }
         }
 
-        #pragma omp section
+//        #pragma omp section
         {
             const double nVddt = N16 * (Vddt - vmin);
 
@@ -275,7 +275,7 @@ FilterModelConfig6581::FilterModelConfig6581() :
             }
         }
 
-        #pragma omp section
+//        #pragma omp section
         {
             //  EKV model:
             //
diff --git a/src/sound/resid-fp/FilterModelConfig8580.cpp b/src/sound/resid-fp/FilterModelConfig8580.cpp
index fe294d8ce..e838a366c 100644
--- a/src/sound/resid-fp/FilterModelConfig8580.cpp
+++ b/src/sound/resid-fp/FilterModelConfig8580.cpp
@@ -143,9 +143,9 @@ FilterModelConfig8580::FilterModelConfig8580() :
         vmax);
 #endif
 
-    #pragma omp parallel sections
+//    #pragma omp parallel sections
     {
-        #pragma omp section
+//        #pragma omp section
         {
 #ifdef _OPENMP
             OpAmp opampModel(
@@ -179,7 +179,7 @@ FilterModelConfig8580::FilterModelConfig8580() :
             }
         }
 
-        #pragma omp section
+//        #pragma omp section
         {
 #ifdef _OPENMP
             OpAmp opampModel(
@@ -211,7 +211,7 @@ FilterModelConfig8580::FilterModelConfig8580() :
             }
         }
 
-        #pragma omp section
+//        #pragma omp section
         {
 #ifdef _OPENMP
             OpAmp opampModel(
@@ -242,7 +242,7 @@ FilterModelConfig8580::FilterModelConfig8580() :
             }
         }
 
-        #pragma omp section
+//        #pragma omp section
         {
 #ifdef _OPENMP
             OpAmp opampModel(
diff --git a/src/sound/resid-fp/WaveformCalculator.cpp b/src/sound/resid-fp/WaveformCalculator.cpp
index f72cf93b7..74a93cce5 100644
--- a/src/sound/resid-fp/WaveformCalculator.cpp
+++ b/src/sound/resid-fp/WaveformCalculator.cpp
@@ -68,15 +68,19 @@ static float exponentialDistance(float distance, int i)
     return pow(distance, -i);
 }
 
+#if 0
 MAYBE_UNUSED static float linearDistance(float distance, int i)
 {
     return 1.f / (1.f + i * distance);
 }
+#endif
 
+#if 0
 MAYBE_UNUSED static float quadraticDistance(float distance, int i)
 {
     return 1.f / (1.f + (i*i) * distance);
 }
+#endif
 
 /// Calculate triangle waveform
 static unsigned int triXor(unsigned int val)