mirror/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-12-04 14:39:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed a shadow error

Browse Source
This commit is contained in:
Niels 2016-05-11 18:43:12 +02:00
parent db5c9ec9ba
commit f1e61896fb
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/json.hpp
View File

@ -9659,7 +9659,7 @@ basic_json_parser_63:
@since version 2.0.0 @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 // make a working copy to apply the patch to
basic_json result = *this; basic_json result = *this;
@ -9790,14 +9790,14 @@ basic_json_parser_63:
}; };
// type check // type check
if (not patch.is_array()) if (not json_patch.is_array())
{ {
// a JSON patch must be an array of objects // a JSON patch must be an array of objects
throw std::invalid_argument("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 // iterate and apply th eoperations
for (const auto& val : patch) for (const auto& val : json_patch)
{ {
// wrapper to get a value for an operation // wrapper to get a value for an operation
const auto get_value = [&val](const std::string & op, const auto get_value = [&val](const std::string & op,

6
src/json.hpp.re2c
View File

@ -8969,7 +8969,7 @@ class basic_json
@since version 2.0.0 @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 // make a working copy to apply the patch to
basic_json result = *this; basic_json result = *this;
@ -9100,14 +9100,14 @@ class basic_json
}; };
// type check // type check
if (not patch.is_array()) if (not json_patch.is_array())
{ {
// a JSON patch must be an array of objects // a JSON patch must be an array of objects
throw std::invalid_argument("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 // iterate and apply th eoperations
for (const auto& val : patch) for (const auto& val : json_patch)
{ {
// wrapper to get a value for an operation // wrapper to get a value for an operation
const auto get_value = [&val](const std::string & op, const auto get_value = [&val](const std::string & op,