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

Unified Diff: src/utils/SkThreadUtils_pthread.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 4 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 | « src/utils/SkThreadUtils.h ('k') | src/utils/SkThreadUtils_win.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/utils/SkThreadUtils_pthread.cpp
diff --git a/src/utils/SkThreadUtils_pthread.cpp b/src/utils/SkThreadUtils_pthread.cpp
index 7dec907df1076284cde4f0f00e32e1826bb42085..0bd804d43a51e74e186a2f23ab116a0723167100 100644
--- a/src/utils/SkThreadUtils_pthread.cpp
+++ b/src/utils/SkThreadUtils_pthread.cpp
@@ -14,8 +14,8 @@
#include <signal.h>
PThreadEvent::PThreadEvent() : fConditionFlag(false) {
- pthread_cond_init(&fCondition, NULL);
- pthread_mutex_init(&fConditionMutex, NULL);
+ pthread_cond_init(&fCondition, nullptr);
+ pthread_mutex_init(&fConditionMutex, nullptr);
}
PThreadEvent::~PThreadEvent() {
pthread_mutex_destroy(&fConditionMutex);
@@ -65,7 +65,7 @@ static void* thread_start(void* arg) {
if (!pthreadData->fCanceled.isTriggered()) {
pthreadData->fEntryPoint(pthreadData->fParam);
}
- return NULL;
+ return nullptr;
}
SkThread::SkThread(entryPointProc entryPoint, void* data) {
@@ -81,7 +81,7 @@ SkThread::SkThread(entryPointProc entryPoint, void* data) {
}
SkThread::~SkThread() {
- if (fData != NULL) {
+ if (fData != nullptr) {
SkThread_PThreadData* pthreadData = static_cast<SkThread_PThreadData*>(fData);
// If created thread but start was never called, kill the thread.
if (pthreadData->fValidPThread && !pthreadData->fStarted.isTriggered()) {
@@ -113,5 +113,5 @@ void SkThread::join() {
return;
}
- pthread_join(pthreadData->fPThread, NULL);
+ pthread_join(pthreadData->fPThread, nullptr);
}
« no previous file with comments | « src/utils/SkThreadUtils.h ('k') | src/utils/SkThreadUtils_win.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698