diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-11-24 01:04:23 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2020-11-24 01:04:23 +0100 |
| commit | 452f1dbb258b573c97ad0083a891b43d0b543cd1 (patch) | |
| tree | 97fca6c6ce9949fad4e97664786c12f76d64962c | |
| parent | 5d867c43a78a7a68968a0b6b2866b0797c29facd (diff) | |
| download | PROJ-452f1dbb258b573c97ad0083a891b43d0b543cd1.tar.gz PROJ-452f1dbb258b573c97ad0083a891b43d0b543cd1.zip | |
mutex.cpp: replace NULL by nullptr
| -rw-r--r-- | src/mutex.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mutex.cpp b/src/mutex.cpp index da415e55..60ed5be1 100644 --- a/src/mutex.cpp +++ b/src/mutex.cpp @@ -184,7 +184,7 @@ void pj_cleanup_lock() #include <windows.h> -static HANDLE mutex_lock = NULL; +static HANDLE mutex_lock = nullptr; #if _WIN32_WINNT >= 0x0600 @@ -199,7 +199,7 @@ static BOOL CALLBACK pj_create_lock(PINIT_ONCE InitOnce, (void)InitOnce; (void)Parameter; (void)Context; - mutex_lock = CreateMutex( NULL, FALSE, NULL ); + mutex_lock = CreateMutex( nullptr, FALSE, nullptr ); return TRUE; } #endif @@ -213,10 +213,10 @@ static void pj_init_lock() { #if _WIN32_WINNT >= 0x0600 static INIT_ONCE sInitOnce = INIT_ONCE_STATIC_INIT; - InitOnceExecuteOnce( &sInitOnce, pj_create_lock, NULL, NULL ); + InitOnceExecuteOnce( &sInitOnce, pj_create_lock, nullptr, nullptr ); #else - if( mutex_lock == NULL ) - mutex_lock = CreateMutex( NULL, FALSE, NULL ); + if( mutex_lock == nullptr ) + mutex_lock = CreateMutex( nullptr, FALSE, nullptr ); #endif } @@ -228,7 +228,7 @@ static void pj_init_lock() void pj_acquire_lock() { - if( mutex_lock == NULL ) + if( mutex_lock == nullptr ) pj_init_lock(); WaitForSingleObject( mutex_lock, INFINITE ); @@ -242,7 +242,7 @@ void pj_acquire_lock() void pj_release_lock() { - if( mutex_lock == NULL ) + if( mutex_lock == nullptr ) pj_init_lock(); else ReleaseMutex( mutex_lock ); @@ -253,10 +253,10 @@ void pj_release_lock() /************************************************************************/ void pj_cleanup_lock() { - if( mutex_lock != NULL ) + if( mutex_lock != nullptr ) { CloseHandle( mutex_lock ); - mutex_lock = NULL; + mutex_lock = nullptr; } } |