diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-08-18 14:38:46 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-08-18 14:38:46 -0400 |
| commit | d3c63401d26406093023e7cf4426ef4e29e138fd (patch) | |
| tree | 3e3274e9782adbede8c0ebbd04bc2292746c526e /indra/llcommon/llmemory.h | |
| parent | 5519e8eac2c173949ed6cd67eb5ca6344dbace33 (diff) | |
| parent | b021c90e7bccdd0f9a916946e7716a00034254c2 (diff) | |
merge changes for 3.7.14-release
Diffstat (limited to 'indra/llcommon/llmemory.h')
| -rwxr-xr-x | indra/llcommon/llmemory.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h index db52f2b1f4..7d1d541a4b 100755 --- a/indra/llcommon/llmemory.h +++ b/indra/llcommon/llmemory.h @@ -257,7 +257,8 @@ inline void ll_memcpy_nonaliased_aligned_16(char* __restrict dst, const char* __ assert((bytes % sizeof(F32))== 0); ll_assert_aligned(src,16); ll_assert_aligned(dst,16); - assert((src < dst) ? ((src + bytes) < dst) : ((dst + bytes) < src)); + + assert((src < dst) ? ((src + bytes) <= dst) : ((dst + bytes) <= src)); assert(bytes%16==0); char* end = dst + bytes; |