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-11-03 14:16:54 +01:00
parent 561fe8959c
commit cc218b7e80
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/nlohmann/json.hpp
View File

@ -3158,14 +3158,14 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
/// @brief updates a JSON object from another object, overwriting existing keys /// @brief updates a JSON object from another object, overwriting existing keys
/// @sa https://json.nlohmann.me/api/basic_json/update/ /// @sa https://json.nlohmann.me/api/basic_json/update/
void update(const_reference j) void update(const_reference j, bool merge_objects = false)
{ {
update(j.begin(), j.end(), merge_objects); update(j.begin(), j.end(), merge_objects);
} }
/// @brief updates a JSON object from another object, overwriting existing keys /// @brief updates a JSON object from another object, overwriting existing keys
/// @sa https://json.nlohmann.me/api/basic_json/update/ /// @sa https://json.nlohmann.me/api/basic_json/update/
void update(const_iterator first, const_iterator last) void update(const_iterator first, const_iterator last, bool merge_objects = false)
{ {
// implicitly convert null value to an empty object // implicitly convert null value to an empty object
if (is_null()) if (is_null())

4
single_include/nlohmann/json.hpp
View File

@ -20659,14 +20659,14 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
/// @brief updates a JSON object from another object, overwriting existing keys /// @brief updates a JSON object from another object, overwriting existing keys
/// @sa https://json.nlohmann.me/api/basic_json/update/ /// @sa https://json.nlohmann.me/api/basic_json/update/
void update(const_reference j) void update(const_reference j, bool merge_objects = false)
{ {
update(j.begin(), j.end(), merge_objects); update(j.begin(), j.end(), merge_objects);
} }
/// @brief updates a JSON object from another object, overwriting existing keys /// @brief updates a JSON object from another object, overwriting existing keys
/// @sa https://json.nlohmann.me/api/basic_json/update/ /// @sa https://json.nlohmann.me/api/basic_json/update/
void update(const_iterator first, const_iterator last) void update(const_iterator first, const_iterator last, bool merge_objects = false)
{ {
// implicitly convert null value to an empty object // implicitly convert null value to an empty object
if (is_null()) if (is_null())