From 0bb17d5b09605678e9241221f2a3677215202853 Mon Sep 17 00:00:00 2001 From: mrkraimer Date: Mon, 8 Apr 2019 14:23:58 -0400 Subject: [PATCH] make them work if not top level value field --- src/pvaClientData.cpp | 7 ++----- src/pvaClientPutData.cpp | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/pvaClientData.cpp b/src/pvaClientData.cpp index 8cb06e7..8178397 100644 --- a/src/pvaClientData.cpp +++ b/src/pvaClientData.cpp @@ -309,11 +309,8 @@ shared_vector PvaClientData::getStringArray() PVFieldPtr pvField(fieldPtrArray[0]); Type type = pvField->getField()->getType(); if(type==scalarArray) { - PVScalarArrayPtr pvScalarArray = static_pointer_cast(pvField); - if(pvScalarArray->getScalarArray()->getElementType()==pvString) { - pvScalarArray = static_pointer_cast(pvField); - break; - } + pvScalarArray = static_pointer_cast(pvField); + break; } if(pvField->getField()->getType()!=epics::pvData::structure) break; pvStructure = static_pointer_cast(pvField); diff --git a/src/pvaClientPutData.cpp b/src/pvaClientPutData.cpp index e1fe8ce..a0d3cc1 100644 --- a/src/pvaClientPutData.cpp +++ b/src/pvaClientPutData.cpp @@ -213,11 +213,8 @@ void PvaClientPutData::putStringArray(shared_vector const & v PVFieldPtr pvField(fieldPtrArray[0]); Type type = pvField->getField()->getType(); if(type==scalarArray) { - PVScalarArrayPtr pvScalarArray = static_pointer_cast(pvField); - if(pvScalarArray->getScalarArray()->getElementType()==pvString) { - pvScalarArray = static_pointer_cast(pvField); - break; - } + pvScalarArray = static_pointer_cast(pvField); + break; } if(pvField->getField()->getType()!=epics::pvData::structure) break; pvStructure = static_pointer_cast(pvField);