diff options
author | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
commit | 6630937e63ae5797487b86743a7733c8ae5cc42c (patch) | |
tree | 3d53dacf6430f9099e1fb20835881205de674961 /src/3rdparty/angle/src/common/tls.cpp | |
parent | 37ed6dae00640f9cc980ffda05347c12a7eb5d7e (diff) | |
parent | c7af193d2e49e9f10b86262e63d8d13abf72b5cf (diff) |
Merge commit 'dev' into 'wip/cmake-merge'
Change-Id: I176c40d031be26a1dd1cf08843e448a660598783
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 |