From eba34b5320a8fb8c93c75c38215e0329d850523e Mon Sep 17 00:00:00 2001
From: Stephen Anthony <sa666666@gmail.com>
Date: Thu, 26 Aug 2021 19:17:18 -0230
Subject: [PATCH] Fix minor compiler warnings in g++ and clang.

---
 src/common/SDL_lib.hxx             |  1 +
 src/debugger/gui/CartARMWidget.cxx |  2 +-
 src/emucore/CartCDF.cxx            |  3 ++-
 src/emucore/CartDPCPlus.cxx        |  3 ++-
 src/emucore/Thumbulator.cxx        | 12 +++++++-----
 src/gui/PopUpWidget.cxx            |  2 +-
 6 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/common/SDL_lib.hxx b/src/common/SDL_lib.hxx
index 324709d1a..7899c9961 100644
--- a/src/common/SDL_lib.hxx
+++ b/src/common/SDL_lib.hxx
@@ -30,6 +30,7 @@
   #pragma clang diagnostic ignored "-Wdocumentation-unknown-command"
   #pragma clang diagnostic ignored "-Wimplicit-fallthrough"
   #pragma clang diagnostic ignored "-Wreserved-id-macro"
+  #pragma clang diagnostic ignored "-Wold-style-cast"
   #include <SDL.h>
   #pragma clang diagnostic pop
 #else
diff --git a/src/debugger/gui/CartARMWidget.cxx b/src/debugger/gui/CartARMWidget.cxx
index 042812041..a63223a54 100644
--- a/src/debugger/gui/CartARMWidget.cxx
+++ b/src/debugger/gui/CartARMWidget.cxx
@@ -266,7 +266,7 @@ void CartridgeARMWidget::handleArmCycles()
 {
   bool devSettings = instance().settings().getBool("dev.settings");
   bool enable = myIncCycles->getState();
-  double factor = myCycleFactor->getValue() / 100.F;
+  double factor = static_cast<double>(myCycleFactor->getValue()) / 100.0;
 
   if(devSettings)
   {
diff --git a/src/emucore/CartCDF.cxx b/src/emucore/CartCDF.cxx
index d93a3437f..1aba0ab12 100644
--- a/src/emucore/CartCDF.cxx
+++ b/src/emucore/CartCDF.cxx
@@ -107,7 +107,8 @@ CartridgeCDF::CartridgeCDF(const ByteBuffer& image, size_t size,
     static_cast<uInt32>(mySize),
     cBase, cStart, cStack,
     devSettings ? settings.getBool("dev.thumb.trapfatal") : false,
-    devSettings ? settings.getFloat("dev.thumb.cyclefactor") : 1.0,
+    devSettings ? static_cast<double>(
+      settings.getFloat("dev.thumb.cyclefactor")) : 1.0,
     thumulatorConfiguration(myCDFSubtype),
     this);
 
diff --git a/src/emucore/CartDPCPlus.cxx b/src/emucore/CartDPCPlus.cxx
index d214c06e7..7fac7dda3 100644
--- a/src/emucore/CartDPCPlus.cxx
+++ b/src/emucore/CartDPCPlus.cxx
@@ -57,7 +57,8 @@ CartridgeDPCPlus::CartridgeDPCPlus(const ByteBuffer& image, size_t size,
       0x00000C08,
       0x40001FDC,
        devSettings ? settings.getBool("dev.thumb.trapfatal") : false,
-       devSettings ? settings.getFloat("dev.thumb.cyclefactor") : 1.0,
+       devSettings ? static_cast<double>(
+          settings.getFloat("dev.thumb.cyclefactor")) : 1.0,
        Thumbulator::ConfigureFor::DPCplus,
        this);
 
diff --git a/src/emucore/Thumbulator.cxx b/src/emucore/Thumbulator.cxx
index 239653db7..6168a5a02 100644
--- a/src/emucore/Thumbulator.cxx
+++ b/src/emucore/Thumbulator.cxx
@@ -74,13 +74,13 @@ using Common::Base;
   #define INC_LDR_CYCLES                 \
     INC_N_CYCLES(rb, AccessType::data);  \
     INC_I_CYCLES; \
-    //FETCH_TYPE(CycleType::N, AccessType::data); \
-    //FETCH_TYPE_N;
+    /*FETCH_TYPE(CycleType::N, AccessType::data); \
+      FETCH_TYPE_N;*/
   #define INC_LDRB_CYCLES                       \
     INC_N_CYCLES(rb & (~1U), AccessType::data); \
     INC_I_CYCLES; \
-    //FETCH_TYPE(CycleType::N, AccessType::data); \
-    //FETCH_TYPE_N;
+    /*FETCH_TYPE(CycleType::N, AccessType::data); \
+      FETCH_TYPE_N;*/
 
   #define INC_STR_CYCLES                 \
     INC_N_CYCLES(rb, AccessType::data);  \
@@ -91,9 +91,11 @@ using Common::Base;
     FETCH_TYPE_N; \
     //INC_N_CYCLES(rb & (~1U), AccessType::data);
 
+#if 0 // unused for now
   #define FETCH_TYPE(cycleType, accessType) \
     _prefetchCycleType[_pipeIdx] = cycleType; \
     _prefetchAccessType[_pipeIdx] = accessType
+#endif
   #define FETCH_TYPE_N                          \
     _prefetchCycleType[_pipeIdx] = CycleType::N
 
@@ -290,7 +292,7 @@ uInt32 Thumbulator::fetch16(uInt32 addr)
   uInt32 data;
 
 #ifdef THUMB_CYCLE_COUNT
-  _pipeIdx = (++_pipeIdx) % 3;
+  _pipeIdx = (_pipeIdx+1) % 3;
 
 #ifdef MERGE_I_S
   if(_lastCycleType[2] == CycleType::I)
diff --git a/src/gui/PopUpWidget.cxx b/src/gui/PopUpWidget.cxx
index c398374be..33e4283ca 100644
--- a/src/gui/PopUpWidget.cxx
+++ b/src/gui/PopUpWidget.cxx
@@ -40,7 +40,7 @@ PopUpWidget::PopUpWidget(GuiObject* boss, const GUI::Font& font,
   _textcolorhi = kTextColor;  // do not highlight the label
 
   setTextFilter([](char c) {
-    return isprint(c) && c != '\"' || c == '\x1c' || c == '\x1d'; // DEGREE || ELLIPSIS
+    return (isprint(c) && c != '\"') || c == '\x1c' || c == '\x1d'; // DEGREE || ELLIPSIS
   });
   setEditable(false);