walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

MathLib: Minor tweaks. Use toDoubleNumber instead of std::atof. Only use clang workaround with clang.

This commit is contained in:
Daniel Marjamäki 2015-07-10 18:34:28 +02:00
parent 81d9c90890
commit f36f1e8952
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/mathlib.cpp
View File

@ -120,7 +120,7 @@ MathLib::bigint MathLib::toLongNumber(const std::string & str)
if (isFloat(str)) {
// Things are going to be less precise now: the value can't be represented in the bigint type.
// Use min/max values as an approximation. See #5843
const double doubleval = std::atof(str.c_str());
const double doubleval = toDoubleNumber(str);
if (doubleval > (double)std::numeric_limits<bigint>::max())
return std::numeric_limits<bigint>::max();
else if (doubleval < (double)std::numeric_limits<bigint>::min())
@ -143,10 +143,14 @@ double MathLib::toDoubleNumber(const std::string &str)
// nullcheck
else if (isNullValue(str))
return 0.0;
#ifdef __clang__
else if (isFloat(str)) // Workaround libc++ bug at http://llvm.org/bugs/show_bug.cgi?id=17782
// TODO : handle locale
return std::strtod(str.c_str(), 0);
#endif
// otherwise, convert to double
std::istringstream istr(str);
istr.imbue(std::locale::classic());
double ret;
istr >> ret;
return ret;