summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Support/ManagedStatic.cpp
diff options
context:
space:
mode:
authorCraig Topper <craig.topper@gmail.com>2014-04-07 04:17:22 +0000
committerCraig Topper <craig.topper@gmail.com>2014-04-07 04:17:22 +0000
commitc10719f55d3babe47ce754ad4e4964c7cd90d6e8 (patch)
tree28574fe7c646e03e6660387f3595f098d75fcd3f /llvm/lib/Support/ManagedStatic.cpp
parent093edf8c7f4d44979376892303d101f02924c68f (diff)
downloadbcm5719-llvm-c10719f55d3babe47ce754ad4e4964c7cd90d6e8.tar.gz
bcm5719-llvm-c10719f55d3babe47ce754ad4e4964c7cd90d6e8.zip
[C++11] Make use of 'nullptr' in the Support library.
llvm-svn: 205697
Diffstat (limited to 'llvm/lib/Support/ManagedStatic.cpp')
-rw-r--r--llvm/lib/Support/ManagedStatic.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/llvm/lib/Support/ManagedStatic.cpp b/llvm/lib/Support/ManagedStatic.cpp
index 098cccb68df..e358fe8c5c1 100644
--- a/llvm/lib/Support/ManagedStatic.cpp
+++ b/llvm/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.
OpenPOWER on IntegriCloud