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

Renamed JsonKey to JsonString

Browse Source
This commit is contained in:
Benoit Blanchon
2018-12-07 12:08:30 +01:00
parent e20c47c57b
commit d8a1eec530
26 changed files with 135 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ArduinoJson/Collection/CollectionImpl.hpp
View File

@@ -53,9 +53,9 @@ inline bool CollectionData::copyFrom(const CollectionData& src,
VariantData* var;
if (s->key() != 0) {
if (s->ownsKey())
var = add(ZeroTerminatedRamString(s->key()), pool);
var = add(RamStringWrapper(s->key()), pool);
else
var = add(ZeroTerminatedRamStringConst(s->key()), pool);
var = add(ConstRamStringWrapper(s->key()), pool);
} else {
var = add(pool);
}
@@ -69,7 +69,7 @@ inline bool CollectionData::equalsObject(const CollectionData& other) const {
size_t count = 0;
for (VariantSlot* slot = _head; slot; slot = slot->next()) {
VariantData* v1 = slot->data();
VariantData* v2 = other.get(makeString(slot->key()));
VariantData* v2 = other.get(wrapString(slot->key()));
if (!variantEquals(v1, v2)) return false;
count++;
}