Commit f1e61896 authored by Niels's avatar Niels

fixed a shadow error

parent db5c9ec9
......@@ -9659,7 +9659,7 @@ basic_json_parser_63:
@since version 2.0.0
*/
basic_json patch(const basic_json& patch) const
basic_json patch(const basic_json& json_patch) const
{
// make a working copy to apply the patch to
basic_json result = *this;
......@@ -9790,14 +9790,14 @@ basic_json_parser_63:
};
// type check
if (not patch.is_array())
if (not json_patch.is_array())
{
// a JSON patch must be an array of objects
throw std::invalid_argument("JSON patch must be an array of objects");
}
// iterate and apply th eoperations
for (const auto& val : patch)
for (const auto& val : json_patch)
{
// wrapper to get a value for an operation
const auto get_value = [&val](const std::string & op,
......
......@@ -8969,7 +8969,7 @@ class basic_json
@since version 2.0.0
*/
basic_json patch(const basic_json& patch) const
basic_json patch(const basic_json& json_patch) const
{
// make a working copy to apply the patch to
basic_json result = *this;
......@@ -9100,14 +9100,14 @@ class basic_json
};
// type check
if (not patch.is_array())
if (not json_patch.is_array())
{
// a JSON patch must be an array of objects
throw std::invalid_argument("JSON patch must be an array of objects");
}
// iterate and apply th eoperations
for (const auto& val : patch)
for (const auto& val : json_patch)
{
// wrapper to get a value for an operation
const auto get_value = [&val](const std::string & op,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment