aboutsummaryrefslogtreecommitdiff
path: root/devel/jsonnet/files/patch-core_vm.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'devel/jsonnet/files/patch-core_vm.cpp')
-rw-r--r--devel/jsonnet/files/patch-core_vm.cpp25
1 files changed, 8 insertions, 17 deletions
diff --git a/devel/jsonnet/files/patch-core_vm.cpp b/devel/jsonnet/files/patch-core_vm.cpp
index 484824c11a9b..38596e332b44 100644
--- a/devel/jsonnet/files/patch-core_vm.cpp
+++ b/devel/jsonnet/files/patch-core_vm.cpp
@@ -1,22 +1,13 @@
---- core/vm.cpp.orig 2023-04-17 19:02:16 UTC
+--- core/vm.cpp.orig 2025-05-07 12:28:56 UTC
+++ core/vm.cpp
-@@ -23,7 +23,7 @@ limitations under the License.
-
- #include "desugarer.h"
- #include "json.h"
--#include "json.hpp"
-+#include "nlohmann/json.hpp"
- #include "md5.h"
- #include "parser.h"
- #include "ryml_std.hpp" // include this before any other ryml header
-@@ -1710,6 +1710,10 @@ class Interpreter {
- } break;
+@@ -1726,6 +1726,10 @@ class Interpreter {
+ abort();
+ }
- case json::value_t::discarded: {
++ case json::value_t::binary: {
+ abort();
+ }
+
-+ case json::value_t::binary: {
- abort();
- }
- }
+ default: {
+ // Newer nlohmann json.hpp (from v3.8.0 https://github.com/nlohmann/json/pull/1662)
+ // add a `value_t::binary` type, used when dealing with some JSON-adjacent binary