提交 0ab2b038 编写于 作者: J jp9000

deps/json11: Update to most recent version

上级 3c6b3562
...@@ -441,9 +441,9 @@ struct JsonParser final { ...@@ -441,9 +441,9 @@ struct JsonParser final {
*/ */
char get_next_token() { char get_next_token() {
consume_garbage(); consume_garbage();
if (failed) return (char)0; if (failed) return static_cast<char>(0);
if (i == str.size()) if (i == str.size())
return fail("unexpected end of input", (char)0); return fail("unexpected end of input", static_cast<char>(0));
return str[i++]; return str[i++];
} }
...@@ -775,8 +775,10 @@ bool Json::has_shape(const shape & types, string & err) const { ...@@ -775,8 +775,10 @@ bool Json::has_shape(const shape & types, string & err) const {
return false; return false;
} }
const auto& obj_items = object_items();
for (auto & item : types) { 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(); err = "bad type for " + item.first + " in " + dump();
return false; return false;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册