From a65a69fdc9a903adc2baac6658d52acb99c1cee6 Mon Sep 17 00:00:00 2001 From: Dennis Schridde Date: Tue, 14 May 2013 10:37:34 +0200 Subject: [PATCH] =?UTF-8?q?Fixes=20a=20bunch=20of=20errors=20with=20-pedan?= =?UTF-8?q?tic=20-std=3Dc99=20and=20GCC=204.7.2:=20ISO=20C=20restricts=20e?= =?UTF-8?q?numerator=20values=20to=20range=20of=20=E2=80=98int=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/assimp/anim.h | 2 +- include/assimp/light.h | 2 +- include/assimp/material.h | 16 ++++++++-------- include/assimp/mesh.h | 2 +- include/assimp/types.h | 1 + 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/include/assimp/anim.h b/include/assimp/anim.h index 04ba5e782..a87841cef 100644 --- a/include/assimp/anim.h +++ b/include/assimp/anim.h @@ -208,7 +208,7 @@ enum aiAnimBehaviour /** This value is not used, it is just here to force the * the compiler to map this enum to a 32 Bit integer */ #ifndef SWIG - _aiAnimBehaviour_Force32Bit = 0x8fffffff + _aiAnimBehaviour_Force32Bit = INT_MAX #endif }; diff --git a/include/assimp/light.h b/include/assimp/light.h index 9e62033d3..6b01c2878 100644 --- a/include/assimp/light.h +++ b/include/assimp/light.h @@ -80,7 +80,7 @@ enum aiLightSourceType * compiler to map this enum to a 32 Bit integer. */ #ifndef SWIG - _aiLightSource_Force32Bit = 0x9fffffff + _aiLightSource_Force32Bit = INT_MAX #endif }; diff --git a/include/assimp/material.h b/include/assimp/material.h index b7238f69f..d42eb5355 100644 --- a/include/assimp/material.h +++ b/include/assimp/material.h @@ -100,7 +100,7 @@ enum aiTextureOp * 32 Bit integers to represent this enum. */ #ifndef SWIG - _aiTextureOp_Force32Bit = 0x9fffffff + _aiTextureOp_Force32Bit = INT_MAX #endif //! @endcond }; @@ -136,7 +136,7 @@ enum aiTextureMapMode * 32 Bit integers to represent this enum. */ #ifndef SWIG - _aiTextureMapMode_Force32Bit = 0x9fffffff + _aiTextureMapMode_Force32Bit = INT_MAX #endif //! @endcond }; @@ -181,7 +181,7 @@ enum aiTextureMapping * 32 Bit integers to represent this enum. */ #ifndef SWIG - _aiTextureMapping_Force32Bit = 0x9fffffff + _aiTextureMapping_Force32Bit = INT_MAX #endif //! @endcond }; @@ -301,7 +301,7 @@ enum aiTextureType * 32 Bit integers to represent this enum. */ #ifndef SWIG - _aiTextureType_Force32Bit = 0x9fffffff + _aiTextureType_Force32Bit = INT_MAX #endif //! @endcond }; @@ -379,7 +379,7 @@ enum aiShadingMode * 32 Bit integers to represent this enum. */ #ifndef SWIG - _aiShadingMode_Force32Bit = 0x9fffffff + _aiShadingMode_Force32Bit = INT_MAX #endif //! @endcond }; @@ -425,7 +425,7 @@ enum aiTextureFlags * 32 Bit integers to represent this enum. */ #ifndef SWIG - _aiTextureFlags_Force32Bit = 0x9fffffff + _aiTextureFlags_Force32Bit = INT_MAX #endif //! @endcond }; @@ -474,7 +474,7 @@ enum aiBlendMode * 32 Bit integers to represent this enum. */ #ifndef SWIG - _aiBlendMode_Force32Bit = 0x9fffffff + _aiBlendMode_Force32Bit = INT_MAX #endif //! @endcond }; @@ -568,7 +568,7 @@ enum aiPropertyTypeInfo * compiler to map this enum to a 32 Bit integer. */ #ifndef SWIG - _aiPTI_Force32Bit = 0x9fffffff + _aiPTI_Force32Bit = INT_MAX #endif }; diff --git a/include/assimp/mesh.h b/include/assimp/mesh.h index df257e7f1..757299d72 100644 --- a/include/assimp/mesh.h +++ b/include/assimp/mesh.h @@ -319,7 +319,7 @@ enum aiPrimitiveType * compiler to map this enum to a 32 Bit integer. */ #ifndef SWIG - _aiPrimitiveType_Force32Bit = 0x9fffffff + _aiPrimitiveType_Force32Bit = INT_MAX #endif }; //! enum aiPrimitiveType diff --git a/include/assimp/types.h b/include/assimp/types.h index 592a128f2..22ca7abdc 100644 --- a/include/assimp/types.h +++ b/include/assimp/types.h @@ -50,6 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include +#include // Our compile configuration #include "defs.h"