diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2018-08-30 20:55:08 +0200 |
|---|---|---|
| committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2018-09-10 10:33:34 +0200 |
| commit | e62555370e6f14a78217cdd7e87c9f3b3d315f95 (patch) | |
| tree | da2a27b7a469bded9881aa681d165e78d6397b40 /CommonLibs/Vector.h | |
| parent | 1f1515296813e6cd7f47c0c3186da7111dec7dca (diff) | |
Vector: Copy arrays in a sane way for non-trivially copyable types
Avoids this type of compilation warnings:
‘void* memcpy(void*, const void*, size_t)’ writing to an object of non-trivially copyable type ‘class Complex<float>’; use copy-assignment or copy-initialization instead [-Werror=class-memaccess]
Change-Id: I9724454dfb7b87f74f39074e4004580ac3b5fe5c
Diffstat (limited to 'CommonLibs/Vector.h')
| -rw-r--r-- | CommonLibs/Vector.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/CommonLibs/Vector.h b/CommonLibs/Vector.h index 51a9fb1..9119683 100644 --- a/CommonLibs/Vector.h +++ b/CommonLibs/Vector.h @@ -204,10 +204,15 @@ template <class T> class Vector { */ void copyToSegment(Vector<T>& other, size_t start, size_t span) const { - T* base = other.mStart + start; - assert(base+span<=other.mEnd); + unsigned int i; + T* dst = other.mStart + start; + T* src = mStart; + assert(dst+span<=other.mEnd); assert(mStart+span<=mEnd); - memcpy(base,mStart,span*sizeof(T)); + for (i = 0; i < span; i++, src++, dst++) + *dst = *src; + /*TODO if not non-trivially copyable type class, optimize: + memcpy(dst,mStart,span*sizeof(T)); */ } /** Copy all of this Vector to a segment of another Vector. */ |