From 0ab2b038e84050ef3f1d5a3640bffc2e3576a981 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Wed, 9 Dec 2020 21:12:58 -0800 Subject: [PATCH] deps/json11: Update to most recent version --- deps/json11/json11.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/deps/json11/json11.cpp b/deps/json11/json11.cpp index 9647846b..88024e92 100644 --- a/deps/json11/json11.cpp +++ b/deps/json11/json11.cpp @@ -441,9 +441,9 @@ struct JsonParser final { */ char get_next_token() { consume_garbage(); - if (failed) return (char)0; + if (failed) return static_cast(0); if (i == str.size()) - return fail("unexpected end of input", (char)0); + return fail("unexpected end of input", static_cast(0)); return str[i++]; } @@ -775,8 +775,10 @@ bool Json::has_shape(const shape & types, string & err) const { return false; } + const auto& obj_items = object_items(); for (auto & item : types) { - if ((*this)[item.first].type() != item.second) { + const auto it = obj_items.find(item.first); + if (it == obj_items.cend() || it->second.type() != item.second) { err = "bad type for " + item.first + " in " + dump(); return false; } -- GitLab