diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-09-22 11:09:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-22 11:09:25 +0200 |
| commit | e7f1109f06444d5facbfe9839e33a6183e2e4780 (patch) | |
| tree | 34c08d48261c9d9aa84ec5a80f6958b0b69b7861 /src/libexpr/json-to-value.cc | |
| parent | 7dd8baafe1af81703d551e29ae329b0077fb8e39 (diff) | |
| parent | d860295e116f9aa0f37e2637b5ec4b9c86fdf4d3 (diff) | |
Merge pull request #4040 from OmnipotentEntity/master
Fix compatibility with nlohmann-json 3.9.1
Diffstat (limited to 'src/libexpr/json-to-value.cc')
| -rw-r--r-- | src/libexpr/json-to-value.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/libexpr/json-to-value.cc b/src/libexpr/json-to-value.cc index 76e1a26bf..9ca5ac86d 100644 --- 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) { |