[libcxx-commits] [libcxx] [libcxxabi] [libc++] Remove dependence on <ciso646> (PR #73271)
via libcxx-commits
libcxx-commits at lists.llvm.org
Thu Nov 23 17:10:09 PST 2023
llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-libcxx
@llvm/pr-subscribers-libcxxabi
Author: Michael Kenzel (michael-kenzel)
<details>
<summary>Changes</summary>
C++23 removed `<ciso646>` from the standard library. The header is used in a few places in order to pull in implementation-specific and feature test macros. The new way of doing that is `<version>`, which should be supported by all supported implementations. This change replaces all those uses of `<ciso646>` with `<version>`.
---
Full diff: https://github.com/llvm/llvm-project/pull/73271.diff
3 Files Affected:
- (modified) libcxx/test/support/container_debug_tests.h (+1-1)
- (modified) libcxx/test/support/test_macros.h (+2-2)
- (modified) libcxxabi/src/demangle/DemangleConfig.h (-2)
``````````diff
diff --git a/libcxx/test/support/container_debug_tests.h b/libcxx/test/support/container_debug_tests.h
index c35da37a87da6eb..2f43daeaac060b8 100644
--- a/libcxx/test/support/container_debug_tests.h
+++ b/libcxx/test/support/container_debug_tests.h
@@ -9,7 +9,7 @@
#ifndef TEST_SUPPORT_CONTAINER_DEBUG_TESTS_H
#define TEST_SUPPORT_CONTAINER_DEBUG_TESTS_H
-#include <ciso646>
+#include <version>
#ifndef _LIBCPP_VERSION
#error This header may only be used for libc++ tests
#endif
diff --git a/libcxx/test/support/test_macros.h b/libcxx/test/support/test_macros.h
index e549ec2ca7a1a71..f466cecbfcbffcd 100644
--- a/libcxx/test/support/test_macros.h
+++ b/libcxx/test/support/test_macros.h
@@ -12,7 +12,7 @@
// Attempt to get STL specific macros like _LIBCPP_VERSION using the most
// minimal header possible. If we're testing libc++, we should use `<__config>`.
-// If <__config> isn't available, fall back to <ciso646>.
+// If <__config> isn't available, fall back to <version>.
#ifdef __has_include
# if __has_include("<__config>")
# include <__config>
@@ -20,7 +20,7 @@
# endif
#endif
#ifndef TEST_IMP_INCLUDED_HEADER
-#include <ciso646>
+#include <version>
#endif
#define TEST_STRINGIZE_IMPL(...) #__VA_ARGS__
diff --git a/libcxxabi/src/demangle/DemangleConfig.h b/libcxxabi/src/demangle/DemangleConfig.h
index dec382d0d38f8ef..57dcd04ed7b7814 100644
--- a/libcxxabi/src/demangle/DemangleConfig.h
+++ b/libcxxabi/src/demangle/DemangleConfig.h
@@ -19,8 +19,6 @@
#include "../abort_message.h"
#endif
-#include <ciso646>
-
#ifdef _MSC_VER
// snprintf is implemented in VS 2015
#if _MSC_VER < 1900
``````````
</details>
https://github.com/llvm/llvm-project/pull/73271
More information about the libcxx-commits
mailing list