diff options
author | Dave Parks <davep@lindenlab.com> | 2012-09-12 15:45:12 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2012-09-12 15:45:12 -0500 |
commit | 3a36e3c6a82462b8d01e47707391be168e739b66 (patch) | |
tree | 755be3cc799c66c2f3b877c6f887c12c509b78de /indra/llmath/tests | |
parent | d52c1c1c68c7cdcb791c6fb947fade96e4ef0048 (diff) | |
parent | 9ec263d2f1f51b334949281393ef2446796f1404 (diff) |
Automated merge with http://bitbucket.org/oz_linden/viewer-beta-notcmalloc
Diffstat (limited to 'indra/llmath/tests')
-rw-r--r-- | indra/llmath/tests/alignment_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmath/tests/alignment_test.cpp b/indra/llmath/tests/alignment_test.cpp index ac0c45ae6f..5c426c57c3 100644 --- a/indra/llmath/tests/alignment_test.cpp +++ b/indra/llmath/tests/alignment_test.cpp @@ -78,7 +78,7 @@ void alignment_test_object_t::test<1>() align_ptr = ll_aligned_malloc_16(sizeof(MyVector4a)); ensure("ll_aligned_malloc_16 failed", is_aligned(align_ptr,16)); - align_ptr = ll_aligned_realloc_16(align_ptr,2*sizeof(MyVector4a)); + align_ptr = ll_aligned_realloc_16(align_ptr,2*sizeof(MyVector4a), sizeof(MyVector4a)); ensure("ll_aligned_realloc_16 failed", is_aligned(align_ptr,16)); ll_aligned_free_16(align_ptr); |