From f1e61896fb33391140fd7d5862fa08e2db852162 Mon Sep 17 00:00:00 2001 From: Niels Date: Wed, 11 May 2016 18:43:12 +0200 Subject: [PATCH] fixed a shadow error --- src/json.hpp | 6 +++--- src/json.hpp.re2c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/json.hpp b/src/json.hpp index f62f3e78..4c47abc4 100644 --- a/src/json.hpp +++ b/src/json.hpp @@ -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, diff --git a/src/json.hpp.re2c b/src/json.hpp.re2c index f3d3508c..9703b413 100644 --- a/src/json.hpp.re2c +++ b/src/json.hpp.re2c @@ -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,