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

Merge pull request #1346 from ax3l/fix-mergePatchShadowParam

Browse source 
Fix merge_patch shadow warning
This commit is contained in:
Niels Lohmann 2018-11-08 18:38:40 +01:00 committed by GitHub
commit 30e1cbb0df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/nlohmann/json.hpp
View file

@ -7851,7 +7851,7 @@ class basic_json
Thereby, `Target` is the current object; that is, the patch is applied to
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.
@ -7863,15 +7863,15 @@ class basic_json
@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())
{
*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())
{
@ -7885,7 +7885,7 @@ class basic_json
}
else
{
*this = patch;
*this = apply_patch;
}
}

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
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.
@ -20125,15 +20125,15 @@ class basic_json
@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())
{
*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())
{
@ -20147,7 +20147,7 @@ class basic_json
}
else
{
*this = patch;
*this = apply_patch;
}
}