espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/ble_mesh_fix_compile_error_with_cpp_3.3' into 'release/v3.3'

Browse Source 
ble_mesh: Fix compile error with c++ files (v3.3)

See merge request espressif/esp-idf!7585
This commit is contained in:
Jiang Jiang Jian
2020-02-18 20:44:31 +08:00
parent 9b1c1f21f9 46b1608f44
commit a4bbcbcf98
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
components/bt/esp_ble_mesh/mesh_common/include/mesh_util.h
View File

@ -400,14 +400,17 @@ int _compare(const uint8_t *a, const uint8_t *b, size_t size);
*/
static inline void sys_memcpy_swap(void *dst, const void *src, size_t length)
{
__ASSERT(((src < dst && (src + length) <= dst) ||
(src > dst && (dst + length) <= src)),
u8_t *pdst = (u8_t *)dst;
const u8_t *psrc = (const u8_t *)src;
__ASSERT(((psrc < pdst && (psrc + length) <= pdst) ||
(psrc > pdst && (pdst + length) <= psrc)),
"Source and destination buffers must not overlap");
src += length - 1;
psrc += length - 1;
for (; length > 0; length--) {
*((u8_t *)dst++) = *((u8_t *)src--);
*pdst++ = *psrc--;
}
}