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
375b05a1
Unverified
Commit
375b05a1
authored
7 years ago
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cleanup
parent
606a2519
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
20 deletions
+32
-20
include/nlohmann/detail/input/json_sax.hpp
include/nlohmann/detail/input/json_sax.hpp
+16
-10
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+16
-10
No files found.
include/nlohmann/detail/input/json_sax.hpp
View file @
375b05a1
...
...
@@ -277,17 +277,23 @@ class json_sax_dom_parser : public json_sax<BasicJsonType>
}
else
{
assert
(
ref_stack
.
back
()
->
is_array
()
or
ref_stack
.
back
()
->
is_object
());
if
(
ref_stack
.
back
()
->
is_array
())
switch
(
ref_stack
.
back
()
->
m_type
)
{
ref_stack
.
back
()
->
m_value
.
array
->
push_back
(
BasicJsonType
(
std
::
forward
<
Value
>
(
v
)));
return
&
(
ref_stack
.
back
()
->
m_value
.
array
->
back
());
}
else
{
assert
(
object_element
);
*
object_element
=
BasicJsonType
(
std
::
forward
<
Value
>
(
v
));
return
object_element
;
case
value_t
:
:
array
:
{
ref_stack
.
back
()
->
m_value
.
array
->
push_back
(
BasicJsonType
(
std
::
forward
<
Value
>
(
v
)));
return
&
(
ref_stack
.
back
()
->
m_value
.
array
->
back
());
}
case
value_t
:
:
object
:
{
assert
(
object_element
);
*
object_element
=
BasicJsonType
(
std
::
forward
<
Value
>
(
v
));
return
object_element
;
}
default:
assert
(
false
);
// LCOV_EXCL_LINE
}
}
}
...
...
This diff is collapsed.
Click to expand it.
single_include/nlohmann/json.hpp
View file @
375b05a1
...
...
@@ -3413,17 +3413,23 @@ class json_sax_dom_parser : public json_sax<BasicJsonType>
}
else
{
assert
(
ref_stack
.
back
()
->
is_array
()
or
ref_stack
.
back
()
->
is_object
());
if
(
ref_stack
.
back
()
->
is_array
())
switch
(
ref_stack
.
back
()
->
m_type
)
{
ref_stack
.
back
()
->
m_value
.
array
->
push_back
(
BasicJsonType
(
std
::
forward
<
Value
>
(
v
)));
return
&
(
ref_stack
.
back
()
->
m_value
.
array
->
back
());
}
else
{
assert
(
object_element
);
*
object_element
=
BasicJsonType
(
std
::
forward
<
Value
>
(
v
));
return
object_element
;
case
value_t
:
:
array
:
{
ref_stack
.
back
()
->
m_value
.
array
->
push_back
(
BasicJsonType
(
std
::
forward
<
Value
>
(
v
)));
return
&
(
ref_stack
.
back
()
->
m_value
.
array
->
back
());
}
case
value_t
:
:
object
:
{
assert
(
object_element
);
*
object_element
=
BasicJsonType
(
std
::
forward
<
Value
>
(
v
));
return
object_element
;
}
default:
assert
(
false
);
// LCOV_EXCL_LINE
}
}
}
...
...
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