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

Merge pull request #9 from anjohnson/fix-nan

Browse Source 
Use epicsNAN instead of non-portable nan() function
This commit is contained in:
Marty Kraimer
2015-08-18 15:11:35 -04:00
parent 1d30a9103d e22d5814e0
commit b16086d4f4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pvaClientMultiGetDouble.cpp
View File

@@ -119,7 +119,7 @@ epics::pvData::shared_vector<double> PvaClientMultiGetDouble::get()
PVStructurePtr pvStructure = pvaClientGet[i]->getData()->getPVStructure();
doubleValue[i] = convert->toDouble(pvStructure->getSubField<PVScalar>("value"));
} else {
doubleValue[i] = nan("");
doubleValue[i] = epicsNAN;
}
}
return doubleValue;

2
src/pvaClientMultiMonitorDouble.cpp
View File

@@ -45,7 +45,7 @@ PvaClientMultiMonitorDouble::PvaClientMultiMonitorDouble(
: pvaClientMultiChannel(pvaClientMultiChannel),
pvaClientChannelArray(pvaClientChannelArray),
nchannel(pvaClientChannelArray.size()),
doubleValue(shared_vector<double>(nchannel,nan(""))),
doubleValue(shared_vector<double>(nchannel,epicsNAN)),
pvaClientMonitor(std::vector<PvaClientMonitorPtr>(nchannel,PvaClientMonitorPtr())),
isMonitorConnected(false),
isDestroyed(false)