summaryrefslogtreecommitdiff
path: root/indra/llmath/tests/v3dmath_test.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-05-18 07:33:08 -0400
committerOz Linden <oz@lindenlab.com>2011-05-18 07:33:08 -0400
commit5eb6cb8d86cf19da79d034df52a0254079f2c95f (patch)
treecd2853e9c7c2cbf0bce317ca9018a6f4fa46a23f /indra/llmath/tests/v3dmath_test.cpp
parent66c078de5e5a6b685d435f7b1a462d64ca80f35e (diff)
parent644cbc44871992a95bcd5a6854dfc2a4d56a7b62 (diff)
merge up latest viewer-development (post mesh)
Diffstat (limited to 'indra/llmath/tests/v3dmath_test.cpp')
-rw-r--r--indra/llmath/tests/v3dmath_test.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmath/tests/v3dmath_test.cpp b/indra/llmath/tests/v3dmath_test.cpp
index b67346f4e5..20b26faa12 100644
--- a/indra/llmath/tests/v3dmath_test.cpp
+++ b/indra/llmath/tests/v3dmath_test.cpp
@@ -30,11 +30,11 @@
#include "llsd.h"
#include "../test/lltut.h"
-#include "../llquaternion.h"
#include "../m3math.h"
#include "../v4math.h"
#include "../v3dmath.h"
#include "../v3dmath.h"
+#include "../llquaternion.h"
namespace tut
{
@@ -403,7 +403,7 @@ namespace tut
LLVector3d vec3D(x,y,z);
F64 res = (x*x + y*y + z*z) - vec3D.magVecSquared();
ensure("1:magVecSquared:Fail ", ((-F_APPROXIMATELY_ZERO <= res)&& (res <=F_APPROXIMATELY_ZERO)));
- res = fsqrtf(x*x + y*y + z*z) - vec3D.magVec();
+ res = (F32) sqrt(x*x + y*y + z*z) - vec3D.magVec();
ensure("2:magVec: Fail ", ((-F_APPROXIMATELY_ZERO <= res)&& (res <=F_APPROXIMATELY_ZERO)));
}