Browse Source

Tentative fix build

Christophe 6 years ago
parent
commit
163f0d162d
3 changed files with 24 additions and 3 deletions
  1. 1 1
      glm/ext/scalar_integer.inl
  2. 2 2
      test/ext/ext_scalar_integer.cpp
  3. 21 0
      test/ext/ext_vector_integer.cpp

+ 1 - 1
glm/ext/scalar_integer.inl

@@ -178,7 +178,7 @@ namespace detail
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genIUType>::is_integer, "'prevPowerOfTwo' only accept integer inputs");
 
-		return isPowerOfTwo(value) ? value : static_cast<genIUType>(1) << static_cast<genIUType>(findMSB(value));
+		return isPowerOfTwo(value) ? value : static_cast<genIUType>(static_cast<genIUType>(1) << static_cast<genIUType>(findMSB(value)));
 	}
 
 	template<typename genIUType>

+ 2 - 2
test/ext/ext_scalar_integer.cpp

@@ -645,12 +645,12 @@ namespace findNSB
 		Error += run<glm::uint16>();
 		Error += run<glm::uint32>();
 		Error += run<glm::uint64>();
-/*
+
 		Error += run<glm::int8>();
 		Error += run<glm::int16>();
 		Error += run<glm::int32>();
 		Error += run<glm::int64>();
-*/
+
 		return Error;
 	}
 }//namespace findNSB

+ 21 - 0
test/ext/ext_vector_integer.cpp

@@ -507,6 +507,27 @@ namespace findNSB
 		Error += run<3, glm::uint64>();
 		Error += run<4, glm::uint64>();
 
+		Error += run<1, glm::int8>();
+		Error += run<2, glm::int8>();
+		Error += run<3, glm::int8>();
+		Error += run<4, glm::int8>();
+
+		Error += run<1, glm::int16>();
+		Error += run<2, glm::int16>();
+		Error += run<3, glm::int16>();
+		Error += run<4, glm::int16>();
+
+		Error += run<1, glm::int32>();
+		Error += run<2, glm::int32>();
+		Error += run<3, glm::int32>();
+		Error += run<4, glm::int32>();
+
+		Error += run<1, glm::int64>();
+		Error += run<2, glm::int64>();
+		Error += run<3, glm::int64>();
+		Error += run<4, glm::int64>();
+
+
 		return Error;
 	}
 }//namespace findNSB