lib/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-07-09 11:01:47 +03:00
Code Activity

fixed #42 (removed equality comparisons for floats)

Browse Source
This commit is contained in:
Niels
2015-03-23 23:03:48 +01:00
parent 8e1c5f2221
commit 43417c350b
3 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/json.hpp
View File

@ -1571,11 +1571,11 @@ class basic_json
{
if (rhs.type() == value_t::number_integer)
{
return lhs.m_value.number_float == static_cast<number_float_t>(rhs.m_value.number_integer);
return approx(lhs.m_value.number_float, static_cast<number_float_t>(rhs.m_value.number_integer));
}
if (rhs.type() == value_t::number_float)
{
return lhs.m_value.number_float == rhs.m_value.number_float;
return approx(lhs.m_value.number_float, rhs.m_value.number_float);
}
break;
}
@ -2008,6 +2008,13 @@ class basic_json
}
}
/// "equality" comparison for floating point numbers
template<typename T>
inline static bool approx(const T a, const T b)
{
return not (a > b or a < b);
}
private:
//////////////////////
@ -4275,7 +4282,7 @@ basic_json_parser_59:
// check if conversion loses precision
const auto int_val = static_cast<number_integer_t>(float_val);
if (float_val == int_val)
if (approx(float_val, static_cast<number_float_t>(int_val)))
{
// we basic_json not lose precision -> return int
return basic_json(int_val);