summaryrefslogtreecommitdiff
path: root/indra/llmath/tests
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2017-06-20 16:11:33 -0400
committerNat Goodspeed <nat@lindenlab.com>2017-06-20 16:11:33 -0400
commita3066b7375a13b61861b554519673dfc24322c22 (patch)
tree9b3d61c932ff8a88e5a2384f138e7ed9b83248ac /indra/llmath/tests
parentf1e52656e9e328d66aa5050bc9e59948a0217283 (diff)
parent124d8c8dce3a5da8aa73f12f8733c65f57479a24 (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/llmath/tests')
-rw-r--r--indra/llmath/tests/v4math_test.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llmath/tests/v4math_test.cpp b/indra/llmath/tests/v4math_test.cpp
index 191ac864df..9779dfded3 100644
--- a/indra/llmath/tests/v4math_test.cpp
+++ b/indra/llmath/tests/v4math_test.cpp
@@ -355,7 +355,8 @@ namespace tut
val3 = z1 + (z2 - z1)* val;
val4 = w1 + (w2 - w1)* val;
LLVector4 vec4b = lerp(vec4,vec4a,val);
- ensure("lerp failed", ((val1 ==vec4b.mV[VX])&& (val2 ==vec4b.mV[VY]) && (val3 ==vec4b.mV[VZ])&& (val4 ==vec4b.mV[VW])));
+ LLVector4 check(val1, val2, val3, val4);
+ ensure_equals("lerp failed", check, vec4b);
}
template<> template<>