Skip to content

J
json
Commit 5dd27f1a authored by chenguoping's avatar chenguoping
Browse files
Options

compare against max float and min float before converting

parent 779a0ec7
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
include/nlohmann/detail/output/binary_writer.hpp
View file @ 5dd27f1a
...@@ -194,8 +194,8 @@ class binary_writer ...@@ -194,8 +194,8 @@ class binary_writer
} }
else else
{ {
if (j.m_value.number_float > -std::numeric_limits<float>::min() and if (j.m_value.number_float >= std::numeric_limits<float>::lowest() and
j.m_value.number_float < std::numeric_limits<float>::max() and j.m_value.number_float <= std::numeric_limits<float>::max() and
static_cast<double>(static_cast<float>(j.m_value.number_float)) == j.m_value.number_float) static_cast<double>(static_cast<float>(j.m_value.number_float)) == j.m_value.number_float)
{ {
oa->write_character(get_cbor_float_prefix(static_cast<float>(j.m_value.number_float))); oa->write_character(get_cbor_float_prefix(static_cast<float>(j.m_value.number_float)));
......
single_include/nlohmann/json.hpp
View file @ 5dd27f1a
...@@ -12143,8 +12143,8 @@ class binary_writer ...@@ -12143,8 +12143,8 @@ class binary_writer
} }
else else
{ {
if (j.m_value.number_float > -std::numeric_limits<float>::min() and if (j.m_value.number_float >= std::numeric_limits<float>::lowest() and
j.m_value.number_float < std::numeric_limits<float>::max() and j.m_value.number_float <= std::numeric_limits<float>::max() and
static_cast<double>(static_cast<float>(j.m_value.number_float)) == j.m_value.number_float) static_cast<double>(static_cast<float>(j.m_value.number_float)) == j.m_value.number_float)
{ {
oa->write_character(get_cbor_float_prefix(static_cast<float>(j.m_value.number_float))); oa->write_character(get_cbor_float_prefix(static_cast<float>(j.m_value.number_float)));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment