Merge branch 'master' into kimkullig_dev

2019-11-15 18:52:04 +01:00 · 2019-11-15 18:52:04 +01:00 · 13a4619817
parent 17946e26ef a9f82dbe0b
commit 13a4619817
1 changed files with 5 additions and 1 deletions
--- a/include/assimp/defs.h
+++ b/include/assimp/defs.h
@ -306,7 +306,11 @@ static const ai_real ai_epsilon = (ai_real) 0.00001;
 #define AI_MAX_ALLOC(type) ((256U * 1024 * 1024) / sizeof(type))

 #ifndef _MSC_VER
-#  define AI_NO_EXCEPT noexcept
+#  if __cplusplus >= 201103L // C++11
+#    define AI_NO_EXCEPT noexcept
+#  else
+#    define AI_NO_EXCEPT
+#  endif
 #else
 #  if (_MSC_VER >= 1915 )
 #    define AI_NO_EXCEPT noexcept