From 1e389f8efa692de96bdaa80e7204cb0dff378eea Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sun, 5 Oct 2014 10:34:19 +0200 Subject: [PATCH] Fixed implicit conversion from another tvec2 type to another tvec2 #241 --- glm/detail/type_vec2.hpp | 2 +- readme.txt | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/glm/detail/type_vec2.hpp b/glm/detail/type_vec2.hpp index 5e8848268..39bd8868d 100644 --- a/glm/detail/type_vec2.hpp +++ b/glm/detail/type_vec2.hpp @@ -135,7 +135,7 @@ namespace detail //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL tvec2(tvec2 const & v); + GLM_FUNC_DECL explicit tvec2(tvec2 const & v); //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template GLM_FUNC_DECL explicit tvec2(tvec3 const & v); diff --git a/readme.txt b/readme.txt index 4063d34b3..45c48c28f 100644 --- a/readme.txt +++ b/readme.txt @@ -39,6 +39,11 @@ http://glm.g-truc.net/glm.pdf ================================================================================ GLM 0.9.6.0: 2014-XX-XX -------------------------------------------------------------------------------- +- Fixed std::nextafter not supported with C++11 on Android #217 +- Fixed missing value_type for dual quaternion +- Fixed return type of dual quaternion length +- Fixed infinite loop in isfinite function with GCC #221 +- Rely on C++11 to implement isinf and isnan - Added transparent use of SIMD instructions for vec4 and mat4 types - Removed degrees for function parameters - Removed GLM_FORCE_RADIANS, active by default @@ -50,15 +55,7 @@ GLM 0.9.6.0: 2014-XX-XX - Improved linearRand: support precision and integers #230 - Added vec3 slerp #237 - Added GTX_common with isdenomal #223 - -================================================================================ -GLM 0.9.5.5: 2014-XX-XX --------------------------------------------------------------------------------- -- Fixed std::nextafter not supported with C++11 on Android #217 -- Fixed missing value_type for dual quaternion -- Fixed return type of dual quaternion length -- Fixed infinite loop in isfinite function with GCC #221 -- Rely on C++11 to implement isinf and isnan +- Fixed implicit conversion from another tvec2 type to another tvec2 #241 ================================================================================ GLM 0.9.5.4: 2014-06-21