v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes a bunch of errors with -pedantic -std=c99 and GCC 4.7.2: ISO C restricts enumerator values to range of ‘int’

pull/39/head
Dennis Schridde 2013-05-14 10:37:34 +02:00
parent bcc311515a
commit a65a69fdc9
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/assimp/anim.h
View File

@ -208,7 +208,7 @@ enum aiAnimBehaviour
/** This value is not used, it is just here to force the /** This value is not used, it is just here to force the
* the compiler to map this enum to a 32 Bit integer */ * the compiler to map this enum to a 32 Bit integer */
#ifndef SWIG #ifndef SWIG
_aiAnimBehaviour_Force32Bit = 0x8fffffff _aiAnimBehaviour_Force32Bit = INT_MAX
#endif #endif
}; };

2
include/assimp/light.h
View File

@ -80,7 +80,7 @@ enum aiLightSourceType
* compiler to map this enum to a 32 Bit integer. * compiler to map this enum to a 32 Bit integer.
*/ */
#ifndef SWIG #ifndef SWIG
_aiLightSource_Force32Bit = 0x9fffffff _aiLightSource_Force32Bit = INT_MAX
#endif #endif
}; };

16
include/assimp/material.h
View File

@ -100,7 +100,7 @@ enum aiTextureOp
* 32 Bit integers to represent this enum. * 32 Bit integers to represent this enum.
*/ */
#ifndef SWIG #ifndef SWIG
_aiTextureOp_Force32Bit = 0x9fffffff _aiTextureOp_Force32Bit = INT_MAX
#endif #endif
//! @endcond //! @endcond
}; };
@ -136,7 +136,7 @@ enum aiTextureMapMode
* 32 Bit integers to represent this enum. * 32 Bit integers to represent this enum.
*/ */
#ifndef SWIG #ifndef SWIG
_aiTextureMapMode_Force32Bit = 0x9fffffff _aiTextureMapMode_Force32Bit = INT_MAX
#endif #endif
//! @endcond //! @endcond
}; };
@ -181,7 +181,7 @@ enum aiTextureMapping
* 32 Bit integers to represent this enum. * 32 Bit integers to represent this enum.
*/ */
#ifndef SWIG #ifndef SWIG
_aiTextureMapping_Force32Bit = 0x9fffffff _aiTextureMapping_Force32Bit = INT_MAX
#endif #endif
//! @endcond //! @endcond
}; };
@ -301,7 +301,7 @@ enum aiTextureType
* 32 Bit integers to represent this enum. * 32 Bit integers to represent this enum.
*/ */
#ifndef SWIG #ifndef SWIG
_aiTextureType_Force32Bit = 0x9fffffff _aiTextureType_Force32Bit = INT_MAX
#endif #endif
//! @endcond //! @endcond
}; };
@ -379,7 +379,7 @@ enum aiShadingMode
* 32 Bit integers to represent this enum. * 32 Bit integers to represent this enum.
*/ */
#ifndef SWIG #ifndef SWIG
_aiShadingMode_Force32Bit = 0x9fffffff _aiShadingMode_Force32Bit = INT_MAX
#endif #endif
//! @endcond //! @endcond
}; };
@ -425,7 +425,7 @@ enum aiTextureFlags
* 32 Bit integers to represent this enum. * 32 Bit integers to represent this enum.
*/ */
#ifndef SWIG #ifndef SWIG
_aiTextureFlags_Force32Bit = 0x9fffffff _aiTextureFlags_Force32Bit = INT_MAX
#endif #endif
//! @endcond //! @endcond
}; };
@ -474,7 +474,7 @@ enum aiBlendMode
* 32 Bit integers to represent this enum. * 32 Bit integers to represent this enum.
*/ */
#ifndef SWIG #ifndef SWIG
_aiBlendMode_Force32Bit = 0x9fffffff _aiBlendMode_Force32Bit = INT_MAX
#endif #endif
//! @endcond //! @endcond
}; };
@ -568,7 +568,7 @@ enum aiPropertyTypeInfo
* compiler to map this enum to a 32 Bit integer. * compiler to map this enum to a 32 Bit integer.
*/ */
#ifndef SWIG #ifndef SWIG
_aiPTI_Force32Bit = 0x9fffffff _aiPTI_Force32Bit = INT_MAX
#endif #endif
}; };

2
include/assimp/mesh.h
View File

@ -319,7 +319,7 @@ enum aiPrimitiveType
* compiler to map this enum to a 32 Bit integer. * compiler to map this enum to a 32 Bit integer.
*/ */
#ifndef SWIG #ifndef SWIG
_aiPrimitiveType_Force32Bit = 0x9fffffff _aiPrimitiveType_Force32Bit = INT_MAX
#endif #endif
}; //! enum aiPrimitiveType }; //! enum aiPrimitiveType

1
include/assimp/types.h
View File

@ -50,6 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <memory.h> #include <memory.h>
#include <math.h> #include <math.h>
#include <stddef.h> #include <stddef.h>
#include <limits.h>
// Our compile configuration // Our compile configuration
#include "defs.h" #include "defs.h"