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

Fixed build errors

Browse source
This commit is contained in:
Groove 2018-07-11 20:20:14 +02:00
parent 10d7a5dc30
commit 1381e0b4c1
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
glm/detail/type_vec2.hpp
View file

@ -109,13 +109,13 @@ namespace glm
GLM_FUNC_DECL GLM_CONSTEXPR_CXX11 GLM_EXPLICIT vec(vec<2, U, P> const& v);
// -- Swizzle constructors --
# if GLM_HAS_UNRESTRICTED_UNIONS && (GLM_SWIZZLE == GLM_SWIZZLE_ENABLED)
# if GLM_SWIZZLE == GLM_SWIZZLE_ENABLED
template<int E0, int E1>
GLM_FUNC_DECL vec(detail::_swizzle<2, T, Q, E0, E1,-1,-2> const& that)
{
*this = that();
}
# endif// GLM_HAS_UNRESTRICTED_UNIONS && (GLM_SWIZZLE == GLM_SWIZZLE_ENABLED)
# endif//GLM_SWIZZLE == GLM_SWIZZLE_ENABLED
// -- Unary arithmetic operators --

4
glm/detail/type_vec3.hpp
View file

@ -127,7 +127,7 @@ namespace glm
GLM_FUNC_DECL GLM_CONSTEXPR_CXX11 GLM_EXPLICIT vec(vec<3, U, P> const& v);
// -- Swizzle constructors --
# if GLM_HAS_UNRESTRICTED_UNIONS && (GLM_SWIZZLE == GLM_SWIZZLE_ENABLED)
# if GLM_SWIZZLE == GLM_SWIZZLE_ENABLED
template<int E0, int E1, int E2>
GLM_FUNC_DECL vec(detail::_swizzle<3, T, Q, E0, E1, E2, -1> const& that)
{
@ -145,7 +145,7 @@ namespace glm
{
*this = vec(scalar, v());
}
# endif// GLM_HAS_UNRESTRICTED_UNIONS && (GLM_SWIZZLE == GLM_SWIZZLE_ENABLED)
# endif//GLM_SWIZZLE == GLM_SWIZZLE_ENABLED
// -- Unary arithmetic operators --

4
glm/detail/type_vec4.hpp
View file

@ -178,7 +178,7 @@ namespace glm
GLM_FUNC_DECL GLM_CONSTEXPR_CXX11 GLM_EXPLICIT vec(vec<4, U, P> const& v);
// -- Swizzle constructors --
# if GLM_HAS_UNRESTRICTED_UNIONS && (GLM_SWIZZLE == GLM_SWIZZLE_ENABLED)
# if GLM_SWIZZLE == GLM_SWIZZLE_ENABLED
template<int E0, int E1, int E2, int E3>
GLM_FUNC_DECL vec(detail::_swizzle<4, T, Q, E0, E1, E2, E3> const& that)
{
@ -220,7 +220,7 @@ namespace glm
{
*this = vec<4, T, Q>(x, v());
}
# endif// GLM_HAS_UNRESTRICTED_UNIONS && (GLM_SWIZZLE == GLM_SWIZZLE_ENABLED)
# endif//GLM_SWIZZLE == GLM_SWIZZLE_ENABLED
// -- Unary arithmetic operators --

4
glm/ext/vec1.hpp
View file

@ -113,13 +113,13 @@ namespace glm
// -- Swizzle constructors --
/*
# if(GLM_HAS_UNRESTRICTED_UNIONS && (GLM_SWIZZLE == GLM_SWIZZLE_ENABLED))
# if GLM_SWIZZLE == GLM_SWIZZLE_ENABLED
template<int E0>
GLM_FUNC_DECL tvec(detail::_swizzle<1, T, Q, tvec1, E0, -1,-2,-3> const& that)
{
*this = that();
}
# endif//(GLM_HAS_UNRESTRICTED_UNIONS && (GLM_SWIZZLE == GLM_SWIZZLE_ENABLED))
# endif//GLM_SWIZZLE == GLM_SWIZZLE_ENABLED
*/
// -- Unary arithmetic operators --