Browse Source

Fixed build

Christophe Riccio 12 years ago
parent
commit
b51fe09cb9

+ 1 - 1
glm/core/func_exponential.inl

@@ -100,7 +100,7 @@ namespace glm
 
 namespace detail
 {
-	template <bool T>
+	template <bool isFloat>
 	struct compute_log2
 	{
 		template <typename T>

+ 2 - 0
glm/core/func_vector_relational.inl

@@ -26,6 +26,8 @@
 /// @author Christophe Riccio
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include <limits>
+
 namespace glm
 {
 	template <typename T, precision P, template <typename, precision> class vecType>

+ 2 - 14
glm/gtx/bit.inl

@@ -23,8 +23,8 @@ namespace glm
 	template <typename genIType>
 	GLM_FUNC_QUALIFIER genIType extractField
 	(
-		float const & value, 
-		genIType const & first, 
+		float const & value,
+		genIType const & first,
 		genIType const & count
 	)
 	{
@@ -32,18 +32,6 @@ namespace glm
 		return (detail::uif32(value).i << first) >> ((sizeof(float) << 3) - count);
 	}
 
-	template <typename genIType>
-	GLM_FUNC_QUALIFIER genIType extractField
-	(
-		double const & value, 
-		genIType const & first, 
-		genIType const & count
-	)
-	{
-		assert(first + count < sizeof(double));
-		return (detail::uif64(value).i << first) >> ((sizeof(double) << genIType(3)) - count);
-	}
-
 	template <typename genIUType, typename sizeType>
 	GLM_FUNC_QUALIFIER genIUType extractField
 	(

+ 1 - 1
test/core/core_type_mat4x4.cpp

@@ -142,7 +142,7 @@ int test_ctr()
 		{8, 9, 10, 11},
 		{12, 13, 14, 15}};
 
-	glm::mat4 m4{m3};
+	//glm::mat4 m4{m3};
 
 /*	
 	std::vector<glm::mat4> v{