From 24a4befe80171966758983173f381ce1ef6c839f Mon Sep 17 00:00:00 2001 From: Christophe Date: Tue, 1 Dec 2020 08:57:06 +0100 Subject: [PATCH] Fix build --- glm/ext/matrix_relational.inl | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/glm/ext/matrix_relational.inl b/glm/ext/matrix_relational.inl index b9cf89fb..9cd42b77 100644 --- a/glm/ext/matrix_relational.inl +++ b/glm/ext/matrix_relational.inl @@ -10,7 +10,6 @@ namespace glm template GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec equal(mat const& a, mat const& b) { - //return equal(a, b, static_cast(0)); vec Result(true); for(length_t i = 0; i < C; ++i) Result[i] = all(equal(a[i], b[i])); @@ -33,9 +32,8 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec notEqual(mat const& x, mat const& y) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec notEqual(mat const& a, mat const& b) { - //return notEqual(x, y, static_cast(0)); vec Result(true); for(length_t i = 0; i < C; ++i) Result[i] = any(notEqual(a[i], b[i])); @@ -43,9 +41,9 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec notEqual(mat const& x, mat const& y, T Epsilon) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec notEqual(mat const& a, mat const& b, T Epsilon) { - return notEqual(x, y, vec(Epsilon)); + return notEqual(a, b, vec(Epsilon)); } template @@ -73,9 +71,9 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec notEqual(mat const& x, mat const& y, int MaxULPs) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec notEqual(mat const& a, mat const& b, int MaxULPs) { - return notEqual(x, y, vec(MaxULPs)); + return notEqual(a, b, vec(MaxULPs)); } template