Browse Source

Fixed is_int and is_uint code duplication with GCC and C++11 #107

Christophe Riccio 12 năm trước cách đây
mục cha
commit
1ab7271e7d
2 tập tin đã thay đổi với 8 bổ sung2 xóa
  1. 7 1
      glm/core/type_int.hpp
  2. 1 1
      readme.txt

+ 7 - 1
glm/core/type_int.hpp

@@ -47,13 +47,19 @@ namespace detail
 	GLM_DETAIL_IS_INT(signed short);
 	GLM_DETAIL_IS_INT(signed short);
 	GLM_DETAIL_IS_INT(signed int);
 	GLM_DETAIL_IS_INT(signed int);
 	GLM_DETAIL_IS_INT(signed long);
 	GLM_DETAIL_IS_INT(signed long);
-	GLM_DETAIL_IS_INT(highp_int_t);
 
 
 	GLM_DETAIL_IS_UINT(unsigned char);
 	GLM_DETAIL_IS_UINT(unsigned char);
 	GLM_DETAIL_IS_UINT(unsigned short);
 	GLM_DETAIL_IS_UINT(unsigned short);
 	GLM_DETAIL_IS_UINT(unsigned int);
 	GLM_DETAIL_IS_UINT(unsigned int);
 	GLM_DETAIL_IS_UINT(unsigned long);
 	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);
 	GLM_DETAIL_IS_UINT(highp_uint_t);
+#endif
 }//namespace detail
 }//namespace detail
 
 
 	/// @addtogroup core_precision
 	/// @addtogroup core_precision

+ 1 - 1
readme.txt

@@ -40,7 +40,7 @@ http://glm.g-truc.net/glm.pdf
 GLM 0.9.4.6: 2013-08-XX
 GLM 0.9.4.6: 2013-08-XX
 --------------------------------------------------------------------------------
 --------------------------------------------------------------------------------
 - Fixed detection to select the last known compiler if newer version #106
 - 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
 GLM 0.9.4.5: 2013-08-12