diff options
| -rw-r--r-- | libcxx/include/__string | 10 | ||||
| -rw-r--r-- | libcxx/include/algorithm | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libcxx/include/__string b/libcxx/include/__string index d30c7fddc8d..44c55987f9f 100644 --- a/libcxx/include/__string +++ b/libcxx/include/__string @@ -266,7 +266,7 @@ const char* char_traits<char>::find(const char_type* __s, size_t __n, const char_type& __a) _NOEXCEPT { if (__n == 0) - return NULL; + return nullptr; #if __has_feature(cxx_constexpr_string_builtins) return __builtin_char_memchr(__s, to_int_type(__a), __n); #elif _LIBCPP_STD_VER <= 14 @@ -278,7 +278,7 @@ char_traits<char>::find(const char_type* __s, size_t __n, const char_type& __a) return __s; ++__s; } - return NULL; + return nullptr; #endif } @@ -372,9 +372,9 @@ const wchar_t* char_traits<wchar_t>::find(const char_type* __s, size_t __n, const char_type& __a) _NOEXCEPT { if (__n == 0) - return NULL; + return nullptr; #if __has_feature(cxx_constexpr_string_builtins) - return __builtin_wmemchr(__s, __a, __n); + return __builtin_wmemchr(__s, __a, __n); #elif _LIBCPP_STD_VER <= 14 return wmemchr(__s, __a, __n); #else @@ -384,7 +384,7 @@ char_traits<wchar_t>::find(const char_type* __s, size_t __n, const char_type& __ return __s; ++__s; } - return NULL; + return nullptr; #endif } diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm index 9d2690d5b44..a94b07bda20 100644 --- a/libcxx/include/algorithm +++ b/libcxx/include/algorithm @@ -4703,9 +4703,9 @@ __stable_sort_move(_RandomAccessIterator __first1, _RandomAccessIterator __last1 ::new(__first2) value_type(_VSTD::move(*__first1)); return; case 2: - __destruct_n __d(0); + __destruct_n __d(0); unique_ptr<value_type, __destruct_n&> __h2(__first2, __d); - if (__comp(*--__last1, *__first1)) + if (__comp(*--__last1, *__first1)) { ::new(__first2) value_type(_VSTD::move(*__last1)); __d.__incr((value_type*)0); |
