From 656adf1fcdfdd7bfe3b2f7c5ecb030b8a32c0c58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 29 Sep 2020 10:28:27 +0200 Subject: [PATCH] Remove old define for thread local storage --- ext/native/base/basictypes.h | 7 ------- ext/native/thread/threadutil.cpp | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/ext/native/base/basictypes.h b/ext/native/base/basictypes.h index feb9abfb13..3334cea629 100644 --- a/ext/native/base/basictypes.h +++ b/ext/native/base/basictypes.h @@ -58,10 +58,3 @@ inline uint64_t swap64(uint64_t data) {return ((uint64_t)swap32(data) << 32) | s inline uint16_t swap16(const uint8_t* _pData) {return swap16(*(const uint16_t*)_pData);} inline uint32_t swap32(const uint8_t* _pData) {return swap32(*(const uint32_t*)_pData);} inline uint64_t swap64(const uint8_t* _pData) {return swap64(*(const uint64_t*)_pData);} - -// Thread local storage -#ifdef _MSC_VER -#define __THREAD __declspec( thread ) -#else -#define __THREAD __thread -#endif diff --git a/ext/native/thread/threadutil.cpp b/ext/native/thread/threadutil.cpp index a47286b96f..9971293685 100644 --- a/ext/native/thread/threadutil.cpp +++ b/ext/native/thread/threadutil.cpp @@ -20,7 +20,7 @@ #endif #ifdef TLS_SUPPORTED -static __THREAD const char *curThreadName; +static thread_local const char *curThreadName; #endif #ifdef __MINGW32__