Skip to content

Commit b65c0ef

Browse files
philnik777philnik777
committed
[libc++][RFC] Always define internal feature test macros
1 parent a578558 commit b65c0ef

File tree

130 files changed

+975
-800
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+975
-800
lines changed

‎libcxx/include/__atomic/aliases.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ using atomic_long = atomic<long>;
3737
using atomic_ulong = atomic<unsigned long>;
3838
using atomic_llong = atomic<long long>;
3939
using atomic_ullong = atomic<unsigned long long>;
40-
#ifndef _LIBCPP_HAS_NO_CHAR8_T
40+
#if _LIBCPP_HAS_CHAR8_T
4141
using atomic_char8_t = atomic<char8_t>;
4242
#endif
4343
using atomic_char16_t = atomic<char16_t>;

‎libcxx/include/__atomic/atomic_lock_free.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#if defined(__CLANG_ATOMIC_BOOL_LOCK_FREE)
1919
# define ATOMIC_BOOL_LOCK_FREE __CLANG_ATOMIC_BOOL_LOCK_FREE
2020
# define ATOMIC_CHAR_LOCK_FREE __CLANG_ATOMIC_CHAR_LOCK_FREE
21-
# ifndef _LIBCPP_HAS_NO_CHAR8_T
21+
# if _LIBCPP_HAS_CHAR8_T
2222
# define ATOMIC_CHAR8_T_LOCK_FREE __CLANG_ATOMIC_CHAR8_T_LOCK_FREE
2323
# endif
2424
# define ATOMIC_CHAR16_T_LOCK_FREE __CLANG_ATOMIC_CHAR16_T_LOCK_FREE
@@ -32,7 +32,7 @@
3232
#elif defined(__GCC_ATOMIC_BOOL_LOCK_FREE)
3333
# define ATOMIC_BOOL_LOCK_FREE __GCC_ATOMIC_BOOL_LOCK_FREE
3434
# define ATOMIC_CHAR_LOCK_FREE __GCC_ATOMIC_CHAR_LOCK_FREE
35-
# ifndef _LIBCPP_HAS_NO_CHAR8_T
35+
# if _LIBCPP_HAS_CHAR8_T
3636
# define ATOMIC_CHAR8_T_LOCK_FREE __GCC_ATOMIC_CHAR8_T_LOCK_FREE
3737
# endif
3838
# define ATOMIC_CHAR16_T_LOCK_FREE __GCC_ATOMIC_CHAR16_T_LOCK_FREE

‎libcxx/include/__bit/byteswap.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ template <integral _Tp>
3232
return __builtin_bswap32(__val);
3333
} else if constexpr (sizeof(_Tp) == 8) {
3434
return __builtin_bswap64(__val);
35-
# ifndef _LIBCPP_HAS_NO_INT128
35+
# if _LIBCPP_HAS_INT128
3636
} else if constexpr (sizeof(_Tp) == 16) {
3737
# if __has_builtin(__builtin_bswap128)
3838
return __builtin_bswap128(__val);
3939
# else
4040
return static_cast<_Tp>(byteswap(static_cast<uint64_t>(__val))) << 64 |
4141
static_cast<_Tp>(byteswap(static_cast<uint64_t>(__val >> 64)));
4242
# endif // __has_builtin(__builtin_bswap128)
43-
# endif // _LIBCPP_HAS_NO_INT128
43+
# endif // _LIBCPP_HAS_INT128
4444
} else {
4545
static_assert(sizeof(_Tp) == 0, "byteswap is unimplemented for integral types of this size");
4646
}

‎libcxx/include/__bit/countl.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
3939
return __builtin_clzll(__x);
4040
}
4141

42-
#ifndef _LIBCPP_HAS_NO_INT128
42+
#if _LIBCPP_HAS_INT128
4343
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR int __libcpp_clz(__uint128_t __x) _NOEXCEPT {
4444
# if __has_builtin(__builtin_clzg)
4545
return __builtin_clzg(__x);
@@ -57,7 +57,7 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR int __libcpp_clz(__uint128_t __x)
5757
: __builtin_clzll(static_cast<unsigned long long>(__x >> 64));
5858
# endif
5959
}
60-
#endif // _LIBCPP_HAS_NO_INT128
60+
#endif // _LIBCPP_HAS_INT128
6161

