Skip to content

Commit 5c40c99

Browse files
author
Arthur O'Dwyer
committed
[libc++] s/_LIBCPP_NO_HAS_CHAR8_T/_LIBCPP_HAS_NO_CHAR8_T/g
This was raised in D94511. Differential Revision: https://reviews.llvm.org/D100736
1 parent e9d8761 commit 5c40c99

File tree

20 files changed

+54
-52
lines changed

20 files changed

+54
-52
lines changed

‎libcxx/include/__config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -976,7 +976,7 @@ typedef unsigned int char32_t;
976976
#endif
977977

978978
#if _LIBCPP_STD_VER <= 17 || !defined(__cpp_char8_t)
979-
#define _LIBCPP_NO_HAS_CHAR8_T
979+
#define _LIBCPP_HAS_NO_CHAR8_T
980980
#endif
981981

982982
// Deprecation macros.
@@ -1019,7 +1019,7 @@ typedef unsigned int char32_t;
10191019
# define _LIBCPP_DEPRECATED_IN_CXX20
10201020
#endif
10211021

1022-
#if !defined(_LIBCPP_NO_HAS_CHAR8_T)
1022+
#if !defined(_LIBCPP_HAS_NO_CHAR8_T)
10231023
# define _LIBCPP_DEPRECATED_WITH_CHAR8_T _LIBCPP_DEPRECATED
10241024
#else
10251025
# define _LIBCPP_DEPRECATED_WITH_CHAR8_T

‎libcxx/include/__locale

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1161,7 +1161,7 @@ protected:
11611161
virtual int do_max_length() const _NOEXCEPT;
11621162
};
11631163

1164-
#ifndef _LIBCPP_NO_HAS_CHAR8_T
1164+
#ifndef _LIBCPP_HAS_NO_CHAR8_T
11651165

11661166
// template <> class codecvt<char16_t, char8_t, mbstate_t> // C++20
11671167

@@ -1337,7 +1337,7 @@ protected:
13371337
virtual int do_max_length() const _NOEXCEPT;
13381338
};
13391339

1340-
#ifndef _LIBCPP_NO_HAS_CHAR8_T
1340+
#ifndef _LIBCPP_HAS_NO_CHAR8_T
13411341

13421342
// template <> class codecvt<char32_t, char8_t, mbstate_t> // C++20
13431343

