organicmaps/glm
13
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2025-04-07 06:25:00 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Fixed build

Browse source
This commit is contained in:
Christophe Riccio 2013-09-30 02:05:13 +02:00
parent d2730008dd
commit b51fe09cb9
4 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
glm/core/func_exponential.inl
View file

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

2
glm/core/func_vector_relational.inl
View file

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

16
glm/gtx/bit.inl
View file

@ -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
(

2
test/core/core_type_mat4x4.cpp
View file

@ -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{