jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

deps/json11: Update to most recent version

master
jp9000 2020-12-09 21:12:58 -08:00
parent 3c6b356208
commit 0ab2b038e8
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
deps/json11/json11.cpp vendored
View File

@ -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 {
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;
} }