From 69b300b6f9d46c4f9caa2df1f848a74163cd1173 Mon Sep 17 00:00:00 2001
From: Stephen Anthony <sa666666@gmail.com>
Date: Sun, 30 Jun 2024 11:29:29 -0230
Subject: [PATCH 1/2] Fix file permissions.

---
 src/emucore/CartDetector.cxx | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 src/emucore/CartDetector.cxx

diff --git a/src/emucore/CartDetector.cxx b/src/emucore/CartDetector.cxx
old mode 100755
new mode 100644

From 56e6bd69bc070f1d31e13610f1a7ebb1ca8bacbf Mon Sep 17 00:00:00 2001
From: Stephen Anthony <sa666666@gmail.com>
Date: Tue, 30 Jul 2024 16:42:48 -0230
Subject: [PATCH 2/2] Use std::clamp.

---
 src/common/bspf.hxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/bspf.hxx b/src/common/bspf.hxx
index f3a155a7a..6bb34d308 100644
--- a/src/common/bspf.hxx
+++ b/src/common/bspf.hxx
@@ -167,7 +167,7 @@ namespace BSPF
   // if it is outside the specified range
   template<typename T> inline constexpr T clamp(T val, T lower, T upper)
   {
-    return (val < lower) ? lower : (val > upper) ? upper : val;
+    return std::clamp<T>(val, lower, upper);
   }
   template<typename T> inline constexpr void clamp(T& val, T lower, T upper, T setVal)
   {