diff options
Diffstat (limited to 'source/core/StarJson.hpp')
| -rw-r--r-- | source/core/StarJson.hpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/core/StarJson.hpp b/source/core/StarJson.hpp index 085fd9f..a533e47 100644 --- a/source/core/StarJson.hpp +++ b/source/core/StarJson.hpp @@ -291,6 +291,8 @@ DataStream& operator>>(DataStream& ds, JsonObject& m); // is the combination of both objects, but for each repeated key jsonMerge is // called recursively on both values to determine the result. Json jsonMerge(Json const& base, Json const& merger); +// Same as above, but applies null mergers. +Json jsonMergeNulling(Json const& base, Json const& merger); template <typename... T> Json jsonMerge(Json const& base, Json const& merger, T const&... rest); |