summaryrefslogtreecommitdiffstats
path: root/llvm/unittests/Support/ManagedStatic.cpp
diff options
context:
space:
mode:
authorCraig Topper <craig.topper@gmail.com>2014-06-08 22:29:17 +0000
committerCraig Topper <craig.topper@gmail.com>2014-06-08 22:29:17 +0000
commit66f09ad0417c0e9f0c959023c1cdfcf2d881ad2e (patch)
treeb9db3c4a6ee223002b945659169ab39cdd9fd80d /llvm/unittests/Support/ManagedStatic.cpp
parent41181d140c99913f8c8d73791dd4babfcba8a73d (diff)
downloadbcm5719-llvm-66f09ad0417c0e9f0c959023c1cdfcf2d881ad2e.tar.gz
bcm5719-llvm-66f09ad0417c0e9f0c959023c1cdfcf2d881ad2e.zip
[C++11] Use 'nullptr'.
llvm-svn: 210442
Diffstat (limited to 'llvm/unittests/Support/ManagedStatic.cpp')
-rw-r--r--llvm/unittests/Support/ManagedStatic.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/llvm/unittests/Support/ManagedStatic.cpp b/llvm/unittests/Support/ManagedStatic.cpp
index 1497f4e3408..ad2fc977e6d 100644
--- a/llvm/unittests/Support/ManagedStatic.cpp
+++ b/llvm/unittests/Support/ManagedStatic.cpp
@@ -25,7 +25,7 @@ namespace test1 {
llvm::ManagedStatic<int> ms;
void *helper(void*) {
*ms;
- return NULL;
+ return nullptr;
}
// Valgrind's leak checker complains glibc's stack allocation.
@@ -49,10 +49,10 @@ TEST(Initialize, MultipleThreads) {
llvm_start_multithreaded();
pthread_t t1, t2;
- pthread_create(&t1, &a1, test1::helper, NULL);
- pthread_create(&t2, &a2, test1::helper, NULL);
- pthread_join(t1, NULL);
- pthread_join(t2, NULL);
+ pthread_create(&t1, &a1, test1::helper, nullptr);
+ pthread_create(&t2, &a2, test1::helper, nullptr);
+ pthread_join(t1, nullptr);
+ pthread_join(t2, nullptr);
free(p1);
free(p2);
llvm_stop_multithreaded();
OpenPOWER on IntegriCloud