Fix comparission between integers and floats

Until now it depended on the parameter-order whether integers and floats were compared as integers or floats. Appart from being not logical, this might even have meant that the provided “order” was in fact not that. (not sure here, but I like to be carefull)

Fix comparission between integers and floats
d2771eb1 · Florian Weber · 306695dd · d2771eb1 · d2771eb1
Commit d2771eb1 authored Apr 26, 2015 by Florian Weber
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 8 deletions

json.hpp src/json.hpp +4 -4

json.hpp.re2c src/json.hpp.re2c +4 -4

No files found.
--- a/src/json.hpp
+++ b/src/json.hpp
@@ -1906,8 +1906,8 @@ class basic_json
        }
        else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_float)
        {
-            return lhs.m_value.number_integer ==
+            return approx(static_cast<number_float_t>(lhs.m_value.number_integer),
-                   static_cast<number_integer_t>(rhs.m_value.number_float);
+                          rhs.m_value.number_float);
        }
        else if (lhs_type == value_t::number_float and rhs_type == value_t::number_integer)
        {
@@ -1967,8 +1967,8 @@ class basic_json
        }
        else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_float)
        {
-            return lhs.m_value.number_integer <
+            return static_cast<number_float_t>(lhs.m_value.number_integer) <
-                   static_cast<number_integer_t>(rhs.m_value.number_float);
+                   rhs.m_value.number_float;
        }
        else if (lhs_type == value_t::number_float and rhs_type == value_t::number_integer)
        {

--- a/src/json.hpp.re2c
+++ b/src/json.hpp.re2c
@@ -1906,8 +1906,8 @@ class basic_json
        }
        else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_float)
        {
-            return lhs.m_value.number_integer ==
+            return approx(static_cast<number_float_t>(lhs.m_value.number_integer),
-                   static_cast<number_integer_t>(rhs.m_value.number_float);
+                          rhs.m_value.number_float);
        }
        else if (lhs_type == value_t::number_float and rhs_type == value_t::number_integer)
        {
@@ -1967,8 +1967,8 @@ class basic_json
        }
        else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_float)
        {
-            return lhs.m_value.number_integer <
+            return static_cast<number_float_t>(lhs.m_value.number_integer) <
-                   static_cast<number_integer_t>(rhs.m_value.number_float);
+                   rhs.m_value.number_float;
        }
        else if (lhs_type == value_t::number_float and rhs_type == value_t::number_integer)
        {