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

Add CopiedString and LinkedString

Browse Source
This commit is contained in:
Benoit Blanchon
2021-11-22 09:40:20 +01:00
parent b06bbd9d2a
commit 62f9b94ab1
13 changed files with 83 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ArduinoJson/Json/JsonDeserializer.hpp
View File

@@ -231,12 +231,12 @@ class JsonDeserializer {
return false;
}
const char *key = _stringStorage.c_str();
typename TStringStorage::string_type key = _stringStorage.str();
TFilter memberFilter = filter[key];
TFilter memberFilter = filter[key.c_str()];
if (memberFilter.allow()) {
VariantData *variant = object.getMember(adaptString(key));
VariantData *variant = object.getMember(adaptString(key.c_str()));
if (!variant) {
// Save key in memory pool.
// This MUST be done before adding the slot.
@@ -249,7 +249,7 @@ class JsonDeserializer {
return false;
}
slot->setKey(key, typename TStringStorage::storage_policy());
slot->setKey(key);
variant = slot->data();
}
@@ -345,8 +345,7 @@ class JsonDeserializer {
_stringStorage.startString();
if (!parseQuotedString())
return false;
const char *value = _stringStorage.save();
variant.setStringPointer(value, typename TStringStorage::storage_policy());
variant.setString(_stringStorage.save());
return true;
}