diff --git a/glm/core/func_packing.hpp b/glm/core/func_packing.hpp
index 0534047d..6c699437 100644
--- a/glm/core/func_packing.hpp
+++ b/glm/core/func_packing.hpp
@@ -52,7 +52,7 @@ namespace glm
//!
/// @see GLSL packUnorm2x16 man page
/// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions
- uint32 packUnorm2x16(detail::tvec2 const & v);
+ uint32 packUnorm2x16(vec2 const & v);
//! First, converts each component of the normalized floating-point value v into 8- or 16-bit integer values.
//! Then, the results are packed into the returned 32-bit unsigned integer.
@@ -65,7 +65,7 @@ namespace glm
//!
/// @see GLSL packSnorm2x16 man page
/// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions
- uint32 packSnorm2x16(detail::tvec2 const & v);
+ uint32 packSnorm2x16(vec2 const & v);
//! First, converts each component of the normalized floating-point value v into 8- or 16-bit integer values.
//! Then, the results are packed into the returned 32-bit unsigned integer.
@@ -78,7 +78,7 @@ namespace glm
//!
/// @see GLSL packUnorm4x8 man page
/// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions
- uint32 packUnorm4x8(detail::tvec4 const & v);
+ uint32 packUnorm4x8(vec4 const & v);
//! First, converts each component of the normalized floating-point value v into 8- or 16-bit integer values.
//! Then, the results are packed into the returned 32-bit unsigned integer.
@@ -91,7 +91,7 @@ namespace glm
//!
/// @see GLSL packSnorm4x8 man page
/// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions
- uint32 packSnorm4x8(detail::tvec4 const & v);
+ uint32 packSnorm4x8(vec4 const & v);
//! First, unpacks a single 32-bit unsigned integer p into a pair of 16-bit unsigned integers, four 8-bit unsigned integers, or four 8-bit signed integers.
//! Then, each component is converted to a normalized floating-point value to generate the returned two- or four-component vector.
@@ -104,7 +104,7 @@ namespace glm
//!
/// @see GLSL unpackUnorm2x16 man page
/// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions
- detail::tvec2 unpackUnorm2x16(uint32 const & p);
+ vec2 unpackUnorm2x16(uint32 const & p);
//! First, unpacks a single 32-bit unsigned integer p into a pair of 16-bit unsigned integers, four 8-bit unsigned integers, or four 8-bit signed integers.
//! Then, each component is converted to a normalized floating-point value to generate the returned two- or four-component vector.
@@ -117,7 +117,7 @@ namespace glm
//!
/// @see GLSL unpackSnorm2x16 man page
/// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions
- detail::tvec2 unpackSnorm2x16(uint32 const & p);
+ vec2 unpackSnorm2x16(uint32 const & p);
/// First, unpacks a single 32-bit unsigned integer p into a pair of 16-bit unsigned integers, four 8-bit unsigned integers, or four 8-bit signed integers.
/// Then, each component is converted to a normalized floating-point value to generate the returned two- or four-component vector.
@@ -130,7 +130,7 @@ namespace glm
///
/// @see GLSL unpackUnorm4x8 man page
/// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions
- detail::tvec4 unpackUnorm4x8(uint32 const & p);
+ vec4 unpackUnorm4x8(uint32 const & p);
/// First, unpacks a single 32-bit unsigned integer p into a pair of 16-bit unsigned integers, four 8-bit unsigned integers, or four 8-bit signed integers.
/// Then, each component is converted to a normalized floating-point value to generate the returned two- or four-component vector.
@@ -143,7 +143,7 @@ namespace glm
///
/// @see GLSL unpackSnorm4x8 man page
/// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions
- detail::tvec4 unpackSnorm4x8(uint32 const & p);
+ vec4 unpackSnorm4x8(uint32 const & p);
/// Returns a double-precision value obtained by packing the components of v into a 64-bit value.
/// If an IEEE 754 Inf or NaN is created, it will not signal, and the resulting floating point value is unspecified.
@@ -153,7 +153,7 @@ namespace glm
///
/// @see GLSL packDouble2x32 man page
/// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions
- double packDouble2x32(detail::tvec2 const & v);
+ double packDouble2x32(uvec2 const & v);
/// Returns a two-component unsigned integer vector representation of v.
/// The bit-level representation of v is preserved.
@@ -162,7 +162,7 @@ namespace glm
///
/// @see GLSL unpackDouble2x32 man page
/// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions
- detail::tvec2 unpackDouble2x32(double const & v);
+ uvec2 unpackDouble2x32(double const & v);
/// Returns an unsigned integer obtained by converting the components of a two-component floating-point vector
/// to the 16-bit floating-point representation found in the OpenGL Specification,
@@ -172,7 +172,7 @@ namespace glm
///
/// @see GLSL packHalf2x16 man page
/// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions
- uint packHalf2x16(detail::tvec2 const & v);
+ uint packHalf2x16(vec2 const & v);
/// Returns a two-component floating-point vector with components obtained by unpacking a 32-bit unsigned integer into a pair of 16-bit values,
/// interpreting those values as 16-bit floating-point numbers according to the OpenGL Specification,
diff --git a/glm/core/func_packing.inl b/glm/core/func_packing.inl
index e6d78020..ce22d4e9 100644
--- a/glm/core/func_packing.inl
+++ b/glm/core/func_packing.inl
@@ -28,24 +28,24 @@
namespace glm
{
- GLM_FUNC_QUALIFIER uint32 packUnorm2x16(detail::tvec2 const & v)
+ GLM_FUNC_QUALIFIER uint32 packUnorm2x16(vec2 const & v)
{
uint16 A(uint16(round(clamp(v.x, 0.0f, 1.0f) * 65535.0f)));
uint16 B(uint16(round(clamp(v.y, 0.0f, 1.0f) * 65535.0f)));
return uint32((B << 16) | A);
}
- GLM_FUNC_QUALIFIER detail::tvec2 unpackUnorm2x16(uint32 const & p)
+ GLM_FUNC_QUALIFIER vec2 unpackUnorm2x16(uint32 const & p)
{
uint32 Mask16((1 << 16) - 1);
uint32 A((p >> 0) & Mask16);
uint32 B((p >> 16) & Mask16);
- return detail::tvec2(
+ return vec2(
A * 1.0f / 65535.0f,
B * 1.0f / 65535.0f);
}
- GLM_FUNC_QUALIFIER uint32 packSnorm2x16(detail::tvec2 const & v)
+ GLM_FUNC_QUALIFIER uint32 packSnorm2x16(vec2 const & v)
{
union iu
{
@@ -53,14 +53,14 @@ namespace glm
uint16 u;
} A, B;
- detail::tvec2 Unpack = clamp(v ,-1.0f, 1.0f) * 32767.0f;
+ vec2 Unpack = clamp(v ,-1.0f, 1.0f) * 32767.0f;
A.i = detail::int16(round(Unpack.x));
B.i = detail::int16(round(Unpack.y));
uint32 Pack = (uint32(B.u) << 16) | (uint32(A.u) << 0);
return Pack;
}
- GLM_FUNC_QUALIFIER detail::tvec2 unpackSnorm2x16(uint32 const & p)
+ GLM_FUNC_QUALIFIER vec2 unpackSnorm2x16(uint32 const & p)
{
union iu
{
@@ -71,12 +71,12 @@ namespace glm
uint32 Mask16((1 << 16) - 1);
A.u = uint16((p >> 0) & Mask16);
B.u = uint16((p >> 16) & Mask16);
- detail::tvec2 Pack(A.i, B.i);
+ glm::vec2 Pack(A.i, B.i);
return clamp(Pack * 1.0f / 32767.0f, -1.0f, 1.0f);
}
- GLM_FUNC_QUALIFIER uint32 packUnorm4x8(detail::tvec4 const & v)
+ GLM_FUNC_QUALIFIER uint32 packUnorm4x8(vec4 const & v)
{
uint8 A((uint8)round(clamp(v.x, 0.0f, 1.0f) * 255.0f));
uint8 B((uint8)round(clamp(v.y, 0.0f, 1.0f) * 255.0f));
@@ -85,21 +85,21 @@ namespace glm
return uint32((D << 24) | (C << 16) | (B << 8) | A);
}
- GLM_FUNC_QUALIFIER detail::tvec4 unpackUnorm4x8(uint32 const & p)
+ GLM_FUNC_QUALIFIER vec4 unpackUnorm4x8(uint32 const & p)
{
uint32 Mask8((1 << 8) - 1);
uint32 A((p >> 0) & Mask8);
uint32 B((p >> 8) & Mask8);
uint32 C((p >> 16) & Mask8);
uint32 D((p >> 24) & Mask8);
- return detail::tvec4(
+ return glm::vec4(
A * 1.0f / 255.0f,
B * 1.0f / 255.0f,
C * 1.0f / 255.0f,
D * 1.0f / 255.0f);
}
- GLM_FUNC_QUALIFIER uint32 packSnorm4x8(detail::tvec4 const & v)
+ GLM_FUNC_QUALIFIER uint32 packSnorm4x8(vec4 const & v)
{
union iu
{
@@ -107,7 +107,7 @@ namespace glm
uint8 u;
} A, B, C, D;
- detail::tvec4 Unpack = clamp(v ,-1.0f, 1.0f) * 127.0f;
+ glm::vec4 Unpack = clamp(v ,-1.0f, 1.0f) * 127.0f;
A.i = int8(round(Unpack.x));
B.i = int8(round(Unpack.y));
C.i = int8(round(Unpack.z));
@@ -116,7 +116,7 @@ namespace glm
return Pack;
}
- GLM_FUNC_QUALIFIER detail::tvec4 unpackSnorm4x8(uint32 const & p)
+ GLM_FUNC_QUALIFIER glm::vec4 unpackSnorm4x8(uint32 const & p)
{
union iu
{
@@ -129,12 +129,12 @@ namespace glm
B.u = uint8((p >> 8) & Mask8);
C.u = uint8((p >> 16) & Mask8);
D.u = uint8((p >> 24) & Mask8);
- detail::tvec4 Pack(A.i, B.i, C.i, D.i);
+ glm::vec4 Pack(A.i, B.i, C.i, D.i);
return clamp(Pack * 1.0f / 127.0f, -1.0f, 1.0f);
}
- GLM_FUNC_QUALIFIER double packDouble2x32(detail::tvec2 const & v)
+ GLM_FUNC_QUALIFIER double packDouble2x32(uvec2 const & v)
{
struct uint32_pair
{
@@ -155,7 +155,7 @@ namespace glm
//return *(double*)&v;
}
- GLM_FUNC_QUALIFIER detail::tvec2 unpackDouble2x32(double const & v)
+ GLM_FUNC_QUALIFIER uvec2 unpackDouble2x32(double const & v)
{
struct uint32_pair
{
@@ -171,10 +171,10 @@ namespace glm
Helper.input = v;
- return detail::tvec2(Helper.output.x, Helper.output.y);
+ return uvec2(Helper.output.x, Helper.output.y);
}
- GLM_FUNC_QUALIFIER uint packHalf2x16(detail::tvec2 const & v)
+ GLM_FUNC_QUALIFIER uint packHalf2x16(vec2 const & v)
{
union helper
{
diff --git a/glm/core/precision.hpp b/glm/core/precision.hpp
index b501b35f..9880370d 100644
--- a/glm/core/precision.hpp
+++ b/glm/core/precision.hpp
@@ -39,16 +39,6 @@ namespace glm
};
}//namespace glm
-#if(!defined(GLM_PRECISION_HIGHP_INT) && !defined(GLM_PRECISION_MEDIUMP_INT) && !defined(GLM_PRECISION_LOWP_INT))
-#define defaultp mediump
-#elif(defined(GLM_PRECISION_HIGHP_INT) && !defined(GLM_PRECISION_MEDIUMP_INT) && !defined(GLM_PRECISION_LOWP_INT))
#define defaultp highp
-#elif(!defined(GLM_PRECISION_HIGHP_INT) && defined(GLM_PRECISION_MEDIUMP_INT) && !defined(GLM_PRECISION_LOWP_INT))
-#define defaultp mediump
-#elif(!defined(GLM_PRECISION_HIGHP_INT) && !defined(GLM_PRECISION_MEDIUMP_INT) && defined(GLM_PRECISION_LOWP_INT))
-#define defaultp lowp
-#else
-# error "GLM error: multiple default precision requested for signed interger types"
-#endif
#endif//GLM_CORE_PRECISION_INCLUDED
diff --git a/glm/core/type_mat2x2.hpp b/glm/core/type_mat2x2.hpp
index 0bb6ff6a..69ecb6b1 100644
--- a/glm/core/type_mat2x2.hpp
+++ b/glm/core/type_mat2x2.hpp
@@ -73,10 +73,10 @@ namespace detail
GLM_FUNC_DECL explicit tmat2x2(
value_type const & x);
GLM_FUNC_DECL explicit tmat2x2(
- value_type const & x1, value_type const & y1,
+ value_type const & x1, value_type const & y1,
value_type const & x2, value_type const & y2);
GLM_FUNC_DECL explicit tmat2x2(
- col_type const & v1,
+ col_type const & v1,
col_type const & v2);
//////////////////////////////////////
@@ -85,20 +85,20 @@ namespace detail
GLM_FUNC_DECL explicit tmat2x2(
U const & x);
- template
+ template
GLM_FUNC_DECL explicit tmat2x2(
- U const & x1, V const & y1,
+ U const & x1, V const & y1,
M const & x2, N const & y2);
- template
+ template
GLM_FUNC_DECL explicit tmat2x2(
tvec2 const & v1,
tvec2 const & v2);
//////////////////////////////////////
// Matrix conversions
- template
- GLM_FUNC_DECL explicit tmat2x2(tmat2x2 const & m);
+ template
+ GLM_FUNC_DECL explicit tmat2x2(tmat2x2 const & m);
GLM_FUNC_DECL explicit tmat2x2(tmat3x3 const & x);
GLM_FUNC_DECL explicit tmat2x2(tmat4x4 const & x);
diff --git a/glm/core/type_mat2x2.inl b/glm/core/type_mat2x2.inl
index 796da208..20913cbe 100644
--- a/glm/core/type_mat2x2.inl
+++ b/glm/core/type_mat2x2.inl
@@ -174,10 +174,10 @@ namespace detail
// mat2x2 matrix conversions
template
- template
+ template
GLM_FUNC_QUALIFIER tmat2x2::tmat2x2
(
- tmat2x2 const & m
+ tmat2x2 const & m
)
{
this->value[0] = col_type(m[0]);
@@ -281,7 +281,7 @@ namespace detail
// mat2x2 operators
// This function shouldn't required but it seems that VC7.1 have an optimisation bug if this operator wasn't declared
- template
+ template
GLM_FUNC_QUALIFIER tmat2x2& tmat2x2::operator=
(
tmat2x2 const & m
@@ -292,8 +292,8 @@ namespace detail
return *this;
}
- template
- template
+ template
+ template
GLM_FUNC_QUALIFIER tmat2x2& tmat2x2::operator=
(
tmat2x2 const & m
@@ -304,8 +304,8 @@ namespace detail
return *this;
}
- template
- template
+ template
+ template
GLM_FUNC_QUALIFIER tmat2x2& tmat2x2::operator+=
(
U const & s
@@ -316,8 +316,8 @@ namespace detail
return *this;
}
- template
- template
+ template
+ template
GLM_FUNC_QUALIFIER tmat2x2& tmat2x2::operator+=
(
tmat2x2 const & m
@@ -328,8 +328,8 @@ namespace detail
return *this;
}
- template
- template
+ template
+ template
GLM_FUNC_QUALIFIER tmat2x2& tmat2x2::operator-=
(
U const & s
@@ -340,8 +340,8 @@ namespace detail
return *this;
}
- template
- template
+ template
+ template
GLM_FUNC_QUALIFIER tmat2x2& tmat2x2::operator-=
(
tmat2x2 const & m
@@ -352,9 +352,9 @@ namespace detail
return *this;
}
- template
- template
- GLM_FUNC_QUALIFIER tmat2x2& tmat2x2::operator*=
+ template
+ template
+ GLM_FUNC_QUALIFIER tmat2x2& tmat2x2::operator*=
(
U const & s
)
@@ -364,9 +364,9 @@ namespace detail
return *this;
}
- template
- template
- GLM_FUNC_QUALIFIER tmat2x2& tmat2x2::operator*=
+ template
+ template
+ GLM_FUNC_QUALIFIER tmat2x2& tmat2x2::operator*=
(
tmat2x2 const & m
)
@@ -374,9 +374,9 @@ namespace detail
return (*this = *this * m);
}
- template
- template
- GLM_FUNC_QUALIFIER tmat2x2& tmat2x2::operator/=
+ template
+ template
+ GLM_FUNC_QUALIFIER tmat2x2& tmat2x2::operator/=
(
U const & s
)
@@ -386,9 +386,9 @@ namespace detail
return *this;
}
- template
- template
- GLM_FUNC_QUALIFIER tmat2x2& tmat2x2::operator/=
+ template
+ template
+ GLM_FUNC_QUALIFIER tmat2x2& tmat2x2::operator/=
(
tmat2x2 const & m
)
@@ -396,7 +396,7 @@ namespace detail
return (*this = *this / m);
}
- template
+ template
GLM_FUNC_QUALIFIER tmat2x2& tmat2x2::operator++ ()
{
++this->value[0];
@@ -404,7 +404,7 @@ namespace detail
return *this;
}
- template
+ template
GLM_FUNC_QUALIFIER tmat2x2& tmat2x2::operator-- ()
{
--this->value[0];
@@ -416,9 +416,9 @@ namespace detail
// Binary operators
template
- GLM_FUNC_QUALIFIER tmat2x2 operator+
+ GLM_FUNC_QUALIFIER tmat2x2 operator+
(
- tmat2x2 const & m,
+ tmat2x2 const & m,
typename tmat2x2::value_type const & s
)
{
@@ -428,9 +428,9 @@ namespace detail
}
template
- GLM_FUNC_QUALIFIER tmat2x2 operator+
+ GLM_FUNC_QUALIFIER tmat2x2 operator+
(
- typename tmat2x2::value_type const & s,
+ typename tmat2x2::value_type const & s,
tmat2x2 const & m
)
{
@@ -440,9 +440,9 @@ namespace detail
}
template
- GLM_FUNC_QUALIFIER tmat2x2 operator+
+ GLM_FUNC_QUALIFIER tmat2x2 operator+
(
- tmat2x2 const & m1,
+ tmat2x2 const & m1,
tmat2x2 const & m2
)
{
@@ -452,9 +452,9 @@ namespace detail
}
template
- GLM_FUNC_QUALIFIER tmat2x2 operator-
+ GLM_FUNC_QUALIFIER tmat2x2 operator-
(
- tmat2x2 const & m,
+ tmat2x2 const & m,
typename tmat2x2::value_type const & s
)
{
@@ -464,9 +464,9 @@ namespace detail
}
template
- GLM_FUNC_QUALIFIER tmat2x2 operator-
+ GLM_FUNC_QUALIFIER tmat2x2 operator-
(
- typename tmat2x2::value_type const & s,
+ typename tmat2x2::value_type const & s,
tmat2x2 const & m
)
{
@@ -476,9 +476,9 @@ namespace detail
}
template
- GLM_FUNC_QUALIFIER tmat2x2 operator-
+ GLM_FUNC_QUALIFIER tmat2x2 operator-
(
- tmat2x2 const & m1,
+ tmat2x2 const & m1,
tmat2x2 const & m2
)
{
@@ -488,9 +488,9 @@ namespace detail
}
template
- GLM_FUNC_QUALIFIER tmat2x2 operator*
+ GLM_FUNC_QUALIFIER tmat2x2 operator*
(
- tmat2x2 const & m,
+ tmat2x2 const & m,
typename tmat2x2::value_type const & s
)
{
@@ -500,9 +500,9 @@ namespace detail
}
template
- GLM_FUNC_QUALIFIER tmat2x2 operator*
+ GLM_FUNC_QUALIFIER tmat2x2 operator*
(
- typename tmat2x2::value_type const & s,
+ typename tmat2x2::value_type const & s,
tmat2x2 const & m
)
{
@@ -514,7 +514,7 @@ namespace detail
template
GLM_FUNC_QUALIFIER typename tmat2x2::col_type operator*
(
- tmat2x2 const & m,
+ tmat2x2 const & m,
typename tmat2x2::row_type const & v
)
{
@@ -526,7 +526,7 @@ namespace detail
template
GLM_FUNC_QUALIFIER typename tmat2x2::row_type operator*
(
- typename tmat2x2::col_type const & v,
+ typename tmat2x2::col_type const & v,
tmat2x2 const & m
)
{
diff --git a/glm/core/type_mat2x3.hpp b/glm/core/type_mat2x3.hpp
index e01cb177..9d95ea5d 100644
--- a/glm/core/type_mat2x3.hpp
+++ b/glm/core/type_mat2x3.hpp
@@ -89,8 +89,8 @@ namespace detail
//////////////////////////////////////
// Matrix conversion
- template
- GLM_FUNC_DECL explicit tmat2x3(tmat2x3 const & m);
+ template
+ GLM_FUNC_DECL explicit tmat2x3(tmat2x3 const & m);
GLM_FUNC_DECL explicit tmat2x3(tmat2x2 const & x);
GLM_FUNC_DECL explicit tmat2x3(tmat3x3 const & x);
diff --git a/glm/core/type_mat2x3.inl b/glm/core/type_mat2x3.inl
index 0a99f71e..43c38231 100644
--- a/glm/core/type_mat2x3.inl
+++ b/glm/core/type_mat2x3.inl
@@ -175,10 +175,10 @@ namespace detail
// Matrix conversions
template
- template
+ template
GLM_FUNC_QUALIFIER tmat2x3::tmat2x3
(
- tmat2x3 const & m
+ tmat2x3 const & m
)
{
this->value[0] = col_type(m[0]);
diff --git a/glm/core/type_mat2x4.hpp b/glm/core/type_mat2x4.hpp
index 778fe831..279300f4 100644
--- a/glm/core/type_mat2x4.hpp
+++ b/glm/core/type_mat2x4.hpp
@@ -91,8 +91,8 @@ namespace detail
//////////////////////////////////////
// Matrix conversions
- template
- GLM_FUNC_DECL explicit tmat2x4(tmat2x4 const & m);
+ template
+ GLM_FUNC_DECL explicit tmat2x4(tmat2x4 const & m);
GLM_FUNC_DECL explicit tmat2x4(tmat2x2 const & x);
GLM_FUNC_DECL explicit tmat2x4(tmat3x3 const & x);
@@ -156,19 +156,19 @@ namespace detail
tmat2x4 const & m,
typename tmat2x4::value_type const & s);
- template
+ template
tmat2x4 operator* (
- typename tmat2x4::value_type const & s,
+ typename tmat2x4::value_type const & s,
tmat2x4 const & m);
template
typename tmat2x4::col_type operator* (
- tmat2x4 const & m,
+ tmat2x4 const & m,
typename tmat2x4::row_type const & v);
- template
+ template
typename tmat2x4::row_type operator* (
- typename tmat2x4::col_type const & v,
+ typename tmat2x4::col_type const & v,
tmat2x4 const & m);
template
@@ -178,30 +178,30 @@ namespace detail
template
tmat2x4 operator* (
- tmat2x4 const & m1,
+ tmat2x4 const & m1,
tmat2x2 const & m2);
template
tmat3x4 operator* (
- tmat2x4 const & m1,
+ tmat2x4 const & m1,
tmat3x2 const & m2);
- template
+ template
tmat2x4 operator/ (
- tmat2x4 const & m,
+ tmat2x4 const & m,
typename tmat2x4::value_type const & s);
template
tmat2x4 operator/ (
- typename tmat2x4::value_type const & s,
+ typename tmat2x4::value_type const & s,
tmat2x4 const & m);
// Unary constant operators
- template
+ template
tmat2x4 const operator- (
tmat2x4 const & m);
- template
+ template
tmat2x4 const operator-- (
tmat2x4 const & m,
int);
diff --git a/glm/core/type_mat2x4.inl b/glm/core/type_mat2x4.inl
index 46d64d86..a06d95d2 100644
--- a/glm/core/type_mat2x4.inl
+++ b/glm/core/type_mat2x4.inl
@@ -178,10 +178,10 @@ namespace detail
// Matrix conversions
template
- template
+ template