aboutsummaryrefslogtreecommitdiffstats
path: root/Transceiver52M/signalVector.cpp
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2018-08-30 20:55:08 +0200
committerPau Espin Pedrol <pespin@sysmocom.de>2018-09-10 10:33:34 +0200
commite62555370e6f14a78217cdd7e87c9f3b3d315f95 (patch)
treeda2a27b7a469bded9881aa681d165e78d6397b40 /Transceiver52M/signalVector.cpp
parent1f1515296813e6cd7f47c0c3186da7111dec7dca (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 'Transceiver52M/signalVector.cpp')
-rw-r--r--Transceiver52M/signalVector.cpp18
1 files changed, 15 insertions, 3 deletions
diff --git a/Transceiver52M/signalVector.cpp b/Transceiver52M/signalVector.cpp
index 55dad92..fc8157e 100644
--- a/Transceiver52M/signalVector.cpp
+++ b/Transceiver52M/signalVector.cpp
@@ -41,7 +41,14 @@ signalVector::signalVector(const signalVector &vector,
void signalVector::operator=(const signalVector& vector)
{
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();
}
@@ -58,8 +65,13 @@ size_t signalVector::getStart() const
size_t signalVector::updateHistory()
{
size_t num = getStart();
-
- memmove(mData, mStart + this->size() - num, num * sizeof(complex));
+ unsigned int i;
+ 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;
}