luo980/json
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Potential fix to previous commit

Browse Source
This commit is contained in:
Muhammad Arif bin Mohamad Ghazaly 2024-12-03 16:45:17 -05:00
parent dbfc89891c
commit 567c2d2c93
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/nlohmann/detail/conversions/from_json.hpp
View File

@ -90,11 +90,12 @@ void get_arithmetic_value(const BasicJsonType& j, ArithmeticType& val)
break; break;
} }
case value_t::boolean:
case value_t::null: case value_t::null:
case value_t::object: case value_t::object:
case value_t::array: case value_t::array:
case value_t::string: case value_t::string:
case value_t::boolean:
case value_t::binary: case value_t::binary:
case value_t::discarded: case value_t::discarded:
default: default:
@ -380,15 +381,11 @@ inline void from_json(const BasicJsonType& j, ArithmeticType& val)
} }
case value_t::boolean: case value_t::boolean:
{ {
if ((sizeof(ArithmeticType) == 1) && std::is_unsigned<ArithmeticType>::value) if (std::is_same<ArithmeticType, bool>::value || std::is_same<ArithmeticType, uint8_t>::value)
{ {
val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::boolean_t*>()); val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::boolean_t*>());
break;
} }
else
{
get_arithmetic_value(j, val);
}
break;
} }
case value_t::null: case value_t::null:

11
single_include/nlohmann/json.hpp
View File

@ -4763,11 +4763,12 @@ void get_arithmetic_value(const BasicJsonType& j, ArithmeticType& val)
break; break;
} }
case value_t::boolean:
case value_t::null: case value_t::null:
case value_t::object: case value_t::object:
case value_t::array: case value_t::array:
case value_t::string: case value_t::string:
case value_t::boolean:
case value_t::binary: case value_t::binary:
case value_t::discarded: case value_t::discarded:
default: default:
@ -5053,15 +5054,11 @@ inline void from_json(const BasicJsonType& j, ArithmeticType& val)
} }
case value_t::boolean: case value_t::boolean:
{ {
if ((sizeof(ArithmeticType) == 1) && std::is_unsigned<ArithmeticType>::value) if (std::is_same<ArithmeticType, bool>::value || std::is_same<ArithmeticType, uint8_t>::value)
{ {
val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::boolean_t*>()); val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::boolean_t*>());
break;
} }
else
{
get_arithmetic_value(j, val);
}
break;
} }
case value_t::null: case value_t::null: