Merge branch 'kimkullig_dev' of https://github.com/assimp/assimp into kimkullig_dev

pull/2764/head
Kim Kulling 2019-11-15 19:39:14 +01:00
commit 9493ec670d
1 changed files with 5 additions and 1 deletions

View File

@ -306,8 +306,12 @@ static const ai_real ai_epsilon = (ai_real) 0.00001;
#define AI_MAX_ALLOC(type) ((256U * 1024 * 1024) / sizeof(type))
#ifndef _MSC_VER
# 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
# else