Skip to content

Commit

Permalink
Fixed declaration and definition mismatch
Browse files Browse the repository at this point in the history
  • Loading branch information
Christophe Riccio committed Feb 8, 2014
1 parent 7ce6df4 commit 2b17a90
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
10 changes: 2 additions & 8 deletions glm/detail/func_exponential.inl
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,7 @@ namespace detail

//exp2, ln2 = 0.69314718055994530941723212145818f
template <typename genType>
GLM_FUNC_QUALIFIER genType exp2
(
genType const & x
)
GLM_FUNC_QUALIFIER genType exp2(genType const & x)
{
GLM_STATIC_ASSERT(
std::numeric_limits<genType>::is_iec559,
Expand All @@ -144,10 +141,7 @@ namespace detail

// log2, ln2 = 0.69314718055994530941723212145818f
template <typename genType>
GLM_FUNC_QUALIFIER genType log2
(
genType const & x
)
GLM_FUNC_QUALIFIER genType log2(genType x)
{
GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559 || std::numeric_limits<genType>::is_integer,
"GLM core 'log2' only accept floating-point inputs. Include <glm/gtx/integer.hpp> for additional integer support.");
Expand Down
2 changes: 1 addition & 1 deletion glm/gtx/integer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ namespace glm
//! Returns the log2 of x. Can be reliably using to compute mipmap count from the texture size.
//! From GLM_GTX_integer extension.
template <typename genIUType>
genIUType log2(genIUType const & x);
genIUType log2(genIUType x);

//! Returns the floor log2 of x.
//! From GLM_GTX_integer extension.
Expand Down

0 comments on commit 2b17a90

Please sign in to comment.