Skip to content

Commit 9e618e5

Browse files
committed
[libc++][NFC] Remove a few unused macros from <__config>
1 parent 622ce12 commit 9e618e5

File tree

3 files changed

+0
-26
lines changed

3 files changed

+0
-26
lines changed

libcxx/.clang-format

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ AttributeMacros: [
2323
'_LIBCPP_CONSTEXPR_SINCE_CXX20',
2424
'_LIBCPP_CONSTEXPR_SINCE_CXX23',
2525
'_LIBCPP_CONSTEXPR',
26-
'_LIBCPP_CONSTINIT',
2726
'_LIBCPP_DEPRECATED_IN_CXX11',
2827
'_LIBCPP_DEPRECATED_IN_CXX14',
2928
'_LIBCPP_DEPRECATED_IN_CXX17',
@@ -40,7 +39,6 @@ AttributeMacros: [
4039
'_LIBCPP_INLINE_VISIBILITY',
4140
'_LIBCPP_INTERNAL_LINKAGE',
4241
'_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS',
43-
'_LIBCPP_NO_DESTROY',
4442
'_LIBCPP_NO_SANITIZE',
4543
'_LIBCPP_NO_UNIQUE_ADDRESS',
4644
'_LIBCPP_NOALIAS',

libcxx/include/__config

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1063,12 +1063,6 @@ _LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
10631063
# define _LIBCPP_NODISCARD_AFTER_CXX17
10641064
# endif
10651065

1066-
# if __has_attribute(__no_destroy__)
1067-
# define _LIBCPP_NO_DESTROY __attribute__((__no_destroy__))
1068-
# else
1069-
# define _LIBCPP_NO_DESTROY
1070-
# endif
1071-
10721066
# ifndef _LIBCPP_HAS_NO_ASAN
10731067
extern "C" _LIBCPP_EXPORTED_FROM_ABI void
10741068
__sanitizer_annotate_contiguous_container(const void*, const void*, const void*, const void*);
@@ -1232,14 +1226,6 @@ __sanitizer_verify_double_ended_contiguous_container(const void*, const void*, c
12321226
# define _LIBCPP_THREAD_SAFETY_ANNOTATION(x)
12331227
# endif
12341228

1235-
# if _LIBCPP_STD_VER >= 20
1236-
# define _LIBCPP_CONSTINIT constinit
1237-
# elif __has_attribute(__require_constant_initialization__)
1238-
# define _LIBCPP_CONSTINIT __attribute__((__require_constant_initialization__))
1239-
# else
1240-
# define _LIBCPP_CONSTINIT
1241-
# endif
1242-
12431229
# if __has_attribute(__diagnose_if__) && !defined(_LIBCPP_DISABLE_ADDITIONAL_DIAGNOSTICS)
12441230
# define _LIBCPP_DIAGNOSE_WARNING(...) __attribute__((__diagnose_if__(__VA_ARGS__, "warning")))
12451231
# else
@@ -1398,14 +1384,6 @@ __sanitizer_verify_double_ended_contiguous_container(const void*, const void*, c
13981384
# define _LIBCPP_GCC_DIAGNOSTIC_IGNORED(str)
13991385
# endif
14001386

1401-
# if defined(_AIX) && !defined(_LIBCPP_COMPILER_GCC)
1402-
# define _LIBCPP_PACKED_BYTE_FOR_AIX _Pragma("pack(1)")
1403-
# define _LIBCPP_PACKED_BYTE_FOR_AIX_END _Pragma("pack(pop)")
1404-
# else
1405-
# define _LIBCPP_PACKED_BYTE_FOR_AIX /* empty */
1406-
# define _LIBCPP_PACKED_BYTE_FOR_AIX_END /* empty */
1407-
# endif
1408-
14091387
# if __has_attribute(__packed__)
14101388
# define _LIBCPP_PACKED __attribute__((__packed__))
14111389
# else

libcxx/test/support/test_macros.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,6 @@
213213

214214
#if TEST_STD_VER > 17
215215
#define TEST_CONSTINIT constinit
216-
#elif defined(_LIBCPP_CONSTINIT)
217-
#define TEST_CONSTINIT _LIBCPP_CONSTINIT
218216
#else
219217
#define TEST_CONSTINIT
220218
#endif

0 commit comments

Comments
 (0)