Revert to use std::strtof insted of std::stof to make travis happy

This commit is contained in:
teejusb
2020-04-08 22:41:19 -07:00
parent 1d365fbc18
commit 620ef3609d
+8 -26
View File
@@ -1877,38 +1877,20 @@ void MakeLower( wchar_t *p, size_t iLen )
float StringToFloat( const RString &sString )
{
try
float fOut = std::strtof(sString, nullptr);
if (!isfinite(fOut))
{
float fOut = std::stof(sString);
if (!isfinite(fOut))
{
fOut = 0.0f;
}
return fOut;
fOut = 0.0f;
}
catch(...)
{
return 0.0f;
}
return fOut;
}
bool StringToFloat( const RString &sString, float &fOut )
{
try
{
fOut = std::stof(sString);
if (!isfinite(fOut))
{
fOut = 0.0f;
return false;
}
return true;
}
catch(...)
{
fOut = 0.0f;
return false;
}
char *endPtr = nullptr;
fOut = std::strtof(sString, &endPtr);
return sString.size() && *endPtr == '\0' && isfinite(fOut);
}
RString FloatToString( const float &num )