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

configuration: use typeCast instead of epicsParse*

Browse Source 
Since typeCast wraps epicsParse*, including base 3.14
compatibility.
This commit is contained in:
Michael Davidsaver
2016-01-05 13:11:33 -05:00
parent 837c10a003
commit 6f85c869ba
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/utils/configuration.cpp
View File

@@ -14,6 +14,7 @@
#include <algorithm>
#include <pv/epicsException.h>
#include <pv/typeCast.h>
#include <osiSock.h>
#include <epicsTypes.h>
@@ -283,32 +284,29 @@ bool Configuration::getPropertyAsBoolean(const std::string &name, const bool def
epics::pvData::int32 Configuration::getPropertyAsInteger(const std::string &name, const epics::pvData::int32 defaultValue) const
{
epicsInt32 ret;
std::string val(getPropertyAsString(name, ""));
if(epicsParseInt32(val.c_str(), &ret, 0, NULL))
try{
return castUnsafe<epics::pvData::int32>(getPropertyAsString(name, ""));
}catch(std::runtime_error&){
return defaultValue;
return ret;
}
}
float Configuration::getPropertyAsFloat(const std::string &name, const float defaultValue) const
{
float ret;
std::string val(getPropertyAsString(name, ""));
if(epicsParseFloat(val.c_str(), &ret, NULL))
try{
return castUnsafe<float>(getPropertyAsString(name, ""));
}catch(std::runtime_error&){
return defaultValue;
return ret;
}
}
double Configuration::getPropertyAsDouble(const std::string &name, const double defaultValue) const
{
double ret;
std::string val(getPropertyAsString(name, ""));
if(epicsParseDouble(val.c_str(), &ret, NULL))
try {
return castUnsafe<double>(getPropertyAsString(name, ""));
}catch(std::runtime_error&){
return defaultValue;
return ret;
}
}
std::string Configuration::getPropertyAsString(const std::string &name, const std::string &defaultValue) const