diff --git a/glm/core/type_vec4.hpp b/glm/core/type_vec4.hpp index 803bf685..7257ceb0 100644 --- a/glm/core/type_vec4.hpp +++ b/glm/core/type_vec4.hpp @@ -15,7 +15,6 @@ #include "type_int.hpp" #include "type_size.hpp" #include "_swizzle.hpp" -#include "_detail.hpp" namespace glm { diff --git a/glm/glm.hpp b/glm/glm.hpp index 2c47cabb..6a117e7f 100644 --- a/glm/glm.hpp +++ b/glm/glm.hpp @@ -13,7 +13,7 @@ #define glm_glm //! TODO: to delete -#define GLMvalType typename genType::value_type +//#define GLMvalType typename genType::value_type #include #include diff --git a/glm/gtx/vector_query.hpp b/glm/gtx/vector_query.hpp index 776a99ed..f531cf07 100644 --- a/glm/gtx/vector_query.hpp +++ b/glm/gtx/vector_query.hpp @@ -41,15 +41,15 @@ namespace glm bool areCollinear( const genType & v0, const genType & v1, - const GLMvalType epsilon = std::numeric_limits::epsilon()); + typename genType::value_type const epsilon = std::numeric_limits::epsilon()); //! Check if two vectors are opposites. //! From GLM_GTX_vector_query extensions. template bool areOpposite( - const genType & v0, - const genType & v1, - const GLMvalType epsilon = std::numeric_limits::epsilon()); + genType const & v0, + genType const & v1, + typename genType::value_type const epsilon = std::numeric_limits::epsilon()); //! Check if two vectors are orthogonals. //! From GLM_GTX_vector_query extensions.