Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
json
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
json
Commits
3dc5d954
Unverified
Commit
3dc5d954
authored
Jun 21, 2017
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of
https://github.com/nlohmann/json
into develop
parents
b9a8425c
5ee651c3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
doc/examples/operator__notequal.cpp
doc/examples/operator__notequal.cpp
+4
-4
src/json.hpp
src/json.hpp
+4
-4
No files found.
doc/examples/operator__notequal.cpp
View file @
3dc5d954
...
@@ -16,8 +16,8 @@ int main()
...
@@ -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'
;
}
}
src/json.hpp
View file @
3dc5d954
...
@@ -10865,16 +10865,16 @@ class basic_json
...
@@ -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
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment