From 2cc53b41f55f4eebf10e8a2cee71fa86d0e337d6 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Tue, 30 Sep 2025 17:23:23 +0200
Subject: [PATCH] Upgrade to Xcode 26

---
 UnitTests/UnitTests.xcodeproj/project.pbxproj |  4 ++--
 include/stdex/compat.hpp                      | 17 ++++++++---------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/UnitTests/UnitTests.xcodeproj/project.pbxproj b/UnitTests/UnitTests.xcodeproj/project.pbxproj
index 6305d13d2..45ed15532 100644
--- a/UnitTests/UnitTests.xcodeproj/project.pbxproj
+++ b/UnitTests/UnitTests.xcodeproj/project.pbxproj
@@ -442,7 +442,7 @@
 				GCC_WARN_UNUSED_VALUE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = ../include;
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 11.5;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -557,7 +557,7 @@
 				GCC_WARN_UNUSED_VALUE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = ../include;
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 11.5;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				OTHER_LDFLAGS = "-liconv";
diff --git a/include/stdex/compat.hpp b/include/stdex/compat.hpp
index 4d5c6dfd3..4717bd2f1 100644
--- a/include/stdex/compat.hpp
+++ b/include/stdex/compat.hpp
@@ -207,13 +207,12 @@
 #define _Unreferenced_(x) (void)(x)
 #endif
 
-#ifndef _WIN32
-template <class T, size_t N>
-size_t _countof(const T (&arr)[N])
-{
-	_Unreferenced_(arr);
-	return std::extent<T[N]>::value;
-}
+#ifndef _countof
+#ifdef ARRAY_SIZE
+#define _countof ARRAY_SIZE
+#else
+#define _countof(a) (sizeof(a) / sizeof((a)[0]))
+#endif
 #endif
 
 #ifndef _Analysis_assume_
@@ -317,11 +316,11 @@ namespace std
 		const char_type* do_scan_is(mask m, const char_type* low, const char_type* high) const;
 		const char_type* do_scan_not(mask m, const char_type* low, const char_type* high) const;
 
-		char_type do_toupper(char_type c) const { return m_ctypew.toupper(c); }
+		char_type do_toupper(char_type c) const { return static_cast<char_type>(m_ctypew.toupper(c)); }
 
 		const char_type* do_toupper(char_type* low, const char_type* high) const;
 
-		char_type do_tolower(char_type c) const { return m_ctypew.tolower(c); }
+		char_type do_tolower(char_type c) const { return static_cast<char_type>(m_ctypew.tolower(c)); }
 
 		const char_type* do_tolower(char_type* low, const char_type* high) const;
 		char_type do_widen(char) const;