From 1caf68eb9b1408a82e10d97fb68e6b056d939765 Mon Sep 17 00:00:00 2001 From: f4exb Date: Mon, 15 Oct 2018 10:38:07 +0200 Subject: [PATCH] Scope: save/load traces memory (3): compile fix --- sdrbase/util/doublebuffer.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sdrbase/util/doublebuffer.h b/sdrbase/util/doublebuffer.h index 169e3adf5..1dafc3334 100644 --- a/sdrbase/util/doublebuffer.h +++ b/sdrbase/util/doublebuffer.h @@ -90,7 +90,8 @@ public: } typename std::vector::iterator getCurrent() const { return m_current + m_size; } - typename std::vector::iterator begin() const { return m_data.begin(); } + typename std::vector::const_iterator begin() const { return m_data.begin(); } + typename std::vector::iterator begin() { return m_data.begin(); } unsigned int absoluteFill() const { return m_current - m_data.begin(); } void reset() { m_current = m_data.begin(); } @@ -124,9 +125,7 @@ public: d.readU32(2, &tmpUInt, 0); m_current = m_data.begin() + tmpUInt; d.readBlob(3, &buf); - const T* begin = reinterpret_cast(buf.data()); - const T* end = begin + (buf.length()/sizeof(T)); - std::copy(m_data.begin(), begin, end); + std::copy(reinterpret_cast(m_data.data()), buf.data(), buf.data() + buf.size()); return true; }