From cc218b7e80761d7b297feda921b5a685f81022ac Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Wed, 3 Nov 2021 14:16:54 +0100 Subject: [PATCH] :green_heart: fix build --- include/nlohmann/json.hpp | 4 ++-- single_include/nlohmann/json.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index 536d71f74..19fc9da39 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -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 /// @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); } /// @brief updates a JSON object from another object, overwriting existing keys /// @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 if (is_null()) diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index f0792b0df..3b7d86671 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -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 /// @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); } /// @brief updates a JSON object from another object, overwriting existing keys /// @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 if (is_null())