github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-11-01 00:38:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added implicit conversion from JsonArray and JsonObject to JsonVariant

Browse Source
This commit is contained in:
Benoit Blanchon
2018-10-01 12:55:40 +02:00
parent 2d54019f83
commit 29e71cbb16
12 changed files with 220 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp
View File

@@ -277,13 +277,12 @@ class MsgPackDeserializer {
if (_nestingLimit == 0) return DeserializationError::TooDeep;
--_nestingLimit;
for (; n; --n) {
JsonVariantData keyData;
JsonVariant key(_memoryPool, &keyData);
JsonVariantLocal key(_memoryPool);
DeserializationError err = parse(key);
if (err) return err;
if (!keyData.isString()) return DeserializationError::NotSupported;
if (!key.is<char *>()) return DeserializationError::NotSupported;
JsonVariant value = object.set(keyData.asString());
JsonVariant value = object.set(key.as<char *>());
if (value.isInvalid()) return DeserializationError::NoMemory;
err = parse(value);