Limited extended integer type redifinition (#233)

This commit is contained in:
Christophe Riccio 2014-09-01 04:27:55 -04:00
parent 90acd7236d
commit 4a701c6760
2 changed files with 17 additions and 1 deletions

View File

@ -287,6 +287,13 @@ namespace glm
/// @see gtc_type_precision /// @see gtc_type_precision
typedef detail::int64 int64; typedef detail::int64 int64;
#if GLM_HAS_EXTENDED_INTEGER_TYPE
using std::int8_t;
using std::int16_t;
using std::int32_t;
using std::int64_t;
#else
/// 8 bit signed integer type. /// 8 bit signed integer type.
/// @see gtc_type_precision /// @see gtc_type_precision
typedef detail::int8 int8_t; typedef detail::int8 int8_t;
@ -302,6 +309,7 @@ namespace glm
/// 64 bit signed integer type. /// 64 bit signed integer type.
/// @see gtc_type_precision /// @see gtc_type_precision
typedef detail::int64 int64_t; typedef detail::int64 int64_t;
#endif
/// 8 bit signed integer type. /// 8 bit signed integer type.
/// @see gtc_type_precision /// @see gtc_type_precision
@ -889,6 +897,12 @@ namespace glm
/// @see gtc_type_precision /// @see gtc_type_precision
typedef detail::uint64 uint64; typedef detail::uint64 uint64;
#if GLM_HAS_EXTENDED_INTEGER_TYPE
using std::uint8_t;
using std::uint16_t;
using std::uint32_t;
using std::uint64_t;
#else
/// 8 bit unsigned integer type. /// 8 bit unsigned integer type.
/// @see gtc_type_precision /// @see gtc_type_precision
typedef detail::uint8 uint8_t; typedef detail::uint8 uint8_t;
@ -904,6 +918,7 @@ namespace glm
/// 64 bit unsigned integer type. /// 64 bit unsigned integer type.
/// @see gtc_type_precision /// @see gtc_type_precision
typedef detail::uint64 uint64_t; typedef detail::uint64 uint64_t;
#endif
/// 8 bit unsigned integer type. /// 8 bit unsigned integer type.
/// @see gtc_type_precision /// @see gtc_type_precision

View File

@ -46,6 +46,7 @@ GLM 0.9.6.0: 2014-XX-XX
- Use pragma once - Use pragma once
- Fixed Visual Studio 14 compiler warnings - Fixed Visual Studio 14 compiler warnings
- Added *vec1 support to *vec2 types - Added *vec1 support to *vec2 types
- Limited extended integer type redifinition (#233)
================================================================================ ================================================================================
GLM 0.9.5.5: 2014-XX-XX GLM 0.9.5.5: 2014-XX-XX