Merge pull request #329 from PMExtra/master

fixed compilation error in clang before version 8

Merge pull request #329 from PMExtra/master
fixed compilation error in clang before version 8
68cc3e68 · Gabi Melman · GitHub · 33494049 · f7574eb4 · 68cc3e68
Commit 68cc3e68 authored Dec 02, 2016 by Gabi Melman Committed by GitHub Dec 02, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

include/spdlog/details/os.h include/spdlog/details/os.h +1 -1

No files found.
--- a/include/spdlog/details/os.h
+++ b/include/spdlog/details/os.h
@@ -315,7 +315,7 @@ inline size_t _thread_id()
 //Return current thread id as size_t (from thread local storage)
 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();
 #else
    static thread_local const size_t tid = _thread_id();