From f31788b8f7575f0c70d718094abd9eb878efee79 Mon Sep 17 00:00:00 2001
From: Tom Maisey <tommaisey@gmail.com>
Date: Fri, 6 Jun 2025 09:29:38 +0100
Subject: [PATCH 1/3] Fix Apple SDK comparison (140000 should have been 101400)

---
 include/realtime_memory/pmr_includes.h | 36 +++++++++++++++-----------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/include/realtime_memory/pmr_includes.h b/include/realtime_memory/pmr_includes.h
index 0ebd07b..8d2b170 100644
--- a/include/realtime_memory/pmr_includes.h
+++ b/include/realtime_memory/pmr_includes.h
@@ -4,28 +4,34 @@
 #include <vector>
 
 #if defined (__apple_build_version__)
- #define USE_EXPERIMENTAL_PMR __apple_build_version__ < 15000000 || __MAC_OS_X_VERSION_MIN_REQUIRED < 140000
-#elif defined (__clang__)
- #define USE_EXPERIMENTAL_PMR _LIBCPP_VERSION < 1600
+  #if (__apple_build_version__ < 1500000)
+    #define USE_EXPERIMENTAL_PMR 1
+  #elif defined (__MAC_OS_X_VERSION_MIN_REQUIRED) && (__MAC_OS_X_VERSION_MIN_REQUIRED < 101400)
+    #define USE_EXPERIMENTAL_PMR 1
+  #else
+    #define USE_EXPERIMENTAL_PMR 0
+  #endif
+#elif defined (__clang__) && (_LIBCPP_VERSION < 1600)
+  #define USE_EXPERIMENTAL_PMR 1
 #else
- #define USE_EXPERIMENTAL_PMR 0
+  #define USE_EXPERIMENTAL_PMR 0
 #endif
 
 #if USE_EXPERIMENTAL_PMR
- #include <experimental/memory_resource>
- namespace std_pmr = std::experimental::pmr;
+  #include <experimental/memory_resource>
+  namespace std_pmr = std::experimental::pmr;
 #else
- #include <memory_resource>
- namespace std_pmr = std::pmr;
+  #include <memory_resource>
+  namespace std_pmr = std::pmr;
 #endif
 
 #if defined (__apple_build_version__) && USE_EXPERIMENTAL_PMR
- #define PMR_DIAGNOSTIC_PUSH \
-  _Pragma("clang diagnostic push") \
-  _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"")
- #define PMR_DIAGNOSTIC_POP \
-  _Pragma("clang diagnostic pop")
+  #define PMR_DIAGNOSTIC_PUSH \
+     _Pragma("clang diagnostic push") \
+      _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"")
+  #define PMR_DIAGNOSTIC_POP \
+     _Pragma("clang diagnostic pop")
 #else
- #define PMR_DIAGNOSTIC_PUSH
- #define PMR_DIAGNOSTIC_POP
+  #define PMR_DIAGNOSTIC_PUSH
+  #define PMR_DIAGNOSTIC_POP
 #endif

From 354d7c71dcedd38cd5b69303ca26fa9b8aab9db5 Mon Sep 17 00:00:00 2001
From: Tom Maisey <tommaisey@gmail.com>
Date: Fri, 6 Jun 2025 09:44:41 +0100
Subject: [PATCH 2/3] Update Catch2 version to fix build error

---
 tests/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index b466d7b..cd9d645 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.12)
 Include(FetchContent)
 FetchContent_Declare(Catch2
   GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-  GIT_TAG        v3.0.1) # or a later release
+  GIT_TAG        v3.8.1) # or a later release
 FetchContent_MakeAvailable(Catch2)
 
 add_executable(realtime_memory_tests

From 0692afd3ef93300ffb03249f51fcbe57d97d20b5 Mon Sep 17 00:00:00 2001
From: Tom Maisey <tommaisey@gmail.com>
Date: Fri, 6 Jun 2025 09:53:39 +0100
Subject: [PATCH 3/3] Other build error fixes

---
 include/realtime_memory/pmr_includes.h | 3 +++
 tests/resource_tests.cpp               | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/include/realtime_memory/pmr_includes.h b/include/realtime_memory/pmr_includes.h
index 8d2b170..17c432a 100644
--- a/include/realtime_memory/pmr_includes.h
+++ b/include/realtime_memory/pmr_includes.h
@@ -1,8 +1,11 @@
 #include <algorithm>
 #include <atomic>
 #include <cassert>
+#include <stdexcept>
+#include <utility>
 #include <vector>
 
+
 #if defined (__apple_build_version__)
   #if (__apple_build_version__ < 1500000)
     #define USE_EXPERIMENTAL_PMR 1
diff --git a/tests/resource_tests.cpp b/tests/resource_tests.cpp
index 4cb0fe9..860ec8c 100644
--- a/tests/resource_tests.cpp
+++ b/tests/resource_tests.cpp
@@ -2,6 +2,8 @@
 // Copyright (c) 2019-2023 CradleApps, LLC - All Rights Reserved
 //==============================================================================
 
+#include <numeric>
+#include <random>
 #include <unordered_set>
 #include <unordered_map>