AuroraMiddleware/glm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed build

Browse Source
This commit is contained in:
Christophe Riccio 2014-10-26 00:54:36 +02:00
parent 087d6292e3
commit 45c4fbeb65
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glm/gtc/bitfield.hpp
View File

@ -42,6 +42,8 @@
#include "../detail/setup.hpp"
#include "../detail/precision.hpp"
#include "../detail/type_int.hpp"
#include "../detail/_vectorize.hpp"
#include <limits>
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
# pragma message("GLM: GLM_GTC_bitfield extension included")

22
glm/gtc/bitfield.inl
View File

@ -256,17 +256,17 @@ namespace detail
return detail::functor1<int, int, P, vecType>::call(mask, v);
}
template <typename genType>
GLM_FUNC_QUALIFIER genType bitRotateRight(genType In, int Shift)
template <typename genIType>
GLM_FUNC_QUALIFIER genIType bitRotateRight(genIType In, int Shift)
{
GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_integer, "'bitRotateRight' only accept integer values");
GLM_STATIC_ASSERT(std::numeric_limits<genIType>::is_integer, "'bitRotateRight' only accept integer values");
int const BitSize = static_cast<genType>(sizeof(T) * 8);
return (In << static_cast<T>(Shift)) | (In >> static_cast<T>(BitSize - Shift));
int const BitSize = static_cast<genIType>(sizeof(genIType) * 8);
return (In << static_cast<genIType>(Shift)) | (In >> static_cast<genIType>(BitSize - Shift));
}
template <typename T, precision P, template <typename, precision> class vecType>
GLM_FUNC_QUALIFIER vecType<T, P> bitRotateRight(vecType<T, P> const & Value, int Shift)
GLM_FUNC_QUALIFIER vecType<T, P> bitRotateRight(vecType<T, P> const & In, int Shift)
{
GLM_STATIC_ASSERT(std::numeric_limits<T>::is_integer, "'bitRotateRight' only accept integer values");
@ -274,13 +274,13 @@ namespace detail
return (In << static_cast<T>(Shift)) | (In >> static_cast<T>(BitSize - Shift));
}
template <typename genType>
GLM_FUNC_QUALIFIER genType bitRotateLeft(genType In, int Shift)
template <typename genIType>
GLM_FUNC_QUALIFIER genIType bitRotateLeft(genIType In, int Shift)
{
GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_integer, "'bitRotateLeft' only accept integer values");
GLM_STATIC_ASSERT(std::numeric_limits<genIType>::is_integer, "'bitRotateLeft' only accept integer values");
int const BitSize = static_cast<genType>(sizeof(T) * 8);
return (In >> static_cast<genType>(Shift)) | (In << static_cast<genType>(BitSize - Shift));
int const BitSize = static_cast<genIType>(sizeof(genIType) * 8);
return (In >> static_cast<genIType>(Shift)) | (In << static_cast<genIType>(BitSize - Shift));
}
template <typename T, precision P, template <typename, precision> class vecType>