about summary refs log tree commit diff
path: root/third_party
diff options
context:
space:
mode:
authorMichael Reilly <OmnipotentEntity@gmail.com>2020-09-19T14·46-0400
committerglittershark <grfn@gws.fyi>2020-11-27T19·59+0000
commitdb5290358104764155c53235394a07608d7fcf75 (patch)
tree6a39de46cabb1388f247e58e69c9f1bec56deaa1 /third_party
parenta30e616efbd51eba0e651df7e45d9114775195e1 (diff)
feat(tvix): Bump nlohmann-json version to 3.9.1 r/1939
Backporting from upstream at d860295e116f9aa0f37e2637b5ec4b9c86fdf4d3

Change-Id: Iefde47ff6f24d21e9b37c9b52a615bd8c9f2fdb2
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2141
Tested-by: BuildkiteCI
Reviewed-by: andi <andi@notmuch.email>
Diffstat (limited to 'third_party')
-rw-r--r--third_party/nix/src/libexpr/json-to-value.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/third_party/nix/src/libexpr/json-to-value.cc b/third_party/nix/src/libexpr/json-to-value.cc
index 66912aa084e6..043f8c64cd30 100644
--- a/third_party/nix/src/libexpr/json-to-value.cc
+++ b/third_party/nix/src/libexpr/json-to-value.cc
@@ -106,6 +106,14 @@ class JSONSax : nlohmann::json_sax<json> {
     return handle_value<void(Value&, const char*)>(mkString, val.c_str());
   }
 
+#if NLOHMANN_JSON_VERSION_MAJOR >= 3 && NLOHMANN_JSON_VERSION_MINOR >= 8
+  bool binary(binary_t&) {
+    // This function ought to be unreachable
+    assert(false);
+    return true;
+  }
+#endif
+
   bool start_object(std::size_t) override {
     rs = std::make_unique<JSONObjectState>(std::move(rs));
     return true;