From bea760cc7e213061525279ccb0655b1f2bae03a4 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Wed, 10 Feb 2021 08:30:09 +0100 Subject: [PATCH] :green_heart: fix build --- include/nlohmann/json.hpp | 5 +++-- single_include/nlohmann/json.hpp | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index eb6f240c9..2fc49dde3 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -64,6 +64,7 @@ SOFTWARE. #include #include #include +#include #include #include #include @@ -8655,7 +8656,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec for (auto it = source.cbegin(); it != source.cend(); ++it) { // escape the key name to be used in a JSON patch - const auto path_key = path + "/" + json_pointer::escape(it.key()); + const auto path_key = path + "/" + detail::escape(it.key()); if (target.find(it.key()) != target.end()) { @@ -8679,7 +8680,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec if (source.find(it.key()) == source.end()) { // found a key that is not in this -> add it - const auto path_key = path + "/" + json_pointer::escape(it.key()); + const auto path_key = path + "/" + detail::escape(it.key()); result.push_back( { {"op", "add"}, {"path", path_key}, diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 3703c1b81..032d1ebd1 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -12884,6 +12884,8 @@ class json_ref // #include +// #include + // #include // #include @@ -25466,7 +25468,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec for (auto it = source.cbegin(); it != source.cend(); ++it) { // escape the key name to be used in a JSON patch - const auto path_key = path + "/" + json_pointer::escape(it.key()); + const auto path_key = path + "/" + detail::escape(it.key()); if (target.find(it.key()) != target.end()) { @@ -25490,7 +25492,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec if (source.find(it.key()) == source.end()) { // found a key that is not in this -> add it - const auto path_key = path + "/" + json_pointer::escape(it.key()); + const auto path_key = path + "/" + detail::escape(it.key()); result.push_back( { {"op", "add"}, {"path", path_key},