From a2e66e31d2683153f5c82be0ac4dff8fe870738d Mon Sep 17 00:00:00 2001 From: Konstantinos Margaritis Date: Sat, 11 May 2024 18:47:00 +0300 Subject: [PATCH] replace memcpy with std::copy --- src/rose/rose_build_scatter.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/rose/rose_build_scatter.cpp b/src/rose/rose_build_scatter.cpp index a697f6db..f7a457b6 100644 --- a/src/rose/rose_build_scatter.cpp +++ b/src/rose/rose_build_scatter.cpp @@ -115,28 +115,36 @@ void write_out(scatter_full_plan *plan_out, void *aux_out, plan_out->s_u64a_offset = aux_base_offset; plan_out->s_u64a_count = raw.p_u64a.size(); assert(ISALIGNED_N(static_cast(aux_out) + aux_base_offset, alignof(scatter_unit_u64a))); - memcpy(static_cast(aux_out) + aux_base_offset, raw.p_u64a.data(), byte_length(raw.p_u32)); + auto *start = reinterpret_cast(raw.p_u64a.data()); + auto *to = static_cast(aux_out) + aux_base_offset; + std::copy(start, start + byte_length(raw.p_u64a), to); aux_base_offset += byte_length(raw.p_u64a); } if (!raw.p_u32.empty()) { plan_out->s_u32_offset = aux_base_offset; plan_out->s_u32_count = raw.p_u32.size(); assert(ISALIGNED_N(static_cast(aux_out) + aux_base_offset, alignof(scatter_unit_u32))); - memcpy(static_cast(aux_out) + aux_base_offset, raw.p_u32.data(), byte_length(raw.p_u32)); + auto *start = reinterpret_cast(raw.p_u32.data()); + auto *to = static_cast(aux_out) + aux_base_offset; + std::copy(start, start + byte_length(raw.p_u32), to); aux_base_offset += byte_length(raw.p_u32); } if (!raw.p_u16.empty()) { plan_out->s_u16_offset = aux_base_offset; plan_out->s_u16_count = raw.p_u16.size(); assert(ISALIGNED_N(static_cast(aux_out) + aux_base_offset, alignof(scatter_unit_u16))); - memcpy(static_cast(aux_out) + aux_base_offset, raw.p_u16.data(), byte_length(raw.p_u16)); + auto *start = reinterpret_cast(raw.p_u16.data()); + auto *to = static_cast(aux_out) + aux_base_offset; + std::copy(start, start + byte_length(raw.p_u16), to); aux_base_offset += byte_length(raw.p_u16); } if (!raw.p_u8.empty()) { plan_out->s_u8_offset = aux_base_offset; plan_out->s_u8_count = raw.p_u8.size(); assert(ISALIGNED_N(static_cast(aux_out) + aux_base_offset, alignof(scatter_unit_u8))); - memcpy(static_cast(aux_out) + aux_base_offset, raw.p_u8.data(), byte_length(raw.p_u8)); + auto *start = reinterpret_cast(raw.p_u8.data()); + auto *to = static_cast(aux_out) + aux_base_offset; + std::copy(start, start + byte_length(raw.p_u8), to); } }