diff options
author | Dhruv <dhruv.batra@hotmail.com> | 2018-08-06 23:10:16 +0800 |
---|---|---|
committer | Dhruv <dhruv.batra@hotmail.com> | 2018-08-07 08:03:57 +0800 |
commit | 526b350199e604b62daaee9febc5d8a8d593a010 (patch) | |
tree | b5b0408408979675429fab071c5ce1cae1313a54 /src/google/protobuf/stubs/mutex.h | |
parent | e9a5412afcb5035c02136ba65210bf2cb69d9ab5 (diff) | |
download | protobuf-526b350199e604b62daaee9febc5d8a8d593a010.tar.gz protobuf-526b350199e604b62daaee9febc5d8a8d593a010.tar.bz2 protobuf-526b350199e604b62daaee9febc5d8a8d593a010.zip |
4593 Replace all occurrences of "NULL" to nullptr in src/google/protobug/stubs
Diffstat (limited to 'src/google/protobuf/stubs/mutex.h')
-rw-r--r-- | src/google/protobuf/stubs/mutex.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/google/protobuf/stubs/mutex.h b/src/google/protobuf/stubs/mutex.h index 47edb7a3..2b1aab87 100644 --- a/src/google/protobuf/stubs/mutex.h +++ b/src/google/protobuf/stubs/mutex.h @@ -86,12 +86,12 @@ class LIBPROTOBUF_EXPORT MutexLock { typedef MutexLock ReaderMutexLock; typedef MutexLock WriterMutexLock; -// MutexLockMaybe is like MutexLock, but is a no-op when mu is NULL. +// MutexLockMaybe is like MutexLock, but is a no-op when mu is nullptr. class LIBPROTOBUF_EXPORT MutexLockMaybe { public: explicit MutexLockMaybe(Mutex *mu) : - mu_(mu) { if (this->mu_ != NULL) { this->mu_->Lock(); } } - ~MutexLockMaybe() { if (this->mu_ != NULL) { this->mu_->Unlock(); } } + mu_(mu) { if (this->mu_ != nullptr) { this->mu_->Lock(); } } + ~MutexLockMaybe() { if (this->mu_ != nullptr) { this->mu_->Unlock(); } } private: Mutex *const mu_; GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MutexLockMaybe); @@ -109,7 +109,7 @@ class ThreadLocalStorage { } T* Get() { T* result = static_cast<T*>(pthread_getspecific(key_)); - if (result == NULL) { + if (result == nullptr) { result = new T(); pthread_setspecific(key_, result); } |