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

Unified Diff: src/core/SkTLS.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/core/SkTLS.h ('k') | src/core/SkTMultiMap.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkTLS.cpp
diff --git a/src/core/SkTLS.cpp b/src/core/SkTLS.cpp
index b22446bd98ad15d0b5125647d23a6e4e84a3b050..a47dc14b5af6a742e7400f34637751801439e766 100755
--- a/src/core/SkTLS.cpp
+++ b/src/core/SkTLS.cpp
@@ -56,8 +56,8 @@ void SkTLS::Destructor(void* ptr) {
}
void* SkTLS::Get(CreateProc createProc, DeleteProc deleteProc) {
- if (NULL == createProc) {
- return NULL;
+ if (nullptr == createProc) {
+ return nullptr;
}
void* ptr = SkTLS::PlatformGetSpecific(true);
@@ -69,7 +69,7 @@ void* SkTLS::Get(CreateProc createProc, DeleteProc deleteProc) {
SkASSERT(rec->fDeleteProc == deleteProc);
return rec->fData;
}
- } while ((rec = rec->fNext) != NULL);
+ } while ((rec = rec->fNext) != nullptr);
// not found, so create a new one
}
@@ -86,8 +86,8 @@ void* SkTLS::Get(CreateProc createProc, DeleteProc deleteProc) {
}
void* SkTLS::Find(CreateProc createProc) {
- if (NULL == createProc) {
- return NULL;
+ if (nullptr == createProc) {
+ return nullptr;
}
void* ptr = SkTLS::PlatformGetSpecific(false);
@@ -98,20 +98,20 @@ void* SkTLS::Find(CreateProc createProc) {
if (rec->fCreateProc == createProc) {
return rec->fData;
}
- } while ((rec = rec->fNext) != NULL);
+ } while ((rec = rec->fNext) != nullptr);
}
- return NULL;
+ return nullptr;
}
void SkTLS::Delete(CreateProc createProc) {
- if (NULL == createProc) {
+ if (nullptr == createProc) {
return;
}
void* ptr = SkTLS::PlatformGetSpecific(false);
SkTLSRec* curr = (SkTLSRec*)ptr;
- SkTLSRec* prev = NULL;
+ SkTLSRec* prev = nullptr;
while (curr) {
SkTLSRec* next = curr->fNext;
if (curr->fCreateProc == createProc) {
« no previous file with comments | « src/core/SkTLS.h ('k') | src/core/SkTMultiMap.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698