Merge branch 'origin/develop' into release_2_0

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12.1)
+cmake_minimum_required(VERSION 3.0)
 project(easy_profiler CXX)
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)

easy_profiler_core/CMakeLists.txt

@@ -15,6 +15,10 @@ if (NOT WIN32)
         if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "3.3")
             set(NO_CXX11_THREAD_LOCAL_SUPPORT TRUE)
         endif ()
+    elseif (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+        if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "8.0")
+            set(NO_CXX11_THREAD_LOCAL_SUPPORT TRUE)
+        endif ()
     endif ()
     
     # TODO: Check thread_local keyword support for other compilers for Unix

easy_profiler_core/include/easy/details/easy_compiler_support.h

@@ -96,8 +96,8 @@
 
 # define EASY_COMPILER_VERSION (__clang_major__ * 10 + __clang_minor__)
 
-# if EASY_COMPILER_VERSION < 33
-// There is no support for C++11 thread_local keyword prior to Clang v3.3. Use __thread instead.
+# if EASY_COMPILER_VERSION < 33 || (defined(__APPLE_CC__) && __APPLE_CC__ < 8000)
+// There is no support for C++11 thread_local keyword prior to Clang v3.3 and Apple LLVM clang 8.0. Use __thread instead.
 #  define EASY_THREAD_LOCAL __thread
 # endif
 

easy_profiler_core/nonscoped_block.cpp

@@ -41,7 +41,8 @@ The Apache License, Version 2.0 (the "License");
 **/
 
 #include "nonscoped_block.h"
-#include <string.h>
+#include <cstring>
+#include <cstdlib>
 
 NonscopedBlock::NonscopedBlock(const profiler::BaseBlockDescriptor* _desc, const char* _runtimeName, bool)
     : profiler::Block(_desc, _runtimeName, false), m_runtimeName(nullptr)

easy_profiler_core/stack_buffer.h

@@ -46,6 +46,7 @@ The Apache License, Version 2.0 (the "License");
 #include "nonscoped_block.h"
 #include <list>
 #include <algorithm>
+#include <cstdlib>
 
 #ifdef max
 #undef max