Веб-сайт самохостера Lotigara

summaryrefslogtreecommitdiff
path: root/source/core
diff options
context:
space:
mode:
Diffstat (limited to 'source/core')
-rw-r--r--source/core/StarJsonPatch.cpp2
-rw-r--r--source/core/StarJsonPatch.hpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/core/StarJsonPatch.cpp b/source/core/StarJsonPatch.cpp
index d8116eb..14505e5 100644
--- a/source/core/StarJsonPatch.cpp
+++ b/source/core/StarJsonPatch.cpp
@@ -44,7 +44,7 @@ namespace JsonPatching {
{"merge", std::bind(applyMergeOperation, _1, _2)},
};
- Json applyOperation(Json const& base, Json const& op) {
+ Json applyOperation(Json const& base, Json const& op, Maybe<Json> const& external) {
try {
auto operation = op.getString("op");
return JsonPatching::functionMap.get(operation)(base, op);
diff --git a/source/core/StarJsonPatch.hpp b/source/core/StarJsonPatch.hpp
index 44bf482..9832543 100644
--- a/source/core/StarJsonPatch.hpp
+++ b/source/core/StarJsonPatch.hpp
@@ -13,7 +13,7 @@ Json jsonPatch(Json const& base, JsonArray const& patch);
namespace JsonPatching {
// Applies the given single operation
- Json applyOperation(Json const& base, Json const& op);
+ Json applyOperation(Json const& base, Json const& op, Maybe<Json> const& external = {});
// Tests for "value" at "path"
// Returns base or throws JsonPatchException