organicmaps/glm
13
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2025-04-08 06:43:10 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Fixed any and all for scalars

Browse source
This commit is contained in:
Christophe Riccio 2013-02-04 19:17:47 +01:00
parent 59b9a780e9
commit 6799127ec6
2 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
glm/gtx/scalar_relational.inl
View file

@ -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_

12
test/gtx/gtx_scalar_relational.cpp
View file

@ -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;
}