From 00da6c88ae88e763817e0635cdfec597aff48f28 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Wed, 3 Jul 2013 11:41:53 -0400 Subject: [PATCH] minor --- pvDataApp/pv/pvData.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pvDataApp/pv/pvData.h b/pvDataApp/pv/pvData.h index 752ddd8..e8aeef5 100644 --- a/pvDataApp/pv/pvData.h +++ b/pvDataApp/pv/pvData.h @@ -1241,8 +1241,7 @@ public: this->swap(next); // no convert == no copy } else { size_t len = inp.size() / ScalarTypeFunc::elementSize(id); - svector result; - this->swap(result); + svector result(this->take()); result.resize(len); castUnsafeV(len, typeCode, result.data(), id, inp.data()); @@ -1254,8 +1253,7 @@ public: virtual void copyIn(ScalarType id, const void* ptr, size_t len) { - svector data; - this->swap(data); + svector data(this->take()); // Will have to re-alloc anyway? If so avoid copying // data which will only be over-written if(data.capacity()