diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-04-21 16:23:00 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-04-21 16:23:00 -0500 |
| commit | 19857d0cf0eedb76cac4eb8a1a4a0b33de9e4235 (patch) | |
| tree | 09d6015fedca390d1a259a9911491087cf088df5 /indra/llmath/tests/v2math_test.cpp | |
| parent | 120f31502eb521c1e0abaeb24972f070e7f75bd6 (diff) | |
| parent | 4bbfdd4c1fc18162960ba61fbdad40940a4cdd89 (diff) | |
merge
Diffstat (limited to 'indra/llmath/tests/v2math_test.cpp')
| -rw-r--r-- | indra/llmath/tests/v2math_test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llmath/tests/v2math_test.cpp b/indra/llmath/tests/v2math_test.cpp index 9747996b25..4d6a2eca93 100644 --- a/indra/llmath/tests/v2math_test.cpp +++ b/indra/llmath/tests/v2math_test.cpp @@ -85,7 +85,7 @@ namespace tut F32 x = 2.2345f, y = 3.5678f ; LLVector2 vec2(x,y); ensure("magVecSquared:Fail ", is_approx_equal(vec2.magVecSquared(), (x*x + y*y))); - ensure("magVec:Fail ", is_approx_equal(vec2.magVec(), fsqrtf(x*x + y*y))); + ensure("magVec:Fail ", is_approx_equal(vec2.magVec(), (F32) sqrt(x*x + y*y))); } template<> template<> @@ -407,7 +407,7 @@ namespace tut ensure_equals("dist_vec_squared values are not equal",val2, val1); val1 = dist_vec(vec2, vec3); - val2 = fsqrtf((x1 - x2)*(x1 - x2) + (y1 - y2)* (y1 - y2)); + val2 = (F32) sqrt((x1 - x2)*(x1 - x2) + (y1 - y2)* (y1 - y2)); ensure_equals("dist_vec values are not equal",val2, val1); } @@ -431,7 +431,7 @@ namespace tut LLVector2 vec2(x1, y1); F32 vecMag = vec2.normVec(); - F32 mag = fsqrtf(x1*x1 + y1*y1); + F32 mag = (F32) sqrt(x1*x1 + y1*y1); F32 oomag = 1.f / mag; val1 = x1 * oomag; |