diff options
| -rw-r--r-- | libcxx/include/memory | 2 | ||||
| -rw-r--r-- | libcxx/src/memory.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libcxx/include/memory b/libcxx/include/memory index 3fc0e5a1bf1..a02d61c1259 100644 --- a/libcxx/include/memory +++ b/libcxx/include/memory @@ -3559,7 +3559,7 @@ template <class _Tp, class _Dp, class _Alloc> const void* __shared_ptr_pointer<_Tp, _Dp, _Alloc>::__get_deleter(const type_info& __t) const _NOEXCEPT { - return __t == typeid(_Dp) ? _VSTD::addressof(__data_.first().second()) : 0; + return __t == typeid(_Dp) ? _VSTD::addressof(__data_.first().second()) : nullptr; } #endif // _LIBCPP_NO_RTTI diff --git a/libcxx/src/memory.cpp b/libcxx/src/memory.cpp index f6f6fe8da62..62e7e234020 100644 --- a/libcxx/src/memory.cpp +++ b/libcxx/src/memory.cpp @@ -120,7 +120,7 @@ __shared_weak_count::lock() _NOEXCEPT object_owners+1)) return this; } - return 0; + return nullptr; } #if !defined(_LIBCPP_NO_RTTI) || !defined(_LIBCPP_BUILD_STATIC) @@ -128,7 +128,7 @@ __shared_weak_count::lock() _NOEXCEPT const void* __shared_weak_count::__get_deleter(const type_info&) const _NOEXCEPT { - return 0; + return nullptr; } #endif // _LIBCPP_NO_RTTI |
