diff options
| author | Graham Linden <graham@lindenlab.com> | 2014-08-29 11:31:51 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2014-08-29 11:31:51 -0700 |
| commit | 96a3a858b4ce49a83b18493854abd88f4b14d629 (patch) | |
| tree | 6205d06d79c4bb19aa9a7017ae4d0021229cfb9c /indra/llcommon | |
| parent | 297aefd933c1f9646268556eb81132770fd3ce70 (diff) | |
| parent | b021c90e7bccdd0f9a916946e7716a00034254c2 (diff) | |
Mergeville
Diffstat (limited to 'indra/llcommon')
| -rwxr-xr-x | indra/llcommon/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | indra/llcommon/llmemory.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index 5514ea84a8..8dbb18aa08 100755 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -303,7 +303,7 @@ if (LL_TESTS) LL_ADD_INTEGRATION_TEST(llunits "" "${test_libs}") LL_ADD_INTEGRATION_TEST(stringize "" "${test_libs}") LL_ADD_INTEGRATION_TEST(lleventdispatcher "" "${test_libs}") - LL_ADD_INTEGRATION_TEST(lleventcoro "" "${test_libs};${BOOST_CONTEXT_LIBRARY}") + LL_ADD_INTEGRATION_TEST(lleventcoro "" "${test_libs};${BOOST_CONTEXT_LIBRARY};${BOOST_COROUTINE_LIBRARY};${BOOST_SYSTEM_LIBRARY}") LL_ADD_INTEGRATION_TEST(llprocess "" "${test_libs}") LL_ADD_INTEGRATION_TEST(llleap "" "${test_libs}") LL_ADD_INTEGRATION_TEST(llstreamqueue "" "${test_libs}") diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h index be59d0814a..1dca8ee507 100755 --- a/indra/llcommon/llmemory.h +++ b/indra/llcommon/llmemory.h @@ -258,7 +258,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; |