summaryrefslogtreecommitdiff
path: root/indra/llmath/tests
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2017-03-06 14:27:29 -0500
committerNat Goodspeed <nat@lindenlab.com>2017-03-06 14:27:29 -0500
commit1771857e6c538382e86ea5b69e36fe8fbaa59f08 (patch)
tree6182c291393b8dbb141d7519b8f1b77d61526774 /indra/llmath/tests
parent08ed7f676f2ce38937a03c2a4e823e3564981264 (diff)
parentbfdbda24bf96b85104742f5578b5a921bc91a1d8 (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<>