Browse Source

Fixed build

Adrian Krupa 10 years ago
parent
commit
c9400562ec
2 changed files with 3 additions and 3 deletions
  1. 2 2
      glm/detail/func_common.inl
  2. 1 1
      test/core/core_func_common.cpp

+ 2 - 2
glm/detail/func_common.inl

@@ -668,7 +668,7 @@ namespace detail
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'frexp' only accept floating-point inputs");
 
-		return std::frexp(x, exp);
+		return std::frexp(x, &exp);
 	}
 
 	template <typename T, precision P>
@@ -676,7 +676,7 @@ namespace detail
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'frexp' only accept floating-point inputs");
 
-		return tvec1<T, P>(std::frexp(x.x, exp.x));
+		return tvec1<T, P>(std::frexp(x.x, &exp.x));
 	}
 
 	template <typename T, precision P>

+ 1 - 1
test/core/core_func_common.cpp

@@ -1100,7 +1100,7 @@ namespace sign
 	{
 		int Error = 0;
 
-		glm::uint32 const Count = Samples;
+		glm::int32 const Count = static_cast<glm::int32>(Samples);
 
 		std::clock_t Timestamp0 = std::clock();
 		glm::int32 Sum = 0;