From 73139b6521be0130adde29fed87edf1b0e0c876b Mon Sep 17 00:00:00 2001
From: Stephen Anthony <sa666666@gmail.com>
Date: Fri, 25 Jun 2021 15:40:06 -0230
Subject: [PATCH] Fix minor warnings from g++10.3.

---
 src/emucore/CartARM.hxx     | 4 ++--
 src/emucore/Thumbulator.cxx | 8 ++++++++
 src/emucore/Thumbulator.hxx | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/emucore/CartARM.hxx b/src/emucore/CartARM.hxx
index 5b176803c..36df98cef 100644
--- a/src/emucore/CartARM.hxx
+++ b/src/emucore/CartARM.hxx
@@ -71,8 +71,8 @@ class CartridgeARM : public Cartridge
   #ifdef DEBUGGER_SUPPORT
     const Thumbulator::Stats& stats() const { return myStats; }
     const Thumbulator::Stats& prevStats() const { return myPrevStats; }
-    const uInt32 cycles() const { return myCycles; }
-    const uInt32 prevCycles() const { return myPrevCycles; }
+    uInt32 cycles() const { return myCycles; }
+    uInt32 prevCycles() const { return myPrevCycles; }
   #endif
 
     void incCycles(bool enable);
diff --git a/src/emucore/Thumbulator.cxx b/src/emucore/Thumbulator.cxx
index b9d618902..92402a6dc 100644
--- a/src/emucore/Thumbulator.cxx
+++ b/src/emucore/Thumbulator.cxx
@@ -243,9 +243,13 @@ uInt32 Thumbulator::fetch16(uInt32 addr)
 
 #ifdef THUMB_CYCLE_COUNT
   if(_fetchCycleType == CycleType::S)
+  {
     INC_S_CYCLES(addr, AccessType::prefetch);
+  }
   else
+  {
     INC_N_CYCLES(addr, AccessType::prefetch);
+  }
   _fetchCycleType = CycleType::S;
 #endif
 
@@ -2689,6 +2693,10 @@ int Thumbulator::execute()
       return 0;
     }
 
+    // Silence compiler
+    case Op::numOps:
+      break;
+
 #ifndef UNSAFE_OPTIMIZATIONS
     case Op::invalid:
       break;
diff --git a/src/emucore/Thumbulator.hxx b/src/emucore/Thumbulator.hxx
index 99a1fb926..141879d9a 100644
--- a/src/emucore/Thumbulator.hxx
+++ b/src/emucore/Thumbulator.hxx
@@ -107,7 +107,7 @@ class Thumbulator
     string run(uInt32& cycles, bool irqDrivenAudio);
     void enableCycleCount(bool enable) { _countCycles = enable; }
     const Stats& stats() const { return _stats; }
-    const uInt32 cycles() const { return _totalCycles; }
+    uInt32 cycles() const { return _totalCycles; }
     void setChipType(ChipType type);
     void setMamMode(MamModeType mode) { mamcr = mode; }
     void lockMamMode(bool lock) { _lockMamcr = lock; }