haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-07-16 03:15:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

check for is_number_unsigned before is_number_integer

Browse source
This commit is contained in:
Théo DELRIEU 2017-01-09 10:41:00 +01:00
parent cb3d455bd2
commit e678c075dd
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/json.hpp
View file

@ -493,10 +493,11 @@ template <typename Json, typename ArithmeticType,
int> = 0> int> = 0>
void get_arithmetic_value(Json const &j, ArithmeticType &val) void get_arithmetic_value(Json const &j, ArithmeticType &val)
{ {
if (j.is_number_integer()) // unsigned must be checked first, since is_number_integer() == true for unsigned
val = *j.template get_ptr<const typename Json::number_integer_t*>(); if (j.is_number_unsigned())
else if (j.is_number_unsigned())
val = *j.template get_ptr<const typename Json::number_unsigned_t*>(); val = *j.template get_ptr<const typename Json::number_unsigned_t*>();
else if (j.is_number_integer())
val = *j.template get_ptr<const typename Json::number_integer_t*>();
else if (j.is_number_float()) else if (j.is_number_float())
val = *j.template get_ptr<const typename Json::number_float_t*>(); val = *j.template get_ptr<const typename Json::number_float_t*>();
else else
@ -702,10 +703,10 @@ template <
int> = 0> int> = 0>
void from_json(Json const &j, ArithmeticType &val) void from_json(Json const &j, ArithmeticType &val)
{ {
if (j.is_number_integer()) if (j.is_number_unsigned())
val = *j.template get_ptr<const typename Json::number_integer_t*>();
else if (j.is_number_unsigned())
val = *j.template get_ptr<const typename Json::number_unsigned_t*>(); val = *j.template get_ptr<const typename Json::number_unsigned_t*>();
else if (j.is_number_integer())
val = *j.template get_ptr<const typename Json::number_integer_t*>();
else if (j.is_number_float()) else if (j.is_number_float())
val = *j.template get_ptr<const typename Json::number_float_t*>(); val = *j.template get_ptr<const typename Json::number_float_t*>();
else if (j.is_boolean()) else if (j.is_boolean())