diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2022-03-20 11:40:34 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2022-05-14 11:43:05 +0000 |
| commit | 349cc55c9796c4596a5b9904cd3281af295f878f (patch) | |
| tree | 410c5a785075730a35f1272ca6a7adf72222ad03 /contrib/llvm-project/libcxx/include/cstddef | |
| parent | cb2ae6163174b90e999326ecec3699ee093a5d43 (diff) | |
| parent | c0981da47d5696fe36474fcf86b4ce03ae3ff818 (diff) | |
Merge llvm-project main llvmorg-14-init-10186-gff7f2cfa959b
This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvmorg-14-init-10186-gff7f2cfa959b.
PR: 261742
MFC after: 2 weeks
Diffstat (limited to 'contrib/llvm-project/libcxx/include/cstddef')
| -rw-r--r-- | contrib/llvm-project/libcxx/include/cstddef | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/contrib/llvm-project/libcxx/include/cstddef b/contrib/llvm-project/libcxx/include/cstddef index 1b54e7b2e0dc..ed5aea6f7a19 100644 --- a/contrib/llvm-project/libcxx/include/cstddef +++ b/contrib/llvm-project/libcxx/include/cstddef @@ -1,5 +1,5 @@ // -*- C++ -*- -//===--------------------------- cstddef ----------------------------------===// +//===----------------------------------------------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -58,14 +58,16 @@ template <> struct __libcpp_is_integral<bool> { enum { va template <> struct __libcpp_is_integral<char> { enum { value = 1 }; }; template <> struct __libcpp_is_integral<signed char> { enum { value = 1 }; }; template <> struct __libcpp_is_integral<unsigned char> { enum { value = 1 }; }; +#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS template <> struct __libcpp_is_integral<wchar_t> { enum { value = 1 }; }; +#endif #ifndef _LIBCPP_HAS_NO_CHAR8_T template <> struct __libcpp_is_integral<char8_t> { enum { value = 1 }; }; #endif #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS template <> struct __libcpp_is_integral<char16_t> { enum { value = 1 }; }; template <> struct __libcpp_is_integral<char32_t> { enum { value = 1 }; }; -#endif // _LIBCPP_HAS_NO_UNICODE_CHARS +#endif template <> struct __libcpp_is_integral<short> { enum { value = 1 }; }; template <> struct __libcpp_is_integral<unsigned short> { enum { value = 1 }; }; template <> struct __libcpp_is_integral<int> { enum { value = 1 }; }; |