Merge pull request #4040 from OmnipotentEntity/master

Fix compatibility with nlohmann-json 3.9.1
2020-09-22 11:09:25 +02:00 · 2020-09-22 11:09:25 +02:00 · e7f1109f06
parent 7dd8baafe1 d860295e11
commit e7f1109f06
1 changed files with 8 additions and 0 deletions
--- a/src/libexpr/json-to-value.cc
+++ b/src/libexpr/json-to-value.cc
@ -115,6 +115,14 @@ public:
    {
        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 len)
    {