aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkDescriptor.h
diff options
context:
space:
mode:
authorGravatar halcanary <halcanary@google.com>2015-08-27 07:41:13 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-08-27 07:41:16 -0700
commit96fcdcc219d2a0d3579719b84b28bede76efba64 (patch)
tree0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /src/core/SkDescriptor.h
parent435af2f736c85c3274a0c6760a3523810750d237 (diff)
Style Change: NULL->nullptr
Diffstat (limited to 'src/core/SkDescriptor.h')
-rw-r--r--src/core/SkDescriptor.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/SkDescriptor.h b/src/core/SkDescriptor.h
index e559215cb1..1f6f4a8657 100644
--- a/src/core/SkDescriptor.h
+++ b/src/core/SkDescriptor.h
@@ -37,10 +37,10 @@ public:
uint32_t getLength() const { return fLength; }
- void* addEntry(uint32_t tag, size_t length, const void* data = NULL) {
+ void* addEntry(uint32_t tag, size_t length, const void* data = nullptr) {
SkASSERT(tag);
SkASSERT(SkAlign4(length) == length);
- SkASSERT(this->findEntry(tag, NULL) == NULL);
+ SkASSERT(this->findEntry(tag, nullptr) == nullptr);
Entry* entry = (Entry*)((char*)this + fLength);
entry->fTag = tag;
@@ -77,7 +77,7 @@ public:
}
entry = (const Entry*)((const char*)(entry + 1) + entry->fLen);
}
- return NULL;
+ return nullptr;
}
SkDescriptor* copy() const {
@@ -134,9 +134,9 @@ private:
class SkAutoDescriptor : SkNoncopyable {
public:
- SkAutoDescriptor() : fDesc(NULL) {}
- SkAutoDescriptor(size_t size) : fDesc(NULL) { this->reset(size); }
- SkAutoDescriptor(const SkDescriptor& desc) : fDesc(NULL) {
+ SkAutoDescriptor() : fDesc(nullptr) {}
+ SkAutoDescriptor(size_t size) : fDesc(nullptr) { this->reset(size); }
+ SkAutoDescriptor(const SkDescriptor& desc) : fDesc(nullptr) {
size_t size = desc.getLength();
this->reset(size);
memcpy(fDesc, &desc, size);