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

Change enum to type in converters

Browse Source
This commit is contained in:
Michael Davidsaver
2013-07-29 15:09:47 -04:00
parent c643509c7e
commit f21811eb6a
3 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pvDataApp/factory/Convert.cpp
View File

@@ -126,7 +126,7 @@ size_t Convert::fromStringArray(PVScalarArrayPtr const &pv,
data.begin());
PVStringArray::const_svector temp(freeze(data));
pv->putFrom<pvString>(temp);
pv->putFrom<String>(temp);
return length;
} else {
@@ -140,7 +140,7 @@ size_t Convert::toStringArray(PVScalarArrayPtr const & pv,
StringArray &to, size_t toOffset)
{
PVStringArray::const_svector data;
pv->getAs<pvString>(data);
pv->getAs<String>(data);
data.slice(offset, length);
if(toOffset+data.size() > to.size())
to.resize(toOffset+data.size());