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
37a72dac
Unverified
Commit
37a72dac
authored
6 years ago
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
forgot two semicolons
parent
8d3f4f21
develop
bon8
coverity_scan
feature/optional
gcc_warning_flags
icpc
issue2228
issue2615
issue2932
issue3232_use_catch
master
release/3.10.2
release/3.10.3
release/3.10.4
release/3.10.5
string_view
string_view2
update_doctest
3.6.1
v3.10.5
v3.10.4
v3.10.3
v3.10.2
v3.10.1
v3.10.0
v3.9.1
v3.9.0
v3.8.0
v3.7.3
v3.7.2
v3.7.1
v3.7.0
v3.6.1
v3.6.0
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
include/nlohmann/detail/input/json_sax.hpp
include/nlohmann/detail/input/json_sax.hpp
+2
-2
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+2
-2
No files found.
include/nlohmann/detail/input/json_sax.hpp
View file @
37a72dac
...
...
@@ -304,7 +304,7 @@ class json_sax_dom_parser
return
&
(
ref_stack
.
back
()
->
m_value
.
array
->
back
());
}
assert
(
ref_stack
.
back
()
->
is_object
())
assert
(
ref_stack
.
back
()
->
is_object
())
;
assert
(
object_element
);
*
object_element
=
BasicJsonType
(
std
::
forward
<
Value
>
(
v
));
return
object_element
;
...
...
@@ -590,7 +590,7 @@ class json_sax_dom_callback_parser
}
// object
assert
(
ref_stack
.
back
()
->
is_object
())
assert
(
ref_stack
.
back
()
->
is_object
())
;
// check if we should store an element for the current key
assert
(
not
key_keep_stack
.
empty
());
const
bool
store_element
=
key_keep_stack
.
back
();
...
...
This diff is collapsed.
Click to expand it.
single_include/nlohmann/json.hpp
View file @
37a72dac
...
...
@@ -2982,7 +2982,7 @@ class json_sax_dom_parser
return
&
(
ref_stack
.
back
()
->
m_value
.
array
->
back
());
}
assert
(
ref_stack
.
back
()
->
is_object
())
assert
(
ref_stack
.
back
()
->
is_object
())
;
assert
(
object_element
);
*
object_element
=
BasicJsonType
(
std
::
forward
<
Value
>
(
v
));
return
object_element
;
...
...
@@ -3268,7 +3268,7 @@ class json_sax_dom_callback_parser
}
// object
assert
(
ref_stack
.
back
()
->
is_object
())
assert
(
ref_stack
.
back
()
->
is_object
())
;
// check if we should store an element for the current key
assert
(
not
key_keep_stack
.
empty
());
const
bool
store_element
=
key_keep_stack
.
back
();
...
...
This diff is collapsed.
Click to expand it.
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