j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'develop' of https://github.com/nlohmann/json into develop

Browse source
This commit is contained in:
Niels Lohmann 2017-06-21 18:55:28 +02:00
commit 3dc5d95422
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/examples/operator__notequal.cpp
View file

@ -16,8 +16,8 @@ int main()
// output values and comparisons // output values and comparisons
std::cout << std::boolalpha; std::cout << std::boolalpha;
std::cout << array_1 << " == " << array_2 << " " << (array_1 != array_2) << '\n'; std::cout << array_1 << " != " << array_2 << " " << (array_1 != array_2) << '\n';
std::cout << object_1 << " == " << object_2 << " " << (object_1 != object_2) << '\n'; std::cout << object_1 << " != " << object_2 << " " << (object_1 != object_2) << '\n';
std::cout << number_1 << " == " << number_2 << " " << (number_1 != number_2) << '\n'; std::cout << number_1 << " != " << number_2 << " " << (number_1 != number_2) << '\n';
std::cout << string_1 << " == " << string_2 << " " << (string_1 != string_2) << '\n'; std::cout << string_1 << " != " << string_2 << " " << (string_1 != string_2) << '\n';
} }

8
src/json.hpp
View file

@ -10865,16 +10865,16 @@ class basic_json
boolean | `false` | false | 0xc2 boolean | `false` | false | 0xc2
number_integer | -9223372036854775808..-2147483649 | int64 | 0xd3 number_integer | -9223372036854775808..-2147483649 | int64 | 0xd3
number_integer | -2147483648..-32769 | int32 | 0xd2 number_integer | -2147483648..-32769 | int32 | 0xd2
number_integer | -32768..-129 | int16 | 0xd1 number_integer | -32768..-129 | int16 | 0xd1
number_integer | -128..-33 | int8 | 0xd0 number_integer | -128..-33 | int8 | 0xd0
number_integer | -32..-1 | negative fixint | 0xe0..0xff number_integer | -32..-1 | negative fixint | 0xe0..0xff
number_integer | 0..127 | positive fixint | 0x00..0x7f number_integer | 0..127 | positive fixint | 0x00..0x7f
number_integer | 128..255 | uint 8 | 0xcc number_integer | 128..255 | uint 8 | 0xcc
number_integer | 256..65535 | uint 16 | 0xcd number_integer | 256..65535 | uint 16 | 0xcd
number_integer | 65536..4294967295 | uint 32 | 0xce number_integer | 65536..4294967295 | uint 32 | 0xce
number_integer | 4294967296..18446744073709551615 | uint 64 | 0xcf number_integer | 4294967296..18446744073709551615 | uint 64 | 0xcf
number_unsigned | 0..127 | positive fixint | 0x00..0x7f number_unsigned | 0..127 | positive fixint | 0x00..0x7f
number_unsigned | 128..255 | uint 8 | 0xcc number_unsigned | 128..255 | uint 8 | 0xcc
number_unsigned | 256..65535 | uint 16 | 0xcd number_unsigned | 256..65535 | uint 16 | 0xcd
number_unsigned | 65536..4294967295 | uint 32 | 0xce number_unsigned | 65536..4294967295 | uint 32 | 0xce
number_unsigned | 4294967296..18446744073709551615 | uint 64 | 0xcf number_unsigned | 4294967296..18446744073709551615 | uint 64 | 0xcf
@ -10970,7 +10970,7 @@ class basic_json
map | object | 0xbb map | object | 0xbb
map | object | 0xbf map | object | 0xbf
False | `false` | 0xf4 False | `false` | 0xf4
True | `true` | 0xf5 True | `true` | 0xf5
Nill | `null` | 0xf6 Nill | `null` | 0xf6
Half-Precision Float | number_float | 0xf9 Half-Precision Float | number_float | 0xf9
Single-Precision Float | number_float | 0xfa Single-Precision Float | number_float | 0xfa