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
43cd5c8a
Unverified
Commit
43cd5c8a
authored
Jan 08, 2021
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
👌
fix constructor
parent
d4a91b74
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
12 deletions
+18
-12
include/nlohmann/json.hpp
include/nlohmann/json.hpp
+9
-6
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+9
-6
No files found.
include/nlohmann/json.hpp
View file @
43cd5c8a
...
...
@@ -1639,16 +1639,19 @@ class basic_json
m_type
=
value_t
::
object
;
m_value
=
value_t
::
object
;
std
::
for_each
(
init
.
begin
(),
init
.
end
(),
[
this
](
const
detail
::
json_ref
<
basic_json
>&
element_ref
)
for
(
auto
&
element_ref
:
init
)
{
auto
element
=
element_ref
.
moved_or_copied
();
auto
res
=
m_value
.
object
->
emplace
(
std
::
move
(
*
((
*
element
.
m_value
.
array
)[
0
].
m_value
.
string
)),
std
::
move
((
*
element
.
m_value
.
array
)[
1
]));
#if JSON_DIAGNOSTICS
(
*
element
.
m_value
.
array
)[
1
].
m_parent
=
this
;
res
.
first
->
second
.
m_parent
=
this
;
#else
static_cast
<
void
>
(
res
);
// unused variable - fix warning
#endif
m_value
.
object
->
emplace
(
std
::
move
(
*
((
*
element
.
m_value
.
array
)[
0
].
m_value
.
string
)),
std
::
move
((
*
element
.
m_value
.
array
)[
1
]));
});
}
}
else
{
...
...
single_include/nlohmann/json.hpp
View file @
43cd5c8a
...
...
@@ -18275,16 +18275,19 @@ class basic_json
m_type = value_t::object;
m_value = value_t::object;
std
::
for_each
(
init
.
begin
(),
init
.
end
(),
[
this
](
const
detail
::
json_ref
<
basic_json
>&
element_ref
)
for (auto& element_ref : init
)
{
auto element = element_ref.moved_or_copied();
auto res = m_value.object->emplace(
std::move(*((*element.m_value.array)[0].m_value.string)),
std::move((*element.m_value.array)[1]));
#if JSON_DIAGNOSTICS
(
*
element
.
m_value
.
array
)[
1
].
m_parent
=
this
;
res.first->second.m_parent = this;
#else
static_cast<void>(res); // unused variable - fix warning
#endif
m_value
.
object
->
emplace
(
std
::
move
(
*
((
*
element
.
m_value
.
array
)[
0
].
m_value
.
string
)),
std
::
move
((
*
element
.
m_value
.
array
)[
1
]));
});
}
}
else
{
...
...
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