mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(tvix): Bump nlohmann-json version to 3.9.1

Browse source 
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>
This commit is contained in:
Michael Reilly 2020-09-19 10:46:02 -04:00 committed by glittershark
parent a30e616efb
commit db52903581
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
third_party/nix/src/libexpr/json-to-value.cc vendored
View file

@ -106,6 +106,14 @@ class JSONSax : nlohmann::json_sax<json> {
return handle_value<void(Value&, const char*)>(mkString, val.c_str()); 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 { bool start_object(std::size_t) override {
rs = std::make_unique<JSONObjectState>(std::move(rs)); rs = std::make_unique<JSONObjectState>(std::move(rs));
return true; return true;