From 1ab7271e7d0a6c8d2165ff179fe38465646dfad3 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sun, 18 Aug 2013 21:33:13 +0200 Subject: [PATCH] Fixed is_int and is_uint code duplication with GCC and C++11 #107 --- glm/core/type_int.hpp | 8 +++++++- readme.txt | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/glm/core/type_int.hpp b/glm/core/type_int.hpp index 147559d1..c7de0c5a 100644 --- a/glm/core/type_int.hpp +++ b/glm/core/type_int.hpp @@ -47,13 +47,19 @@ namespace detail GLM_DETAIL_IS_INT(signed short); GLM_DETAIL_IS_INT(signed int); GLM_DETAIL_IS_INT(signed long); - GLM_DETAIL_IS_INT(highp_int_t); GLM_DETAIL_IS_UINT(unsigned char); GLM_DETAIL_IS_UINT(unsigned short); GLM_DETAIL_IS_UINT(unsigned int); GLM_DETAIL_IS_UINT(unsigned long); + +#if(GLM_LANG >= GLM_LANG_CXX0X) + GLM_DETAIL_IS_INT(signed long long); + GLM_DETAIL_IS_UINT(unsigned long long); +#else + GLM_DETAIL_IS_INT(highp_int_t); GLM_DETAIL_IS_UINT(highp_uint_t); +#endif }//namespace detail /// @addtogroup core_precision diff --git a/readme.txt b/readme.txt index f605b998..39888689 100644 --- a/readme.txt +++ b/readme.txt @@ -40,7 +40,7 @@ http://glm.g-truc.net/glm.pdf GLM 0.9.4.6: 2013-08-XX -------------------------------------------------------------------------------- - Fixed detection to select the last known compiler if newer version #106 -- +- Fixed is_int and is_uint code duplication with GCC and C++11 #107 ================================================================================ GLM 0.9.4.5: 2013-08-12