6262
template <class _Tp>
6363
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 int __countl_zero(_Tp __t) _NOEXCEPT {

‎libcxx/include/__charconv/tables.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ inline constexpr uint64_t __pow10_64[20] = {
9595
UINT64_C(1000000000000000000),
9696
UINT64_C(10000000000000000000)};
9797

98-
# ifndef _LIBCPP_HAS_NO_INT128
98+
# if _LIBCPP_HAS_INT128
9999
inline constexpr int __pow10_128_offset = 0;
100100
inline constexpr __uint128_t __pow10_128[40] = {
101101
UINT64_C(0),

‎libcxx/include/__charconv/to_chars_base_10.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ __base_10_u64(char* __buffer, uint64_t __value) noexcept {
124124
return __itoa::__append10(__buffer, __value);
125125
}
126126

127-
# ifndef _LIBCPP_HAS_NO_INT128
127+
# if _LIBCPP_HAS_INT128
128128
/// \returns 10^\a exp
129129
///
130130
/// \pre \a exp [19, 39]

‎libcxx/include/__charconv/to_chars_integral.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ __to_chars_itoa(char* __first, char* __last, _Tp __value, false_type) {
7171
return {__last, errc::value_too_large};
7272
}
7373

74-
# ifndef _LIBCPP_HAS_NO_INT128
74+
# if _LIBCPP_HAS_INT128
7575
template <>
7676
inline _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI to_chars_result
7777
__to_chars_itoa(char* __first, char* __last, __uint128_t __value, false_type) {

‎libcxx/include/__charconv/traits.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ struct _LIBCPP_HIDDEN __traits_base<_Tp, __enable_if_t<sizeof(_Tp) == sizeof(uin
8888
}
8989
};
9090

91-
# ifndef _LIBCPP_HAS_NO_INT128
91+
# if _LIBCPP_HAS_INT128
9292
template <typename _Tp>
9393
struct _LIBCPP_HIDDEN __traits_base<_Tp, __enable_if_t<sizeof(_Tp) == sizeof(__uint128_t)> > {
9494
using type = __uint128_t;

‎libcxx/include/__chrono/exception.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class nonexistent_local_time : public runtime_error {
7373
template <class _Duration>
7474
[[noreturn]] _LIBCPP_AVAILABILITY_TZDB _LIBCPP_HIDE_FROM_ABI void __throw_nonexistent_local_time(
7575
[[maybe_unused]] const local_time<_Duration>& __time, [[maybe_unused]] const local_info& __info) {
76-
# ifndef _LIBCPP_HAS_NO_EXCEPTIONS
76+
# if _LIBCPP_HAS_EXCEPTIONS
7777
throw nonexistent_local_time(__time, __info);
7878
# else
7979
_LIBCPP_VERBOSE_ABORT("nonexistent_local_time was thrown in -fno-exceptions mode");
@@ -117,7 +117,7 @@ class ambiguous_local_time : public runtime_error {
117117
template <class _Duration>
118118
[[noreturn]] _LIBCPP_AVAILABILITY_TZDB _LIBCPP_HIDE_FROM_ABI void __throw_ambiguous_local_time(
119119
[[maybe_unused]] const local_time<_Duration>& __time, [[maybe_unused]] const local_info& __info) {
120-
# ifndef _LIBCPP_HAS_NO_EXCEPTIONS
120+
# if _LIBCPP_HAS_EXCEPTIONS
121121
throw ambiguous_local_time(__time, __info);
122122
# else
123123
_LIBCPP_VERBOSE_ABORT("ambiguous_local_time was thrown in -fno-exceptions mode");

‎libcxx/include/__chrono/file_clock.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ _LIBCPP_END_NAMESPACE_STD
4747
#ifndef _LIBCPP_CXX03_LANG
4848
_LIBCPP_BEGIN_NAMESPACE_FILESYSTEM
4949
struct _FilesystemClock {
50-
# if !defined(_LIBCPP_HAS_NO_INT128)
50+
# if _LIBCPP_HAS_INT128
5151
typedef __int128_t rep;
5252
typedef nano period;
5353
# else

‎libcxx/include/__condition_variable/condition_variable.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class _LIBCPP_EXPORTED_FROM_ABI condition_variable {
4545
public:
4646
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR condition_variable() _NOEXCEPT = default;
4747

48-
# ifdef _LIBCPP_HAS_TRIVIAL_CONDVAR_DESTRUCTION
48+
# if _LIBCPP_HAS_TRIVIAL_CONDVAR_DESTRUCTION
4949
~condition_variable() = default;
5050
# else
5151
~condition_variable();
@@ -83,7 +83,7 @@ class _LIBCPP_EXPORTED_FROM_ABI condition_variable {
8383
private:
8484
void
8585
__do_timed_wait(unique_lock<mutex>& __lk, chrono::time_point<chrono::system_clock, chrono::nanoseconds>) _NOEXCEPT;
86-
# if defined(_LIBCPP_HAS_COND_CLOCKWAIT)
86+
# if _LIBCPP_HAS_COND_CLOCKWAIT
8787
_LIBCPP_HIDE_FROM_ABI void
8888
__do_timed_wait(unique_lock<mutex>& __lk, chrono::time_point<chrono::steady_clock, chrono::nanoseconds>) _NOEXCEPT;
8989
# endif
@@ -180,7 +180,7 @@ cv_status condition_variable::wait_for(unique_lock<mutex>& __lk, const chrono::d
180180
using __ns_rep = nanoseconds::rep;
181181
steady_clock::time_point __c_now = steady_clock::now();
182182

183-
# if defined(_LIBCPP_HAS_COND_CLOCKWAIT)
183+
# if _LIBCPP_HAS_COND_CLOCKWAIT
184184
using __clock_tp_ns = time_point<steady_clock, nanoseconds>;
185185
__ns_rep __now_count_ns = std::__safe_nanosecond_cast(__c_now.time_since_epoch()).count();
186186
# else
@@ -205,7 +205,7 @@ condition_variable::wait_for(unique_lock<mutex>& __lk, const chrono::duration<_R
205205
return wait_until(__lk, chrono::steady_clock::now() + __d, std::move(__pred));
206206
}
207207

208-
# if defined(_LIBCPP_HAS_COND_CLOCKWAIT)
208+
# if _LIBCPP_HAS_COND_CLOCKWAIT
209209
inline void condition_variable::__do_timed_wait(
210210
unique_lock<mutex>& __lk, chrono::time_point<chrono::steady_clock, chrono::nanoseconds> __tp) _NOEXCEPT {
211211
using namespace chrono;

0 commit comments

Comments
 (0)