Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/single_include
diff options
context:
space:
mode:
authorMartin Hořeňovský2020-07-05 11:51:30 +0200
committerMartin Hořeňovský2020-07-05 11:51:30 +0200
commitc299133a31fb8594a5bbacc934cf30b7aabda87e (patch)
tree2a100cc02f7d5419e9fecaf23e6c0be4ec67dc13 /single_include
parent09b8017ea36b7b252f7be6ea7772e8e0773bee50 (diff)
downloadcatch3-2.12.4.tar.gz
v2.12.4v2.12.4
Diffstat (limited to 'single_include')
-rw-r--r--single_include/catch2/catch.hpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/single_include/catch2/catch.hpp b/single_include/catch2/catch.hpp
index 5ebd1a2d..b066b71d 100644
--- a/single_include/catch2/catch.hpp
+++ b/single_include/catch2/catch.hpp
@@ -1,6 +1,6 @@
/*
- * Catch v2.12.3
- * Generated: 2020-06-29 20:47:52.374964
+ * Catch v2.12.4
+ * Generated: 2020-07-05 11:47:18.451282
* ----------------------------------------------------------
* This file has been merged from multiple headers. Please don't edit it directly
* Copyright (c) 2020 Two Blue Cubes Ltd. All rights reserved.
@@ -15,7 +15,7 @@
#define CATCH_VERSION_MAJOR 2
#define CATCH_VERSION_MINOR 12
-#define CATCH_VERSION_PATCH 3
+#define CATCH_VERSION_PATCH 4
#ifdef __clang__
# pragma clang system_header
@@ -7927,7 +7927,11 @@ namespace Catch {
#ifdef CATCH_PLATFORM_MAC
- #define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
+ #if defined(__i386__) || defined(__x86_64__)
+ #define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
+ #elif defined(__aarch64__)
+ #define CATCH_TRAP() __asm__(".inst 0xd4200000")
+ #endif
#elif defined(CATCH_PLATFORM_IPHONE)
@@ -15202,7 +15206,7 @@ namespace Catch {
}
Version const& libraryVersion() {
- static Version version( 2, 12, 3, "", 0 );
+ static Version version( 2, 12, 4, "", 0 );
return version;
}