mirror of
https://github.com/obsproject/obs-studio.git
synced 2024-09-19 20:32:15 +02:00
deps/json11: Update to most recent version
This commit is contained in:
parent
3c6b356208
commit
0ab2b038e8
8
deps/json11/json11.cpp
vendored
8
deps/json11/json11.cpp
vendored
@ -441,9 +441,9 @@ struct JsonParser final {
|
||||
*/
|
||||
char get_next_token() {
|
||||
consume_garbage();
|
||||
if (failed) return (char)0;
|
||||
if (failed) return static_cast<char>(0);
|
||||
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++];
|
||||
}
|
||||
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user