epics/pvData
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

use new API

Browse Source 
make copying explicit and replace some
use of PVValueArray<T>::put and get
This commit is contained in:
Michael Davidsaver
2013-05-08 15:16:58 -04:00
parent e843779555
commit 992ac73068
6 changed files with 21 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pvDataApp/factory/Convert.cpp
View File

@@ -114,11 +114,12 @@ size_t Convert::fromStringArray(PVScalarArrayPtr const &pv,
StringArray const & from,
size_t fromOffset)
{
assert(offset==0);
size_t alen = pv->getLength();
if(fromOffset>alen) return 0;
alen -= fromOffset;
if(length>alen) length=alen;
pv->putFrom<pvString>(&from[fromOffset], length, offset);
pv->copyIn<pvString>(&from[fromOffset], length);
return length;
}
@@ -130,7 +131,7 @@ size_t Convert::toStringArray(PVScalarArrayPtr const & pv,
if(offset>alen) return 0;
alen -= offset;
if(length>alen) length=alen;
pv->getAs<pvString>(&to[toOffset], length, offset);
pv->copyOut<pvString>(&to[toOffset], length);
return length;
}