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

Remove getElement(), getOrAddElement(), getMember(), and getOrAddMember()

Browse Source
This commit is contained in:
Benoit Blanchon
2022-07-07 14:16:06 +02:00
parent 750cd0be92
commit c5838a876b
12 changed files with 142 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/ArduinoJson/Variant/VariantFunctions.hpp
View File

@@ -59,6 +59,10 @@ inline CollectionData *variantToObject(VariantData *var) {
return &var->toObject();
}
inline VariantData *variantGetElement(const VariantData *var, size_t index) {
return var != 0 ? var->getElement(index) : 0;
}
inline NO_INLINE VariantData *variantAddElement(VariantData *var,
MemoryPool *pool) {
return var != 0 ? var->addElement(pool) : 0;
@@ -70,9 +74,18 @@ inline NO_INLINE VariantData *variantGetOrAddElement(VariantData *var,
return var != 0 ? var->getOrAddElement(index, pool) : 0;
}
template <typename AdaptedString>
VariantData *variantGetMember(const VariantData *var, AdaptedString key) {
if (!var)
return 0;
return var->getMember(key);
}
// TODO: this function is inconsitent with the others:
// it should take an adapted string
template <typename TChar>
NO_INLINE VariantData *variantGetOrAddMember(VariantData *var, TChar *key,
MemoryPool *pool) {
VariantData *variantGetOrAddMember(VariantData *var, TChar *key,
MemoryPool *pool) {
if (!var)
return 0;
return var->getOrAddMember(adaptString(key), pool,
@@ -80,9 +93,8 @@ NO_INLINE VariantData *variantGetOrAddMember(VariantData *var, TChar *key,
}
template <typename TString>
NO_INLINE VariantData *variantGetOrAddMember(VariantData *var,
const TString &key,
MemoryPool *pool) {
VariantData *variantGetOrAddMember(VariantData *var, const TString &key,
MemoryPool *pool) {
if (!var)
return 0;
return var->getOrAddMember(adaptString(key), pool,