diff options
| author | Martin Hořeňovský | 2025-12-28 21:02:50 +0100 |
|---|---|---|
| committer | Martin Hořeňovský | 2025-12-28 21:02:50 +0100 |
| commit | 970ec144f56d78703c51d08a855844e91c8560a8 (patch) | |
| tree | d8d2f3e784c6c2c230b7b7171dbd32f830504f45 /src | |
| parent | eb3811c555eccd2de8b63ba16e0f62c444970acf (diff) | |
| download | catch3-970ec144f56d78703c51d08a855844e91c8560a8.tar.gz | |
Thread safety in assertions is no longer experimental
Diffstat (limited to 'src')
| -rw-r--r-- | src/catch2/catch_user_config.hpp.in | 10 | ||||
| -rw-r--r-- | src/catch2/internal/catch_thread_local.hpp | 2 | ||||
| -rw-r--r-- | src/catch2/internal/catch_thread_support.hpp | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/catch2/catch_user_config.hpp.in b/src/catch2/catch_user_config.hpp.in index 18e2ef1a..9379e1a1 100644 --- a/src/catch2/catch_user_config.hpp.in +++ b/src/catch2/catch_user_config.hpp.in @@ -196,12 +196,12 @@ #endif -#cmakedefine CATCH_CONFIG_EXPERIMENTAL_THREAD_SAFE_ASSERTIONS -#cmakedefine CATCH_CONFIG_NO_EXPERIMENTAL_THREAD_SAFE_ASSERTIONS +#cmakedefine CATCH_CONFIG_THREAD_SAFE_ASSERTIONS +#cmakedefine CATCH_CONFIG_NO_THREAD_SAFE_ASSERTIONS -#if defined( CATCH_CONFIG_EXPERIMENTAL_THREAD_SAFE_ASSERTIONS ) && \ - defined( CATCH_CONFIG_NO_EXPERIMENTAL_THREAD_SAFE_ASSERTIONS ) -# error Cannot force EXPERIMENTAL_THREAD_SAFE_ASSERTIONS to both ON and OFF +#if defined( CATCH_CONFIG_THREAD_SAFE_ASSERTIONS ) && \ + defined( CATCH_CONFIG_NO_THREAD_SAFE_ASSERTIONS ) +# error Cannot force THREAD_SAFE_ASSERTIONS to both ON and OFF #endif diff --git a/src/catch2/internal/catch_thread_local.hpp b/src/catch2/internal/catch_thread_local.hpp index b1ea2f61..83213a44 100644 --- a/src/catch2/internal/catch_thread_local.hpp +++ b/src/catch2/internal/catch_thread_local.hpp @@ -10,7 +10,7 @@ #include <catch2/catch_user_config.hpp> -#if defined( CATCH_CONFIG_EXPERIMENTAL_THREAD_SAFE_ASSERTIONS ) +#if defined( CATCH_CONFIG_THREAD_SAFE_ASSERTIONS ) #define CATCH_INTERNAL_THREAD_LOCAL thread_local #else #define CATCH_INTERNAL_THREAD_LOCAL diff --git a/src/catch2/internal/catch_thread_support.hpp b/src/catch2/internal/catch_thread_support.hpp index 69e50c06..5d76ea32 100644 --- a/src/catch2/internal/catch_thread_support.hpp +++ b/src/catch2/internal/catch_thread_support.hpp @@ -10,7 +10,7 @@ #include <catch2/catch_user_config.hpp> -#if defined( CATCH_CONFIG_EXPERIMENTAL_THREAD_SAFE_ASSERTIONS ) +#if defined( CATCH_CONFIG_THREAD_SAFE_ASSERTIONS ) # include <atomic> # include <mutex> #endif @@ -19,7 +19,7 @@ namespace Catch { namespace Detail { -#if defined( CATCH_CONFIG_EXPERIMENTAL_THREAD_SAFE_ASSERTIONS ) +#if defined( CATCH_CONFIG_THREAD_SAFE_ASSERTIONS ) using Mutex = std::mutex; using LockGuard = std::lock_guard<std::mutex>; struct AtomicCounts { |