[libcxx] r302100 - Use nullptr instead of the literal 0

Eric Fiselier via cfe-commits cfe-commits at lists.llvm.org
Wed May 3 18:06:57 PDT 2017


Author: ericwf
Date: Wed May  3 20:06:56 2017
New Revision: 302100

URL: http://llvm.org/viewvc/llvm-project?rev=302100&view=rev
Log:
Use nullptr instead of the literal 0

Modified:
    libcxx/trunk/include/memory
    libcxx/trunk/src/memory.cpp

Modified: libcxx/trunk/include/memory
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/memory?rev=302100&r1=302099&r2=302100&view=diff
==============================================================================
--- libcxx/trunk/include/memory (original)
+++ libcxx/trunk/include/memory Wed May  3 20:06:56 2017
@@ -3559,7 +3559,7 @@ template <class _Tp, class _Dp, class _A
 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

Modified: libcxx/trunk/src/memory.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/memory.cpp?rev=302100&r1=302099&r2=302100&view=diff
==============================================================================
--- libcxx/trunk/src/memory.cpp (original)
+++ libcxx/trunk/src/memory.cpp Wed May  3 20:06:56 2017
@@ -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




More information about the cfe-commits mailing list