diff options
| author | Marc Mueller <30130371+cdce8p@users.noreply.github.com> | 2024-07-08 18:32:30 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-08 18:32:30 (GMT) |
| commit | 31873bea471020ca5deaf735d9acb0f1abeb1d3c (patch) | |
| tree | e4518c9126183753e09fae6092535bd506bd7c9f | |
| parent | db00fee3a22db1c4b893b432c64a8123d7e92322 (diff) | |
| download | cpython-31873bea471020ca5deaf735d9acb0f1abeb1d3c.zip cpython-31873bea471020ca5deaf735d9acb0f1abeb1d3c.tar.gz cpython-31873bea471020ca5deaf735d9acb0f1abeb1d3c.tar.bz2 | |
gh-121487: Fix deprecation warning for ATOMIC_VAR_INIT in mimalloc (gh-121488)
| -rw-r--r-- | Include/internal/mimalloc/mimalloc/atomic.h | 8 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Build/2024-07-08-14-01-17.gh-issue-121487.ekHmpR.rst | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Include/internal/mimalloc/mimalloc/atomic.h b/Include/internal/mimalloc/mimalloc/atomic.h index 52f8248..cdd9c37 100644 --- a/Include/internal/mimalloc/mimalloc/atomic.h +++ b/Include/internal/mimalloc/mimalloc/atomic.h @@ -23,7 +23,9 @@ terms of the MIT license. A copy of the license can be found in the file #define _Atomic(tp) std::atomic<tp> #define mi_atomic(name) std::atomic_##name #define mi_memory_order(name) std::memory_order_##name -#if !defined(ATOMIC_VAR_INIT) || (__cplusplus >= 202002L) // c++20, see issue #571 +#if (__cplusplus >= 202002L) // c++20, see issue #571 + #define MI_ATOMIC_VAR_INIT(x) x +#elif !defined(ATOMIC_VAR_INIT) #define MI_ATOMIC_VAR_INIT(x) x #else #define MI_ATOMIC_VAR_INIT(x) ATOMIC_VAR_INIT(x) @@ -39,7 +41,9 @@ terms of the MIT license. A copy of the license can be found in the file #include <stdatomic.h> #define mi_atomic(name) atomic_##name #define mi_memory_order(name) memory_order_##name -#if !defined(ATOMIC_VAR_INIT) || (__STDC_VERSION__ >= 201710L) // c17, see issue #735 +#if (__STDC_VERSION__ >= 201710L) // c17, see issue #735 + #define MI_ATOMIC_VAR_INIT(x) x +#elif !defined(ATOMIC_VAR_INIT) #define MI_ATOMIC_VAR_INIT(x) x #else #define MI_ATOMIC_VAR_INIT(x) ATOMIC_VAR_INIT(x) diff --git a/Misc/NEWS.d/next/Build/2024-07-08-14-01-17.gh-issue-121487.ekHmpR.rst b/Misc/NEWS.d/next/Build/2024-07-08-14-01-17.gh-issue-121487.ekHmpR.rst new file mode 100644 index 0000000..e30d4dc --- /dev/null +++ b/Misc/NEWS.d/next/Build/2024-07-08-14-01-17.gh-issue-121487.ekHmpR.rst @@ -0,0 +1 @@ +Fix deprecation warning for ATOMIC_VAR_INIT in mimalloc. |