Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(556)

Unified Diff: util/synchronization/semaphore_test.cc

Issue 656703002: Convert NULL to nullptr (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: Fix 80-column violations Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « util/posix/symbolic_constants_posix_test.cc ('k') | util/test/executable_path_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: util/synchronization/semaphore_test.cc
diff --git a/util/synchronization/semaphore_test.cc b/util/synchronization/semaphore_test.cc
index 07cc45b7c42bf786bb918fb406595d59631a7424..3e779574fd448214a70aa1db4c98c9b72e14f7c3 100644
--- a/util/synchronization/semaphore_test.cc
+++ b/util/synchronization/semaphore_test.cc
@@ -39,7 +39,7 @@ void* ThreadMain(void* argument) {
for (size_t iteration = 0; iteration < info->iterations; ++iteration) {
info->semaphore->Wait();
}
- return NULL;
+ return nullptr;
}
TEST(Semaphore, Threaded) {
@@ -48,12 +48,12 @@ TEST(Semaphore, Threaded) {
info.semaphore = &semaphore;
info.iterations = 1;
- int rv = pthread_create(&info.pthread, NULL, ThreadMain, &info);
+ int rv = pthread_create(&info.pthread, nullptr, ThreadMain, &info);
ASSERT_EQ(0, rv) << "pthread_create";
semaphore.Signal();
- rv = pthread_join(info.pthread, NULL);
+ rv = pthread_join(info.pthread, nullptr);
ASSERT_EQ(0, rv) << "pthread_join";
}
@@ -71,7 +71,8 @@ TEST(Semaphore, TenThreaded) {
info[index].iterations = index;
iterations += info[index].iterations;
- rv = pthread_create(&info[index].pthread, NULL, ThreadMain, &info[index]);
+ rv =
+ pthread_create(&info[index].pthread, nullptr, ThreadMain, &info[index]);
ASSERT_EQ(0, rv) << "pthread_create";
}
@@ -80,7 +81,7 @@ TEST(Semaphore, TenThreaded) {
}
for (size_t index = 0; index < kThreads; ++index) {
- rv = pthread_join(info[index].pthread, NULL);
+ rv = pthread_join(info[index].pthread, nullptr);
ASSERT_EQ(0, rv) << "pthread_join";
}
}
« no previous file with comments | « util/posix/symbolic_constants_posix_test.cc ('k') | util/test/executable_path_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698