| From a2d25dedaa31ac0384b7d7a94c021da0fa92c769 Mon Sep 17 00:00:00 2001 |
| From: Yi Kong <yikong@google.com> |
| Date: Thu, 23 May 2024 16:38:49 +0900 |
| Subject: [PATCH] Revert "[libc++] Fix diagnostic for <stdatomic.h> before |
| C++23 (#83351)" |
| |
| This reverts commit 40081a45a14f7aa6249fa034d961549c0b1762a0. |
| --- |
| libcxx/include/atomic | 11 +++++------ |
| 1 file changed, 5 insertions(+), 6 deletions(-) |
| |
| diff --git a/libcxx/include/atomic b/libcxx/include/atomic |
| index cb142b09bff3..61ff61d415dd 100644 |
| --- a/libcxx/include/atomic |
| +++ b/libcxx/include/atomic |
| @@ -587,12 +587,6 @@ template <class T> |
| |
| */ |
| |
| -#include <__config> |
| - |
| -#if _LIBCPP_STD_VER < 23 && defined(_LIBCPP_STDATOMIC_H) |
| -# error <atomic> is incompatible with <stdatomic.h> before C++23. Please compile with -std=c++23. |
| -#endif |
| - |
| #include <__atomic/aliases.h> |
| #include <__atomic/atomic.h> |
| #include <__atomic/atomic_base.h> |
| @@ -607,6 +601,7 @@ template <class T> |
| #include <__atomic/is_always_lock_free.h> |
| #include <__atomic/kill_dependency.h> |
| #include <__atomic/memory_order.h> |
| +#include <__config> |
| #include <version> |
| |
| #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) |
| @@ -617,6 +612,10 @@ template <class T> |
| # error <atomic> is not implemented |
| #endif |
| |
| +#ifdef kill_dependency |
| +# error <atomic> is incompatible with <stdatomic.h> before C++23. Please compile with -std=c++23. |
| +#endif |
| + |
| #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 |
| # include <cmath> |
| # include <compare> |
| -- |
| 2.45.1.288.g0e0cd299f1-goog |
| |
