haraldwolff
/
json
mirror of https://github.com/nlohmann/json.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

👌 fix constructor

pull/2562/head
Niels Lohmann 2021-01-08 18:00:23 +01:00
parent d4a91b7445
commit 43cd5c8a4d
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/nlohmann/json.hpp
View File

@ -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
{

15
single_include/nlohmann/json.hpp
View File

@ -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
{