mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed interactions with GLM_FORCE_NO_CTOR_INIT and default functions #366

Browse Source
This commit is contained in:
Christophe Riccio
2015-07-25 23:23:59 +02:00
parent 53e494bea9
commit afa193704c
53 changed files with 535 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
glm/gtc/quaternion.hpp
View File

@@ -95,7 +95,7 @@ namespace glm
//////////////////////////////////////
// Implicit basic constructors
GLM_FUNC_DECL tquat() GLM_DEFAULT;
GLM_FUNC_DECL tquat() GLM_DEFAULT_CTOR;
GLM_FUNC_DECL tquat(tquat<T, P> const & q) GLM_DEFAULT;
template <precision Q>
GLM_FUNC_DECL tquat(tquat<T, Q> const & q);

4
glm/gtc/quaternion.inl
View File

@@ -97,14 +97,16 @@ namespace detail
//////////////////////////////////////
// Implicit basic constructors
# if !GLM_HAS_DEFAULTED_FUNCTIONS
# if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT)
template <typename T, precision P>
GLM_FUNC_QUALIFIER tquat<T, P>::tquat()
# ifndef GLM_FORCE_NO_CTOR_INIT
: x(0), y(0), z(0), w(1)
# endif
{}
# endif
# if !GLM_HAS_DEFAULTED_FUNCTIONS
template <typename T, precision P>
GLM_FUNC_QUALIFIER tquat<T, P>::tquat(tquat<T, P> const & q)
: x(q.x), y(q.y), z(q.z), w(q.w)