Browse Source

Limited extended integer type redifinition (#233)

Christophe Riccio 11 years ago
parent
commit
0613b5c0f1
2 changed files with 233 additions and 223 deletions
  1. 219 223
      glm/fwd.hpp
  2. 14 0
      glm/gtc/type_precision.hpp

File diff suppressed because it is too large
+ 219 - 223
glm/fwd.hpp


+ 14 - 0
glm/gtc/type_precision.hpp

@@ -230,6 +230,12 @@ 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;
@@ -245,6 +251,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
@@ -494,6 +501,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
 	/// Default precision 8 bit unsigned integer type.
 	/// @see gtc_type_precision
 	typedef detail::uint8 uint8_t;
@@ -509,6 +522,7 @@ namespace glm
 	/// Default precision 64 bit unsigned integer type.
 	/// @see gtc_type_precision
 	typedef detail::uint64 uint64_t;
+#endif
 
 	/// Default precision 8 bit unsigned integer type.
 	/// @see gtc_type_precision

Some files were not shown because too many files changed in this diff