diff options
author | Craig Topper <craig.topper@gmail.com> | 2014-04-07 04:17:22 +0000 |
---|---|---|
committer | Craig Topper <craig.topper@gmail.com> | 2014-04-07 04:17:22 +0000 |
commit | 34bc6b6e787f27b5c9e05c82de4c1b4ac9b117bc (patch) | |
tree | 8b1bfdc38d13cfbca1dbd93a0e77e8d1b89385c7 /lib/Support/ManagedStatic.cpp | |
parent | b81024bc6ef83ee4242b4fab77784a0b5ad4e1b8 (diff) | |
download | llvm-34bc6b6e787f27b5c9e05c82de4c1b4ac9b117bc.tar.gz llvm-34bc6b6e787f27b5c9e05c82de4c1b4ac9b117bc.tar.bz2 llvm-34bc6b6e787f27b5c9e05c82de4c1b4ac9b117bc.tar.xz |
[C++11] Make use of 'nullptr' in the Support library.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@205697 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Support/ManagedStatic.cpp')
-rw-r--r-- | lib/Support/ManagedStatic.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/Support/ManagedStatic.cpp b/lib/Support/ManagedStatic.cpp index 098cccb68d..e358fe8c5c 100644 --- a/lib/Support/ManagedStatic.cpp +++ b/lib/Support/ManagedStatic.cpp @@ -17,15 +17,15 @@ #include <cassert> using namespace llvm; -static const ManagedStaticBase *StaticList = 0; +static const ManagedStaticBase *StaticList = nullptr; void ManagedStaticBase::RegisterManagedStatic(void *(*Creator)(), void (*Deleter)(void*)) const { if (llvm_is_multithreaded()) { llvm_acquire_global_lock(); - if (Ptr == 0) { - void* tmp = Creator ? Creator() : 0; + if (Ptr == nullptr) { + void* tmp = Creator ? Creator() : nullptr; TsanHappensBefore(this); sys::MemoryFence(); @@ -47,7 +47,7 @@ void ManagedStaticBase::RegisterManagedStatic(void *(*Creator)(), } else { assert(Ptr == 0 && DeleterFn == 0 && Next == 0 && "Partially initialized ManagedStatic!?"); - Ptr = Creator ? Creator() : 0; + Ptr = Creator ? Creator() : nullptr; DeleterFn = Deleter; // Add to list of managed statics. @@ -62,14 +62,14 @@ void ManagedStaticBase::destroy() const { "Not destroyed in reverse order of construction?"); // Unlink from list. StaticList = Next; - Next = 0; + Next = nullptr; // Destroy memory. DeleterFn(Ptr); // Cleanup. - Ptr = 0; - DeleterFn = 0; + Ptr = nullptr; + DeleterFn = nullptr; } /// llvm_shutdown - Deallocate and destroy all ManagedStatic variables. |