diff --git a/glm/detail/type_vec1.hpp b/glm/detail/type_vec1.hpp index fe55cd22b..a6666d337 100644 --- a/glm/detail/type_vec1.hpp +++ b/glm/detail/type_vec1.hpp @@ -83,7 +83,7 @@ namespace glm // -- Implicit basic constructors -- GLM_FUNC_DECL GLM_CONSTEXPR tvec1() GLM_DEFAULT_CTOR; - GLM_FUNC_DECL GLM_CONSTEXPR tvec1(tvec1 const & v) GLM_DEFAULT; + GLM_FUNC_DECL GLM_CONSTEXPR tvec1(tvec1 const & v); template GLM_FUNC_DECL GLM_CONSTEXPR tvec1(tvec1 const & v); @@ -120,7 +120,7 @@ namespace glm */ // -- Unary arithmetic operators -- - GLM_FUNC_DECL tvec1 & operator=(tvec1 const & v) GLM_DEFAULT; + GLM_FUNC_DECL tvec1 & operator=(tvec1 const & v); template GLM_FUNC_DECL tvec1 & operator=(tvec1 const & v); diff --git a/glm/detail/type_vec1.inl b/glm/detail/type_vec1.inl index 56f6b25bb..facec31ee 100644 --- a/glm/detail/type_vec1.inl +++ b/glm/detail/type_vec1.inl @@ -14,12 +14,10 @@ namespace glm {} # endif//!GLM_HAS_DEFAULTED_FUNCTIONS -# if !GLM_HAS_DEFAULTED_FUNCTIONS - template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec1::tvec1(tvec1 const & v) - : x(v.x) - {} -# endif//!GLM_HAS_DEFAULTED_FUNCTIONS + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec1::tvec1(tvec1 const & v) + : x(v.x) + {} template template @@ -88,14 +86,12 @@ namespace glm // -- Unary arithmetic operators -- -# if !GLM_HAS_DEFAULTED_FUNCTIONS - template - GLM_FUNC_QUALIFIER tvec1 & tvec1::operator=(tvec1 const & v) - { - this->x = v.x; - return *this; - } -# endif//!GLM_HAS_DEFAULTED_FUNCTIONS + template + GLM_FUNC_QUALIFIER tvec1 & tvec1::operator=(tvec1 const & v) + { + this->x = v.x; + return *this; + } template template diff --git a/glm/detail/type_vec2.hpp b/glm/detail/type_vec2.hpp index 331782dd7..cb8496393 100644 --- a/glm/detail/type_vec2.hpp +++ b/glm/detail/type_vec2.hpp @@ -84,7 +84,7 @@ namespace glm // -- Implicit basic constructors -- GLM_FUNC_DECL GLM_CONSTEXPR tvec2() GLM_DEFAULT_CTOR; - GLM_FUNC_DECL GLM_CONSTEXPR tvec2(tvec2 const& v) GLM_DEFAULT; + GLM_FUNC_DECL GLM_CONSTEXPR tvec2(tvec2 const& v); template GLM_FUNC_DECL GLM_CONSTEXPR tvec2(tvec2 const& v); @@ -126,7 +126,7 @@ namespace glm // -- Unary arithmetic operators -- - GLM_FUNC_DECL tvec2& operator=(tvec2 const & v) GLM_DEFAULT; + GLM_FUNC_DECL tvec2& operator=(tvec2 const & v); template GLM_FUNC_DECL tvec2& operator=(tvec2 const & v); diff --git a/glm/detail/type_vec2.inl b/glm/detail/type_vec2.inl index d10f96e6a..747886cf0 100644 --- a/glm/detail/type_vec2.inl +++ b/glm/detail/type_vec2.inl @@ -27,12 +27,10 @@ namespace glm {} # endif//!GLM_HAS_DEFAULTED_FUNCTIONS -# if !GLM_HAS_DEFAULTED_FUNCTIONS - template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec2::tvec2(tvec2 const & v) - : x(v.x), y(v.y) - {} -# endif//!GLM_HAS_DEFAULTED_FUNCTIONS + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec2::tvec2(tvec2 const & v) + : x(v.x), y(v.y) + {} template template @@ -119,15 +117,13 @@ namespace glm // -- Unary arithmetic operators -- -# if !GLM_HAS_DEFAULTED_FUNCTIONS - template - GLM_FUNC_QUALIFIER tvec2 & tvec2::operator=(tvec2 const & v) - { - this->x = v.x; - this->y = v.y; - return *this; - } -# endif//!GLM_HAS_DEFAULTED_FUNCTIONS + template + GLM_FUNC_QUALIFIER tvec2 & tvec2::operator=(tvec2 const & v) + { + this->x = v.x; + this->y = v.y; + return *this; + } template template diff --git a/glm/detail/type_vec3.hpp b/glm/detail/type_vec3.hpp index f90ad3c62..30eca6660 100644 --- a/glm/detail/type_vec3.hpp +++ b/glm/detail/type_vec3.hpp @@ -84,7 +84,7 @@ namespace glm // -- Implicit basic constructors -- GLM_FUNC_DECL GLM_CONSTEXPR tvec3() GLM_DEFAULT_CTOR; - GLM_FUNC_DECL GLM_CONSTEXPR tvec3(tvec3 const & v) GLM_DEFAULT; + GLM_FUNC_DECL GLM_CONSTEXPR tvec3(tvec3 const & v); template GLM_FUNC_DECL GLM_CONSTEXPR tvec3(tvec3 const & v); @@ -147,7 +147,7 @@ namespace glm // -- Unary arithmetic operators -- - GLM_FUNC_DECL tvec3 & operator=(tvec3 const & v) GLM_DEFAULT; + GLM_FUNC_DECL tvec3 & operator=(tvec3 const & v); template GLM_FUNC_DECL tvec3 & operator=(tvec3 const & v); diff --git a/glm/detail/type_vec3.inl b/glm/detail/type_vec3.inl index cc0424fb0..895f06dd9 100644 --- a/glm/detail/type_vec3.inl +++ b/glm/detail/type_vec3.inl @@ -40,12 +40,10 @@ namespace glm {} # endif//!GLM_HAS_DEFAULTED_FUNCTIONS -# if !GLM_HAS_DEFAULTED_FUNCTIONS - template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec3::tvec3(tvec3 const & v) - : x(v.x), y(v.y), z(v.z) - {} -# endif//!GLM_HAS_DEFAULTED_FUNCTIONS + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec3::tvec3(tvec3 const & v) + : x(v.x), y(v.y), z(v.z) + {} template template @@ -161,16 +159,14 @@ namespace glm // -- Unary arithmetic operators -- -# if !GLM_HAS_DEFAULTED_FUNCTIONS - template - GLM_FUNC_QUALIFIER tvec3& tvec3::operator=(tvec3 const & v) - { - this->x = v.x; - this->y = v.y; - this->z = v.z; - return *this; - } -# endif//!GLM_HAS_DEFAULTED_FUNCTIONS + template + GLM_FUNC_QUALIFIER tvec3& tvec3::operator=(tvec3 const & v) + { + this->x = v.x; + this->y = v.y; + this->z = v.z; + return *this; + } template template diff --git a/glm/detail/type_vec4.hpp b/glm/detail/type_vec4.hpp index e74865bdd..e0fafbf08 100644 --- a/glm/detail/type_vec4.hpp +++ b/glm/detail/type_vec4.hpp @@ -87,7 +87,7 @@ namespace glm // -- Implicit basic constructors -- GLM_FUNC_DECL GLM_CONSTEXPR tvec4() GLM_DEFAULT_CTOR; - GLM_FUNC_DECL GLM_CONSTEXPR tvec4(tvec4 const& v) GLM_DEFAULT; + GLM_FUNC_DECL GLM_CONSTEXPR tvec4(tvec4 const& v); template GLM_FUNC_DECL GLM_CONSTEXPR tvec4(tvec4 const& v); @@ -192,7 +192,7 @@ namespace glm // -- Unary arithmetic operators -- - GLM_FUNC_DECL tvec4 & operator=(tvec4 const & v) GLM_DEFAULT; + GLM_FUNC_DECL tvec4 & operator=(tvec4 const & v); template GLM_FUNC_DECL tvec4 & operator=(tvec4 const & v); diff --git a/glm/detail/type_vec4.inl b/glm/detail/type_vec4.inl index d891e0387..16e7e4fc0 100644 --- a/glm/detail/type_vec4.inl +++ b/glm/detail/type_vec4.inl @@ -163,12 +163,10 @@ namespace detail {} # endif//!GLM_HAS_DEFAULTED_FUNCTIONS -# if !GLM_HAS_DEFAULTED_FUNCTIONS - template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec4::tvec4(tvec4 const & v) - : x(v.x), y(v.y), z(v.z), w(v.w) - {} -# endif//!GLM_HAS_DEFAULTED_FUNCTIONS + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec4::tvec4(tvec4 const & v) + : x(v.x), y(v.y), z(v.z), w(v.w) + {} template template @@ -346,17 +344,15 @@ namespace detail // -- Unary arithmetic operators -- -# if !GLM_HAS_DEFAULTED_FUNCTIONS - template - GLM_FUNC_QUALIFIER tvec4& tvec4::operator=(tvec4 const & v) - { - this->x = v.x; - this->y = v.y; - this->z = v.z; - this->w = v.w; - return *this; - } -# endif//!GLM_HAS_DEFAULTED_FUNCTIONS + template + GLM_FUNC_QUALIFIER tvec4& tvec4::operator=(tvec4 const & v) + { + this->x = v.x; + this->y = v.y; + this->z = v.z; + this->w = v.w; + return *this; + } template template diff --git a/glm/gtc/matrix_transform.inl b/glm/gtc/matrix_transform.inl index 9801a2e11..377fe952c 100644 --- a/glm/gtc/matrix_transform.inl +++ b/glm/gtc/matrix_transform.inl @@ -190,7 +190,7 @@ namespace glm T bottom, T top ) { - tmat4x4 Result(1); + tmat4x4 Result(T(1)); Result[0][0] = static_cast(2) / (right - left); Result[1][1] = static_cast(2) / (top - bottom); Result[2][2] = - static_cast(1); diff --git a/glm/gtx/transform.inl b/glm/gtx/transform.inl index fc228ce8c..debcb06ea 100644 --- a/glm/gtx/transform.inl +++ b/glm/gtx/transform.inl @@ -8,7 +8,7 @@ namespace glm tvec3 const & v) { return translate( - tmat4x4(1.0f), v); + tmat4x4(T(1)), v); } template