diff options
author | Adam Cozzette <acozzette@gmail.com> | 2018-08-07 12:05:29 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-07 12:05:29 -0700 |
commit | f504d95d461319ad9fc11e0925569b84a4c65d7d (patch) | |
tree | 0d30b048b4176ec9aa7d3b14a60925cb74c6cc2b /src/google/protobuf/stubs/mutex.h | |
parent | 3389bd965b1fb6687056d81b069e99f8c2543cba (diff) | |
parent | 526b350199e604b62daaee9febc5d8a8d593a010 (diff) | |
download | protobuf-f504d95d461319ad9fc11e0925569b84a4c65d7d.tar.gz protobuf-f504d95d461319ad9fc11e0925569b84a4c65d7d.tar.bz2 protobuf-f504d95d461319ad9fc11e0925569b84a4c65d7d.zip |
Merge pull request #5010 from batradhruv/4593
#4593 Replace all occurrences of "NULL" to nullptr in src/google/proto…
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); } |