External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

💚 fix build

Browse Source
This commit is contained in:
Niels Lohmann 2021-02-10 08:30:09 +01:00
parent 2b0d696f4a
commit bea760cc7e
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/nlohmann/json.hpp
View File

@ -64,6 +64,7 @@ SOFTWARE.
#include <nlohmann/detail/json_pointer.hpp> #include <nlohmann/detail/json_pointer.hpp>
#include <nlohmann/detail/json_ref.hpp> #include <nlohmann/detail/json_ref.hpp>
#include <nlohmann/detail/macro_scope.hpp> #include <nlohmann/detail/macro_scope.hpp>
#include <nlohmann/detail/string_escape.hpp>
#include <nlohmann/detail/meta/cpp_future.hpp> #include <nlohmann/detail/meta/cpp_future.hpp>
#include <nlohmann/detail/meta/type_traits.hpp> #include <nlohmann/detail/meta/type_traits.hpp>
#include <nlohmann/detail/output/binary_writer.hpp> #include <nlohmann/detail/output/binary_writer.hpp>
@ -8655,7 +8656,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
for (auto it = source.cbegin(); it != source.cend(); ++it) for (auto it = source.cbegin(); it != source.cend(); ++it)
{ {
// escape the key name to be used in a JSON patch // 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()) 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()) if (source.find(it.key()) == source.end())
{ {
// found a key that is not in this -> add it // 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( result.push_back(
{ {
{"op", "add"}, {"path", path_key}, {"op", "add"}, {"path", path_key},

6
single_include/nlohmann/json.hpp
View File

@ -12884,6 +12884,8 @@ class json_ref
// #include <nlohmann/detail/macro_scope.hpp> // #include <nlohmann/detail/macro_scope.hpp>
// #include <nlohmann/detail/string_escape.hpp>
// #include <nlohmann/detail/meta/cpp_future.hpp> // #include <nlohmann/detail/meta/cpp_future.hpp>
// #include <nlohmann/detail/meta/type_traits.hpp> // #include <nlohmann/detail/meta/type_traits.hpp>
@ -25466,7 +25468,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
for (auto it = source.cbegin(); it != source.cend(); ++it) for (auto it = source.cbegin(); it != source.cend(); ++it)
{ {
// escape the key name to be used in a JSON patch // 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()) 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()) if (source.find(it.key()) == source.end())
{ {
// found a key that is not in this -> add it // 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( result.push_back(
{ {
{"op", "add"}, {"path", path_key}, {"op", "add"}, {"path", path_key},