|
@@ -3,7 +3,7 @@
|
|
|
Open Asset Import Library (assimp)
|
|
|
---------------------------------------------------------------------------
|
|
|
|
|
|
-Copyright (c) 2006-2020, assimp team
|
|
|
+Copyright (c) 2006-2021, assimp team
|
|
|
|
|
|
All rights reserved.
|
|
|
|
|
@@ -156,24 +156,21 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
#endif // _WIN32
|
|
|
|
|
|
#ifdef _MSC_VER
|
|
|
-#pragma warning(disable : 4521 4512 4714 4127 4351 4510)
|
|
|
-#ifdef ASSIMP_BUILD_DLL_EXPORT
|
|
|
-#pragma warning(disable : 4251)
|
|
|
-#endif
|
|
|
-/* Force the compiler to inline a function, if possible
|
|
|
- */
|
|
|
-#define AI_FORCE_INLINE __forceinline
|
|
|
-
|
|
|
-/* Tells the compiler that a function never returns. Used in code analysis
|
|
|
- * to skip dead paths (e.g. after an assertion evaluated to false). */
|
|
|
-#define AI_WONT_RETURN __declspec(noreturn)
|
|
|
+ #pragma warning(disable : 4521 4512 4714 4127 4351 4510)
|
|
|
+ #ifdef ASSIMP_BUILD_DLL_EXPORT
|
|
|
+ #pragma warning(disable : 4251)
|
|
|
+ #endif
|
|
|
+ /* Force the compiler to inline a function, if possible */
|
|
|
+ #define AI_FORCE_INLINE inline
|
|
|
+
|
|
|
+ /* Tells the compiler that a function never returns. Used in code analysis
|
|
|
+ * to skip dead paths (e.g. after an assertion evaluated to false). */
|
|
|
+ #define AI_WONT_RETURN __declspec(noreturn)
|
|
|
#elif defined(SWIG)
|
|
|
-
|
|
|
-/* Do nothing, the relevant defines are all in AssimpSwigPort.i */
|
|
|
-
|
|
|
+ /* Do nothing, the relevant defines are all in AssimpSwigPort.i */
|
|
|
#else
|
|
|
-#define AI_WONT_RETURN
|
|
|
-#define AI_FORCE_INLINE inline
|
|
|
+ #define AI_WONT_RETURN
|
|
|
+ #define AI_FORCE_INLINE inline
|
|
|
#endif // (defined _MSC_VER)
|
|
|
|
|
|
#ifdef __GNUC__
|