From 4a701c676086dea128ed1b59e77719f5c73e4ab1 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Mon, 1 Sep 2014 04:27:55 -0400 Subject: [PATCH] Limited extended integer type redifinition (#233) --- glm/fwd.hpp | 17 ++++++++++++++++- readme.txt | 1 + 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/glm/fwd.hpp b/glm/fwd.hpp index 3471fb3b..e2a9822d 100644 --- a/glm/fwd.hpp +++ b/glm/fwd.hpp @@ -287,6 +287,13 @@ namespace glm /// @see gtc_type_precision 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. /// @see gtc_type_precision typedef detail::int8 int8_t; @@ -302,6 +309,7 @@ namespace glm /// 64 bit signed integer type. /// @see gtc_type_precision typedef detail::int64 int64_t; +#endif /// 8 bit signed integer type. /// @see gtc_type_precision @@ -889,6 +897,12 @@ namespace glm /// @see gtc_type_precision 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. /// @see gtc_type_precision typedef detail::uint8 uint8_t; @@ -904,7 +918,8 @@ namespace glm /// 64 bit unsigned integer type. /// @see gtc_type_precision typedef detail::uint64 uint64_t; - +#endif + /// 8 bit unsigned integer type. /// @see gtc_type_precision typedef detail::uint8 u8; diff --git a/readme.txt b/readme.txt index cc17c1f7..b2681d71 100644 --- a/readme.txt +++ b/readme.txt @@ -46,6 +46,7 @@ GLM 0.9.6.0: 2014-XX-XX - Use pragma once - Fixed Visual Studio 14 compiler warnings - Added *vec1 support to *vec2 types +- Limited extended integer type redifinition (#233) ================================================================================ GLM 0.9.5.5: 2014-XX-XX