Merge branch 'develop' into Workaround_Thread_Local_MinGW

Attempt to work around issue with thread_local in mingw`
2016-01-12 15:00:45 -07:00 · 2015-11-20 07:19:37 -06:00
1 changed files with 2 additions and 1 deletions
--- a/include/chaiscript/chaiscript_defines.hpp
+++ b/include/chaiscript/chaiscript_defines.hpp
@ -29,8 +29,9 @@
 #define CHAISCRIPT_WINDOWS
 #endif

-#if (defined(__GNUC__) && __GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8) || (defined(__llvm__) && !defined(CHAISCRIPT_LIBCPP))  
+#if ( ( (defined(__GNUC__) && __GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8) ) && !defined(WIN32))  || (defined(__llvm__) && !defined(CHAISCRIPT_LIBCPP))  
 /// Currently only g++>=4.8 supports this natively
+/// MinGW pretends to, but causes a crash on exit when thread_local objects are destructed
 /// \todo Make this support other compilers when possible
 #define CHAISCRIPT_HAS_THREAD_LOCAL
 #endif
Author	SHA1	Message	Date
Jason Turner	5852412d2c	Merge branch 'develop' into Workaround_Thread_Local_MinGW	2016-01-12 15:00:45 -07:00
Jason Turner	21c3853537	Attempt to work around issue with thread_local in mingw`	2015-11-20 07:19:37 -06:00