<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10718">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">SigProcLib: Use available copyTo Vector API instead of memcopy<br><br>This change allows to remove some wrong use of code as per compilation<br>warning:<br>osmo-trx/Transceiver52M/sigProcLib.cpp:1266:40: error:<br>‘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]<br>   midMidamble->size() * sizeof(complex));<br><br>Change-Id: Id446711349bec70fa4e7c8efe0f7f9faf7e4f277<br>---<br>M CommonLibs/Vector.h<br>M Transceiver52M/sigProcLib.cpp<br>2 files changed, 5 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/CommonLibs/Vector.h b/CommonLibs/Vector.h</span><br><span>index 15d6710..0ba1b9e 100644</span><br><span>--- a/CommonLibs/Vector.h</span><br><span>+++ b/CommonLibs/Vector.h</span><br><span>@@ -107,7 +107,7 @@</span><br><span>  void clone(const Vector<T>& other)</span><br><span>         {</span><br><span>            resize(other.size());</span><br><span style="color: hsl(0, 100%, 40%);">-           memcpy(mData,other.mStart,other.bytes());</span><br><span style="color: hsl(120, 100%, 40%);">+             other.copyTo(*this);</span><br><span>         }</span><br><span> </span><br><span> </span><br><span>diff --git a/Transceiver52M/sigProcLib.cpp b/Transceiver52M/sigProcLib.cpp</span><br><span>index e94170b..2040b36 100644</span><br><span>--- a/Transceiver52M/sigProcLib.cpp</span><br><span>+++ b/Transceiver52M/sigProcLib.cpp</span><br><span>@@ -1262,8 +1262,7 @@</span><br><span>   data = (complex *) convolve_h_alloc(midMidamble->size());</span><br><span>   _midMidamble = new signalVector(data, 0, midMidamble->size());</span><br><span>   _midMidamble->setAligned(true);</span><br><span style="color: hsl(0, 100%, 40%);">-  memcpy(_midMidamble->begin(), midMidamble->begin(),</span><br><span style="color: hsl(0, 100%, 40%);">-   midMidamble->size() * sizeof(complex));</span><br><span style="color: hsl(120, 100%, 40%);">+  midMidamble->copyTo(*_midMidamble);</span><br><span> </span><br><span>   autocorr = convolve(midamble, _midMidamble, NULL, NO_DELAY);</span><br><span>   if (!autocorr) {</span><br><span>@@ -1319,8 +1318,7 @@</span><br><span>   data = (complex *) convolve_h_alloc(midamble->size());</span><br><span>   _midamble = new signalVector(data, 0, midamble->size());</span><br><span>   _midamble->setAligned(true);</span><br><span style="color: hsl(0, 100%, 40%);">-  memcpy(_midamble->begin(), midamble->begin(),</span><br><span style="color: hsl(0, 100%, 40%);">-      midamble->size() * sizeof(complex));</span><br><span style="color: hsl(120, 100%, 40%);">+  midamble->copyTo(*_midamble);</span><br><span> </span><br><span>   /* Channel gain is an empirically measured value */</span><br><span>   seq = new CorrelationSequence;</span><br><span>@@ -1360,7 +1358,7 @@</span><br><span>   data = (complex *) convolve_h_alloc(seq1->size());</span><br><span>   _seq1 = new signalVector(data, 0, seq1->size());</span><br><span>   _seq1->setAligned(true);</span><br><span style="color: hsl(0, 100%, 40%);">-  memcpy(_seq1->begin(), seq1->begin(), seq1->size() * sizeof(complex));</span><br><span style="color: hsl(120, 100%, 40%);">+  seq1->copyTo(*_seq1);</span><br><span> </span><br><span>   autocorr = convolve(seq0, _seq1, autocorr, NO_DELAY);</span><br><span>   if (!autocorr) {</span><br><span>@@ -1457,7 +1455,7 @@</span><br><span> {</span><br><span>   signalVector in(DOWNSAMPLE_IN_LEN, dnsampler->len());</span><br><span>   signalVector *out = new signalVector(DOWNSAMPLE_OUT_LEN);</span><br><span style="color: hsl(0, 100%, 40%);">-  memcpy(in.begin(), burst.begin(), DOWNSAMPLE_IN_LEN * 2 * sizeof(float));</span><br><span style="color: hsl(120, 100%, 40%);">+  burst.copyToSegment(in, 0, DOWNSAMPLE_IN_LEN);</span><br><span> </span><br><span>   if (dnsampler->rotate((float *) in.begin(), DOWNSAMPLE_IN_LEN,</span><br><span>                         (float *) out->begin(), DOWNSAMPLE_OUT_LEN) < 0) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10718">change 10718</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/10718"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-trx </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Id446711349bec70fa4e7c8efe0f7f9faf7e4f277 </div>
<div style="display:none"> Gerrit-Change-Number: 10718 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>