diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-26 10:28:24 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-10-26 10:28:24 +0000 |
| commit | 00b2e45a97205975ee91aa43f00e3dbef1a8907b (patch) | |
| tree | ed44e50bc893e87434d72470c2c809b1fb34de72 /src/3rdparty/angle/src/common/tls.cpp | |
| parent | 9cd527bc1f384926985d63c741641316a66f17a4 (diff) | |
| parent | e28e91ae99b8c3859899e04cc9370534c7c7b86d (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into dev" into refs/staging/dev
Diffstat (limited to 'src/3rdparty/angle/src/common/tls.cpp')
| -rw-r--r-- | src/3rdparty/angle/src/common/tls.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/angle/src/common/tls.cpp b/src/3rdparty/angle/src/common/tls.cpp index cb1b32d325..10a10252f4 100644 --- a/src/3rdparty/angle/src/common/tls.cpp +++ b/src/3rdparty/angle/src/common/tls.cpp @@ -56,7 +56,7 @@ TLSIndex CreateTLSIndex() #elif defined(ANGLE_PLATFORM_POSIX) // Create global pool key - if ((pthread_key_create(&index, NULL)) != 0) + if ((pthread_key_create(&index, nullptr)) != 0) { index = TLS_INVALID_INDEX; } @@ -133,7 +133,7 @@ void *GetTLSValue(TLSIndex index) assert(index != TLS_INVALID_INDEX && "GetTLSValue(): Invalid TLS Index"); if (index == TLS_INVALID_INDEX) { - return NULL; + return nullptr; } #ifdef ANGLE_PLATFORM_WINDOWS |