diff --git a/glm/gtx/scalar_relational.inl b/glm/gtx/scalar_relational.inl index b824c8da..ad397c33 100644 --- a/glm/gtx/scalar_relational.inl +++ b/glm/gtx/scalar_relational.inl @@ -71,20 +71,18 @@ namespace glm GLM_FUNC_QUALIFIER bool any ( - bool const & x, - bool const & y + bool const & x ) { - return x || y; + return x; } GLM_FUNC_QUALIFIER bool all ( - bool const & x, - bool const & y + bool const & x ) { - return x && y; + return x; } GLM_FUNC_QUALIFIER bool not_ diff --git a/test/gtx/gtx_scalar_relational.cpp b/test/gtx/gtx_scalar_relational.cpp index f1e9cc63..abafc2ec 100644 --- a/test/gtx/gtx_scalar_relational.cpp +++ b/test/gtx/gtx_scalar_relational.cpp @@ -135,10 +135,8 @@ int test_any() { int Error(0); - Error += glm::any(true, true) ? 0 : 1; - Error += glm::any(true, false) ? 0 : 1; - Error += glm::any(false, true) ? 0 : 1; - Error += glm::any(false, false) ? 1 : 0; + Error += glm::any(true) ? 0 : 1; + Error += glm::any(false) ? 1 : 0; return Error; } @@ -147,10 +145,8 @@ int test_all() { int Error(0); - Error += glm::all(true, true) ? 0 : 1; - Error += glm::all(true, false) ? 1 : 0; - Error += glm::all(false, true) ? 1 : 0; - Error += glm::all(false, false) ? 1 : 0; + Error += glm::all(true) ? 0 : 1; + Error += glm::all(false) ? 1 : 0; return Error; }