Skip to content

Commit 020ea3e

Browse files
authored
[libc++] Clang-tidy enable modernize-use-nullptr. (#76659)
Clang-tidy 18 no longer has false positives with the spaceship operator. Note that I'm quite sure there are more occurrences in our headers that are not caught.
1 parent e6ac33b commit 020ea3e

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

libcxx/.clang-tidy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Checks: >
1515
1616
modernize-loop-convert,
1717
modernize-redundant-void-arg,
18+
modernize-use-nullptr,
1819
modernize-use-override,
1920
2021
readability-duplicate-include,
@@ -68,7 +69,6 @@ CheckOptions:
6869
# modernize-use-default-member-init,
6970
# modernize-use-equals-default,
7071
# modernize-use-equals-delete,
71-
# modernize-use-nullptr,
7272
# portability-restrict-system-includes,
7373
# readability-function-cognitive-complexity,
7474
# readability-implicit-bool-conversion,

libcxx/include/__atomic/is_always_lock_free.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
2020
template <class _Tp>
2121
struct __libcpp_is_always_lock_free {
2222
// __atomic_always_lock_free is available in all Standard modes
23-
static const bool __value = __atomic_always_lock_free(sizeof(_Tp), 0);
23+
static const bool __value = __atomic_always_lock_free(sizeof(_Tp), nullptr);
2424
};
2525

2626
_LIBCPP_END_NAMESPACE_STD

libcxx/include/locale

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3421,7 +3421,7 @@ wbuffer_convert<_Codecvt, _Elem, _Tr>::~wbuffer_convert() {
34213421
template <class _Codecvt, class _Elem, class _Tr>
34223422
typename wbuffer_convert<_Codecvt, _Elem, _Tr>::int_type wbuffer_convert<_Codecvt, _Elem, _Tr>::underflow() {
34233423
_LIBCPP_SUPPRESS_DEPRECATED_POP
3424-
if (__cv_ == 0 || __bufptr_ == 0)
3424+
if (__cv_ == 0 || __bufptr_ == nullptr)
34253425
return traits_type::eof();
34263426
bool __initial = __read_mode();
34273427
char_type __1buf;
@@ -3478,7 +3478,7 @@ template <class _Codecvt, class _Elem, class _Tr>
34783478
typename wbuffer_convert<_Codecvt, _Elem, _Tr>::int_type
34793479
wbuffer_convert<_Codecvt, _Elem, _Tr>::pbackfail(int_type __c) {
34803480
_LIBCPP_SUPPRESS_DEPRECATED_POP
3481-
if (__cv_ != 0 && __bufptr_ != 0 && this->eback() < this->gptr()) {
3481+
if (__cv_ != 0 && __bufptr_ && this->eback() < this->gptr()) {
34823482
if (traits_type::eq_int_type(__c, traits_type::eof())) {
34833483
this->gbump(-1);
34843484
return traits_type::not_eof(__c);
@@ -3496,7 +3496,7 @@ _LIBCPP_SUPPRESS_DEPRECATED_PUSH
34963496
template <class _Codecvt, class _Elem, class _Tr>
34973497
typename wbuffer_convert<_Codecvt, _Elem, _Tr>::int_type wbuffer_convert<_Codecvt, _Elem, _Tr>::overflow(int_type __c) {
34983498
_LIBCPP_SUPPRESS_DEPRECATED_POP
3499-
if (__cv_ == 0 || __bufptr_ == 0)
3499+
if (__cv_ == 0 || !__bufptr_)
35003500
return traits_type::eof();
35013501
__write_mode();
35023502
char_type __1buf;
@@ -3588,7 +3588,7 @@ template <class _Codecvt, class _Elem, class _Tr>
35883588
typename wbuffer_convert<_Codecvt, _Elem, _Tr>::pos_type
35893589
wbuffer_convert<_Codecvt, _Elem, _Tr>::seekoff(off_type __off, ios_base::seekdir __way, ios_base::openmode __om) {
35903590
int __width = __cv_->encoding();
3591-
if (__cv_ == 0 || __bufptr_ == 0 || (__width <= 0 && __off != 0) || sync())
3591+
if (__cv_ == 0 || !__bufptr_ || (__width <= 0 && __off != 0) || sync())
35923592
return pos_type(off_type(-1));
35933593
// __width > 0 || __off == 0, now check __way
35943594
if (__way != ios_base::beg && __way != ios_base::cur && __way != ios_base::end)
@@ -3601,7 +3601,7 @@ wbuffer_convert<_Codecvt, _Elem, _Tr>::seekoff(off_type __off, ios_base::seekdir
36013601
template <class _Codecvt, class _Elem, class _Tr>
36023602
typename wbuffer_convert<_Codecvt, _Elem, _Tr>::pos_type
36033603
wbuffer_convert<_Codecvt, _Elem, _Tr>::seekpos(pos_type __sp, ios_base::openmode __wch) {
3604-
if (__cv_ == 0 || __bufptr_ == 0 || sync())
3604+
if (__cv_ == 0 || !__bufptr_ || sync())
36053605
return pos_type(off_type(-1));
36063606
if (__bufptr_->pubseekpos(__sp, __wch) == pos_type(off_type(-1)))
36073607
return pos_type(off_type(-1));
@@ -3611,7 +3611,7 @@ wbuffer_convert<_Codecvt, _Elem, _Tr>::seekpos(pos_type __sp, ios_base::openmode
36113611
template <class _Codecvt, class _Elem, class _Tr>
36123612
int wbuffer_convert<_Codecvt, _Elem, _Tr>::sync() {
36133613
_LIBCPP_SUPPRESS_DEPRECATED_POP
3614-
if (__cv_ == 0 || __bufptr_ == 0)
3614+
if (__cv_ == 0 || !__bufptr_)
36153615
return 0;
36163616
if (__cm_ & ios_base::out) {
36173617
if (this->pptr() != this->pbase())

0 commit comments

Comments
 (0)