paulmataruso/osmo-trx
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-trx.git synced 2025-11-03 13:43:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Vector: Copy arrays in a sane way for non-trivially copyable types

Browse Source 
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
This commit is contained in:
Pau Espin Pedrol
2018-08-30 20:55:08 +02:00
parent 1f15152968
commit e62555370e
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
CommonLibs/Vector.h
View File

@@ -204,10 +204,15 @@ template <class T> class Vector {
*/ */
void copyToSegment(Vector<T>& other, size_t start, size_t span) const void copyToSegment(Vector<T>& other, size_t start, size_t span) const
{ {
T* base = other.mStart + start; unsigned int i;
assert(base+span<=other.mEnd); T* dst = other.mStart + start;
T* src = mStart;
assert(dst+span<=other.mEnd);
assert(mStart+span<=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. */ /** Copy all of this Vector to a segment of another Vector. */

18
Transceiver52M/signalVector.cpp
View File

@@ -41,7 +41,14 @@ signalVector::signalVector(const signalVector &vector,
void signalVector::operator=(const signalVector& vector) void signalVector::operator=(const signalVector& vector)
{ {
resize(vector.size() + vector.getStart()); resize(vector.size() + vector.getStart());
memcpy(mData, vector.mData, bytes());
unsigned int i;
complex *dst = mData;
complex *src = vector.mData;
for (i = 0; i < size(); i++, src++, dst++)
*dst = *src;
/* TODO: optimize for non non-trivially copyable types: */
/*memcpy(mData, vector.mData, bytes()); */
mStart = mData + vector.getStart(); mStart = mData + vector.getStart();
} }
@@ -58,8 +65,13 @@ size_t signalVector::getStart() const
size_t signalVector::updateHistory() size_t signalVector::updateHistory()
{ {
size_t num = getStart(); size_t num = getStart();
unsigned int i;
memmove(mData, mStart + this->size() - num, num * sizeof(complex)); complex *dst = mData;
complex *src = mStart + this->size() - num;
for (i = 0; i < num; i++, src++, dst++)
*dst = *src;
/* TODO: optimize for non non-trivially copyable types: */
/*memmove(mData, mStart + this->size() - num, num * sizeof(complex)); */
return num; return num;
} }