j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Amalgamate Headers

Browse source
This commit is contained in:
Axel Huebl 2018-11-08 10:35:45 +01:00
parent 97b81da840
commit 798754dfb6
No known key found for this signature in database
GPG key ID: 472D2C364E21D94B
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
single_include/nlohmann/json.hpp
View file

@ -20113,7 +20113,7 @@ class basic_json
Thereby, `Target` is the current object; that is, the patch is applied to Thereby, `Target` is the current object; that is, the patch is applied to
the current value. the current value.
@param[in] patch the patch to apply @param[in] apply_patch the patch to apply
@complexity Linear in the lengths of @a patch. @complexity Linear in the lengths of @a patch.
@ -20125,15 +20125,15 @@ class basic_json
@since version 3.0.0 @since version 3.0.0
*/ */
void merge_patch(const basic_json& patch) void merge_patch(const basic_json& apply_patch)
{ {
if (patch.is_object()) if (apply_patch.is_object())
{ {
if (not is_object()) if (not is_object())
{ {
*this = object(); *this = object();
} }
for (auto it = patch.begin(); it != patch.end(); ++it) for (auto it = apply_patch.begin(); it != apply_patch.end(); ++it)
{ {
if (it.value().is_null()) if (it.value().is_null())
{ {
@ -20147,7 +20147,7 @@ class basic_json
} }
else else
{ {
*this = patch; *this = apply_patch;
} }
} }