From 4d4dbcda4dd74e4e227a79da77e029a1ed7e662d Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Tue, 18 Jul 2017 14:28:11 +0200 Subject: [PATCH] expose const void* form of PVScalar::putFrom() --- src/pv/pvData.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pv/pvData.h b/src/pv/pvData.h index e75c99b..b55aaf9 100644 --- a/src/pv/pvData.h +++ b/src/pv/pvData.h @@ -356,9 +356,10 @@ public: inline void putFrom(T val) { this->putFrom((const void*)&val, (ScalarType)ScalarTypeID::value); } -protected: + + //! Convert and assign virtual void putFrom(const void *, ScalarType) = 0; -public: + virtual void assign(const PVScalar&) = 0; @@ -493,12 +494,14 @@ protected: const T src = get(); castUnsafeV(1, rtype, result, typeCode, (const void*)&src); } +public: virtual void putFrom(const void *src, ScalarType stype) OVERRIDE { T result; castUnsafeV(1, typeCode, (void*)&result, stype, src); put(result); } +protected: friend class PVDataCreate; storage_t storage;