Commit 68cc3e68 authored by Gabi Melman's avatar Gabi Melman Committed by GitHub

Merge pull request #329 from PMExtra/master

fixed compilation error in clang before version 8
parents 33494049 f7574eb4
...@@ -315,7 +315,7 @@ inline size_t _thread_id() ...@@ -315,7 +315,7 @@ inline size_t _thread_id()
//Return current thread id as size_t (from thread local storage) //Return current thread id as size_t (from thread local storage)
inline size_t thread_id() inline size_t thread_id()
{ {
#if defined(_MSC_VER) && (_MSC_VER < 1900) #if defined(_MSC_VER) && (_MSC_VER < 1900) || defined(__clang_major__) && (__clang_major__ < 8)
return _thread_id(); return _thread_id();
#else #else
static thread_local const size_t tid = _thread_id(); static thread_local const size_t tid = _thread_id();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment