Progmasoft Git

catch3

Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.

Clonegit clone https://git.progmasoft.com/catch3

Fix linker error in catch_debugger.hpp on iOS on ARM that occurs trying to use assembly for Intel because CATCH_PLATFORM_MAC is defined.

Define CATCH_PLATFORM_MAC using #if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) instead of #if defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__).

Add new CATCH_PLATFORM_IPHONE defined using #elif  defined(__IPHONE_OS_VERSION_MIN_REQUIRED) for future use. The BreakIntoDebugger and isDebuggerActive functions remain without implementations for iOS.
Commit
aa648bd690a14867005a794c94eaa2b35c4cf3ca
Author
herringbanger@gmail.com ·
Parents
fd78e0f6df4b

Files · Download .tar.gz

Changes

 include/internal/catch_debugger.hpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/internal/catch_debugger.hpp b/include/internal/catch_debugger.hpp
index 9986ecf4..64383b46 100644
--- a/include/internal/catch_debugger.hpp
+++ b/include/internal/catch_debugger.hpp
@@ -16,8 +16,10 @@
 
 #include <iostream>
 
-#if defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
+#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
 #define CATCH_PLATFORM_MAC
+#elif  defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+#define CATCH_PLATFORM_IPHONE
 #elif defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER)
 #define CATCH_PLATFORM_WINDOWS
 #endif