@@ -1455,7 +1455,7 @@ _LIBCPP_EXTERN_TEMPLATE_EVEN_IN_DEBUG_MODE(class _LIBCPP_EXTERN_TEMPLATE_TYPE_VI
14551455
_LIBCPP_EXTERN_TEMPLATE_EVEN_IN_DEBUG_MODE(class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS codecvt_byname<wchar_t, char, mbstate_t>)
14561456
_LIBCPP_EXTERN_TEMPLATE_EVEN_IN_DEBUG_MODE(class _LIBCPP_DEPRECATED_IN_CXX20 _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS codecvt_byname<char16_t, char, mbstate_t>) // deprecated in C++20
14571457
_LIBCPP_EXTERN_TEMPLATE_EVEN_IN_DEBUG_MODE(class _LIBCPP_DEPRECATED_IN_CXX20 _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS codecvt_byname<char32_t, char, mbstate_t>) // deprecated in C++20
1458-
#ifndef _LIBCPP_NO_HAS_CHAR8_T
1458+
#ifndef _LIBCPP_HAS_NO_CHAR8_T
14591459
_LIBCPP_EXTERN_TEMPLATE_EVEN_IN_DEBUG_MODE(class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS codecvt_byname<char16_t, char8_t, mbstate_t>) // C++20
14601460
_LIBCPP_EXTERN_TEMPLATE_EVEN_IN_DEBUG_MODE(class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS codecvt_byname<char32_t, char8_t, mbstate_t>) // C++20
14611461
#endif

‎libcxx/include/__string

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ char_traits<wchar_t>::find(const char_type* __s, size_t __n, const char_type& __
538538
}
539539

540540

541-
#ifndef _LIBCPP_NO_HAS_CHAR8_T
541+
#ifndef _LIBCPP_HAS_NO_CHAR8_T
542542

543543
template <>
544544
struct _LIBCPP_TEMPLATE_VIS char_traits<char8_t>
@@ -645,7 +645,7 @@ char_traits<char8_t>::find(const char_type* __s, size_t __n, const char_type& __
645645
return nullptr;
646646
}
647647

648-
#endif // #_LIBCPP_NO_HAS_CHAR8_T
648+
#endif // #_LIBCPP_HAS_NO_CHAR8_T
649649

650650
#ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
651651

‎libcxx/include/atomic

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1127,7 +1127,7 @@ _Tp kill_dependency(_Tp __y) _NOEXCEPT
11271127
#if defined(__CLANG_ATOMIC_BOOL_LOCK_FREE)
11281128
# define ATOMIC_BOOL_LOCK_FREE __CLANG_ATOMIC_BOOL_LOCK_FREE
11291129
# define ATOMIC_CHAR_LOCK_FREE __CLANG_ATOMIC_CHAR_LOCK_FREE
1130-
#ifndef _LIBCPP_NO_HAS_CHAR8_T
1130+
#ifndef _LIBCPP_HAS_NO_CHAR8_T
11311131
# define ATOMIC_CHAR8_T_LOCK_FREE __CLANG_ATOMIC_CHAR8_T_LOCK_FREE
11321132
#endif
11331133
# define ATOMIC_CHAR16_T_LOCK_FREE __CLANG_ATOMIC_CHAR16_T_LOCK_FREE
@@ -1141,7 +1141,7 @@ _Tp kill_dependency(_Tp __y) _NOEXCEPT
11411141
#elif defined(__GCC_ATOMIC_BOOL_LOCK_FREE)
11421142
# define ATOMIC_BOOL_LOCK_FREE __GCC_ATOMIC_BOOL_LOCK_FREE
11431143
# define ATOMIC_CHAR_LOCK_FREE __GCC_ATOMIC_CHAR_LOCK_FREE
1144-
#ifndef _LIBCPP_NO_HAS_CHAR8_T
1144+
#ifndef _LIBCPP_HAS_NO_CHAR8_T
11451145
# define ATOMIC_CHAR8_T_LOCK_FREE __GCC_ATOMIC_CHAR8_T_LOCK_FREE
11461146
#endif
11471147
# define ATOMIC_CHAR16_T_LOCK_FREE __GCC_ATOMIC_CHAR16_T_LOCK_FREE
@@ -1458,7 +1458,7 @@ template<> struct __cxx_is_always_lock_free<bool> { enum { __value = 2 == ATOMIC
14581458
template<> struct __cxx_is_always_lock_free<char> { enum { __value = 2 == ATOMIC_CHAR_LOCK_FREE }; };
14591459
template<> struct __cxx_is_always_lock_free<signed char> { enum { __value = 2 == ATOMIC_CHAR_LOCK_FREE }; };
14601460
template<> struct __cxx_is_always_lock_free<unsigned char> { enum { __value = 2 == ATOMIC_CHAR_LOCK_FREE }; };
1461-
#ifndef _LIBCPP_NO_HAS_CHAR8_T
1461+
#ifndef _LIBCPP_HAS_NO_CHAR8_T
14621462
template<> struct __cxx_is_always_lock_free<char8_t> { enum { __value = 2 == ATOMIC_CHAR8_T_LOCK_FREE }; };
14631463
#endif
14641464
template<> struct __cxx_is_always_lock_free<char16_t> { enum { __value = 2 == ATOMIC_CHAR16_T_LOCK_FREE }; };
@@ -2728,7 +2728,7 @@ typedef atomic<long> atomic_long;
27282728
typedef atomic<unsigned long> atomic_ulong;
27292729
typedef atomic<long long> atomic_llong;
27302730
typedef atomic<unsigned long long> atomic_ullong;
2731-
#ifndef _LIBCPP_NO_HAS_CHAR8_T
2731+
#ifndef _LIBCPP_HAS_NO_CHAR8_T
27322732
typedef atomic<char8_t> atomic_char8_t;
27332733
#endif
27342734
typedef atomic<char16_t> atomic_char16_t;

‎libcxx/include/cstddef

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ template <> struct __libcpp_is_integral<char> { enum { va
5959
template <> struct __libcpp_is_integral<signed char> { enum { value = 1 }; };
6060
template <> struct __libcpp_is_integral<unsigned char> { enum { value = 1 }; };
6161
template <> struct __libcpp_is_integral<wchar_t> { enum { value = 1 }; };
62-
#ifndef _LIBCPP_NO_HAS_CHAR8_T
62+
#ifndef _LIBCPP_HAS_NO_CHAR8_T
6363
template <> struct __libcpp_is_integral<char8_t> { enum { value = 1 }; };
6464
#endif
6565
#ifndef _LIBCPP_HAS_NO_UNICODE_CHARS

‎libcxx/include/filesystem

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ struct __can_convert_char<wchar_t> {
558558
static const bool value = true;
559559
using __char_type = wchar_t;
560560
};
561-
#ifndef _LIBCPP_NO_HAS_CHAR8_T
561+
#ifndef _LIBCPP_HAS_NO_CHAR8_T
562562
template <>
563563
struct __can_convert_char<char8_t> {
564564
static const bool value = true;
@@ -586,7 +586,7 @@ __is_separator(_ECharT __e) {
586586
#endif
587587
}
588588

589-
#ifndef _LIBCPP_NO_HAS_CHAR8_T
589+
#ifndef _LIBCPP_HAS_NO_CHAR8_T
590590
typedef u8string __u8_string;
591591
#else
592592
typedef string __u8_string;
@@ -893,7 +893,7 @@ struct _PathExport<char16_t> {
893893
}
894894
};
895895

896-
#ifndef _LIBCPP_NO_HAS_CHAR8_T
896+
#ifndef _LIBCPP_HAS_NO_CHAR8_T
897897
template <>
898898
struct _PathExport<char8_t> {
899899
typedef __narrow_to_utf8<sizeof(wchar_t) * __CHAR_BIT__> _Narrower;
@@ -903,7 +903,7 @@ struct _PathExport<char8_t> {
903903
_Narrower()(back_inserter(__dest), __src.data(), __src.data() + __src.size());
904904
}
905905
};
906-
#endif /* !_LIBCPP_NO_HAS_CHAR8_T */
906+
#endif /* !_LIBCPP_HAS_NO_CHAR8_T */
907907
#endif /* _LIBCPP_WIN32API */
908908

909909
class _LIBCPP_TYPE_VIS path {
@@ -1264,7 +1264,7 @@ public:
12641264
#else /* _LIBCPP_WIN32API */
12651265

12661266
_LIBCPP_INLINE_VISIBILITY _VSTD::string string() const { return __pn_; }
1267-
#ifndef _LIBCPP_NO_HAS_CHAR8_T
1267+
#ifndef _LIBCPP_HAS_NO_CHAR8_T
12681268
_LIBCPP_INLINE_VISIBILITY _VSTD::u8string u8string() const { return _VSTD::u8string(__pn_.begin(), __pn_.end()); }
12691269
#else
12701270
_LIBCPP_INLINE_VISIBILITY _VSTD::string u8string() const { return __pn_; }
@@ -1296,7 +1296,7 @@ public:
12961296

12971297
// generic format observers
12981298
_VSTD::string generic_string() const { return __pn_; }
1299-
#ifndef _LIBCPP_NO_HAS_CHAR8_T
1299+
#ifndef _LIBCPP_HAS_NO_CHAR8_T
13001300
_VSTD::u8string generic_u8string() const { return _VSTD::u8string(__pn_.begin(), __pn_.end()); }
13011301
#else
13021302
_VSTD::string generic_u8string() const { return __pn_; }
@@ -1520,7 +1520,7 @@ _LIBCPP_INLINE_VISIBILITY _LIBCPP_DEPRECATED_WITH_CHAR8_T
15201520
typename enable_if<__is_pathable<_InputIt>::value, path>::type
15211521
u8path(_InputIt __f, _InputIt __l) {
15221522
static_assert(
1523-
#ifndef _LIBCPP_NO_HAS_CHAR8_T
1523+
#ifndef _LIBCPP_HAS_NO_CHAR8_T
15241524
is_same<typename __is_pathable<_InputIt>::__char_type, char8_t>::value ||
15251525
#endif
15261526
is_same<typename __is_pathable<_InputIt>::__char_type, char>::value,
@@ -1544,7 +1544,7 @@ _LIBCPP_INLINE_VISIBILITY _LIBCPP_DEPRECATED_WITH_CHAR8_T
15441544
typename enable_if<__is_pathable<_InputIt>::value, path>::type
15451545
u8path(_InputIt __f, _NullSentinel) {
15461546
static_assert(
1547-
#ifndef _LIBCPP_NO_HAS_CHAR8_T
1547+
#ifndef _LIBCPP_HAS_NO_CHAR8_T
15481548
is_same<typename __is_pathable<_InputIt>::__char_type, char8_t>::value ||
15491549
#endif
15501550
is_same<typename __is_pathable<_InputIt>::__char_type, char>::value,
@@ -1567,7 +1567,7 @@ _LIBCPP_INLINE_VISIBILITY _LIBCPP_DEPRECATED_WITH_CHAR8_T
15671567
typename enable_if<__is_pathable<_Source>::value, path>::type
15681568
u8path(const _Source& __s) {
15691569
static_assert(
1570-
#ifndef _LIBCPP_NO_HAS_CHAR8_T
1570+
#ifndef _LIBCPP_HAS_NO_CHAR8_T
15711571
is_same<typename __is_pathable<_Source>::__char_type, char8_t>::value ||
15721572
#endif
15731573
is_same<typename __is_pathable<_Source>::__char_type, char>::value,

‎libcxx/include/iosfwd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class _LIBCPP_TYPE_VIS ios_base;
107107

108108
template<class _CharT> struct _LIBCPP_TEMPLATE_VIS char_traits;
109109
template<> struct char_traits<char>;
110-
#ifndef _LIBCPP_NO_HAS_CHAR8_T
110+
#ifndef _LIBCPP_HAS_NO_CHAR8_T
111111
template<> struct char_traits<char8_t>;
112112
#endif
113113
template<> struct char_traits<char16_t>;
@@ -221,7 +221,7 @@ template <class _CharT, class _Traits>
221221
template <class _State> class _LIBCPP_TEMPLATE_VIS fpos;
222222
typedef fpos<mbstate_t> streampos;
223223
typedef fpos<mbstate_t> wstreampos;
224-
#ifndef _LIBCPP_NO_HAS_CHAR8_T
224+
#ifndef _LIBCPP_HAS_NO_CHAR8_T
225225
typedef fpos<mbstate_t> u8streampos;
226226
#endif
227227
#ifndef _LIBCPP_HAS_NO_UNICODE_CHARS

‎libcxx/include/string

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,7 @@ struct __padding<_CharT, 1>
677677

678678
#endif // _LIBCPP_ABI_ALTERNATE_STRING_LAYOUT
679679

680-
#ifndef _LIBCPP_NO_HAS_CHAR8_T
680+
#ifndef _LIBCPP_HAS_NO_CHAR8_T
681681
typedef basic_string<char8_t> u8string;
682682
#endif
683683

@@ -689,7 +689,7 @@ typedef basic_string<char32_t> u32string;
689689
template<class _CharT, class _Traits, class _Allocator>
690690
class
691691
_LIBCPP_TEMPLATE_VIS
692-
#ifndef _LIBCPP_NO_HAS_CHAR8_T
692+
#ifndef _LIBCPP_HAS_NO_CHAR8_T
693693
_LIBCPP_PREFERRED_NAME(u8string)
694694
#endif
695695
#ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
@@ -4540,7 +4540,7 @@ inline namespace literals
45404540
return basic_string<wchar_t> (__str, __len);
45414541
}
45424542

4543-
#ifndef _LIBCPP_NO_HAS_CHAR8_T
4543+
#ifndef _LIBCPP_HAS_NO_CHAR8_T
45444544
inline _LIBCPP_INLINE_VISIBILITY
45454545
basic_string<char8_t> operator "" s(const char8_t *__str, size_t __len) _NOEXCEPT
45464546
{

‎libcxx/include/string_view

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ template<class _CharT, class _Traits = char_traits<_CharT> >
207207
class _LIBCPP_TEMPLATE_VIS basic_string_view;
208208

209209
typedef basic_string_view<char> string_view;
210-
#ifndef _LIBCPP_NO_HAS_CHAR8_T
210+
#ifndef _LIBCPP_HAS_NO_CHAR8_T
211211
typedef basic_string_view<char8_t> u8string_view;
212212
#endif
213213
typedef basic_string_view<char16_t> u16string_view;
@@ -217,7 +217,7 @@ typedef basic_string_view<wchar_t> wstring_view;
217217
template<class _CharT, class _Traits>
218218
class
219219
_LIBCPP_PREFERRED_NAME(string_view)
220-
#ifndef _LIBCPP_NO_HAS_CHAR8_T
220+
#ifndef _LIBCPP_HAS_NO_CHAR8_T
221221
_LIBCPP_PREFERRED_NAME(u8string_view)
222222
#endif
223223
_LIBCPP_PREFERRED_NAME(u16string_view)
@@ -854,7 +854,7 @@ inline namespace literals
854854
return basic_string_view<wchar_t> (__str, __len);
855855
}
856856

857-
#ifndef _LIBCPP_NO_HAS_CHAR8_T
857+
#ifndef _LIBCPP_HAS_NO_CHAR8_T
858858
inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
859859
basic_string_view<char8_t> operator "" sv(const char8_t *__str, size_t __len) _NOEXCEPT
860860
{

‎libcxx/include/utility

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ struct _IsSameAsAny : _Or<_IsSame<_Tp, _Up>...> {};
303303
template<class _Tp>
304304
concept __is_safe_integral_cmp = is_integral_v<_Tp> &&
305305
!_IsSameAsAny<_Tp, bool, char,
306-
#ifndef _LIBCPP_NO_HAS_CHAR8_T
306+
#ifndef _LIBCPP_HAS_NO_CHAR8_T
307307
char8_t,
308308
#endif
309309
#ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
@@ -1460,15 +1460,15 @@ struct _LIBCPP_TEMPLATE_VIS hash<unsigned char>
14601460
size_t operator()(unsigned char __v) const _NOEXCEPT {return static_cast<size_t>(__v);}
14611461
};
14621462

1463-
#ifndef _LIBCPP_NO_HAS_CHAR8_T
1463+
#ifndef _LIBCPP_HAS_NO_CHAR8_T
14641464
template <>
14651465
struct _LIBCPP_TEMPLATE_VIS hash<char8_t>
14661466
: public unary_function<char8_t, size_t>
14671467
{
14681468
_LIBCPP_INLINE_VISIBILITY
14691469
size_t operator()(char8_t __v) const _NOEXCEPT {return static_cast<size_t>(__v);}
14701470
};
1471-
#endif // !_LIBCPP_NO_HAS_CHAR8_T
1471+
#endif // !_LIBCPP_HAS_NO_CHAR8_T
14721472

14731473
#ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
14741474

0 commit comments

Comments
 (0)