diff options
| author | simon <none@none> | 2014-08-20 16:31:34 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-08-20 16:31:34 -0700 |
| commit | 518cc86156c2e10b9e603ac9e661f8c35faf5f70 (patch) | |
| tree | 739b3aee858a63051949d0705a4c10cd2ce41320 /indra/llcommon | |
| parent | b740891b1f19c3d0e9ee494ef3bdb8adc3dcb151 (diff) | |
| parent | b021c90e7bccdd0f9a916946e7716a00034254c2 (diff) | |
Merge viewer-release and become version 3.7.15
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 8eeb186936..763f5a3521 100755 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -301,7 +301,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 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; |