[libcxx-commits] [libcxx] [libc++] Remove outdated _LIBCPP_CLANG_VER check (PR #71759)

[Louis Dionne via libcxx-commits]

https://github.com/ldionne updated https://github.com/llvm/llvm-project/pull/71759

>From a2af4f2275aa8eb3319586df36c8ca0459eb4455 Mon Sep 17 00:00:00 2001
From: Louis Dionne <ldionne.2 at gmail.com>
Date: Wed, 8 Nov 2023 16:30:29 -1000
Subject: [PATCH 1/2] [libc++] Remove outdated _LIBCPP_CLANG_VER check

We always use Clang >= 16 now, so the check for Clang >= 14 is tautological.
As a drive-by, clang-format the header.
---
 libcxx/include/__atomic/atomic_init.h | 8 ++++----
 libcxx/utils/data/ignore_format.txt   | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/libcxx/include/__atomic/atomic_init.h b/libcxx/include/__atomic/atomic_init.h
index 14310aee10c11db..c5e3e714a3a2a91 100644
--- a/libcxx/include/__atomic/atomic_init.h
+++ b/libcxx/include/__atomic/atomic_init.h
@@ -15,13 +15,13 @@
 #  pragma GCC system_header
 #endif
 
-#define ATOMIC_FLAG_INIT {false}
-#define ATOMIC_VAR_INIT(__v) {__v}
+#define ATOMIC_FLAG_INIT                                                                                               \
+  { false }
+#define ATOMIC_VAR_INIT(__v)                                                                                           \
+  { __v }
 
 #if _LIBCPP_STD_VER >= 20 && !defined(_LIBCPP_DISABLE_DEPRECATION_WARNINGS)
-# if defined(_LIBCPP_CLANG_VER) && _LIBCPP_CLANG_VER >= 1400
 #  pragma clang deprecated(ATOMIC_VAR_INIT)
-# endif
 #endif // _LIBCPP_STD_VER >= 20 && !defined(_LIBCPP_DISABLE_DEPRECATION_WARNINGS)
 
 #endif // _LIBCPP___ATOMIC_ATOMIC_INIT_H
diff --git a/libcxx/utils/data/ignore_format.txt b/libcxx/utils/data/ignore_format.txt
index 123d06d56e29a5b..48b3c04adb54238 100644
--- a/libcxx/utils/data/ignore_format.txt
+++ b/libcxx/utils/data/ignore_format.txt
@@ -89,7 +89,6 @@ libcxx/include/array
 libcxx/include/__atomic/atomic_base.h
 libcxx/include/__atomic/atomic_flag.h
 libcxx/include/__atomic/atomic.h
-libcxx/include/__atomic/atomic_init.h
 libcxx/include/__atomic/atomic_lock_free.h
 libcxx/include/__atomic/atomic_sync.h
 libcxx/include/__atomic/check_memory_order.h

>From 6cca3adc1aa652a73e692c69198ac8fb0cb509e7 Mon Sep 17 00:00:00 2001
From: Louis Dionne <ldionne.2 at gmail.com>
Date: Thu, 9 Nov 2023 09:08:46 -1000
Subject: [PATCH 2/2] Remove comment after endif

---
 libcxx/include/__atomic/atomic_init.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libcxx/include/__atomic/atomic_init.h b/libcxx/include/__atomic/atomic_init.h
index c5e3e714a3a2a91..8ef5958bfedaa9f 100644
--- a/libcxx/include/__atomic/atomic_init.h
+++ b/libcxx/include/__atomic/atomic_init.h
@@ -22,6 +22,6 @@
 
 #if _LIBCPP_STD_VER >= 20 && !defined(_LIBCPP_DISABLE_DEPRECATION_WARNINGS)
 #  pragma clang deprecated(ATOMIC_VAR_INIT)
-#endif // _LIBCPP_STD_VER >= 20 && !defined(_LIBCPP_DISABLE_DEPRECATION_WARNINGS)
+#endif
 
 #endif // _LIBCPP___ATOMIC_ATOMIC_INIT_H