forked from bblanchon/ArduinoJson
Inline variantAsArray()
and variantAsObject()
This commit is contained in:
@ -201,7 +201,8 @@ struct Converter<ArrayConstRef> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static ArrayConstRef fromJson(VariantConstRef src) {
|
static ArrayConstRef fromJson(VariantConstRef src) {
|
||||||
return ArrayConstRef(variantAsArray(getData(src)));
|
const VariantData* data = getData(src);
|
||||||
|
return data ? data->resolve()->asArray() : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool checkJson(VariantConstRef src) {
|
static bool checkJson(VariantConstRef src) {
|
||||||
|
@ -268,7 +268,8 @@ struct Converter<ObjectConstRef> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static ObjectConstRef fromJson(VariantConstRef src) {
|
static ObjectConstRef fromJson(VariantConstRef src) {
|
||||||
return ObjectConstRef(variantAsObject(getData(src)));
|
const VariantData* data = getData(src);
|
||||||
|
return data != 0 ? data->resolve()->asObject() : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool checkJson(VariantConstRef src) {
|
static bool checkJson(VariantConstRef src) {
|
||||||
|
@ -20,18 +20,6 @@ inline typename TVisitor::result_type variantAccept(const VariantData *var,
|
|||||||
return visitor.visitNull();
|
return visitor.visitNull();
|
||||||
}
|
}
|
||||||
|
|
||||||
inline const CollectionData *variantAsArray(const VariantData *var) {
|
|
||||||
return var != 0 ? var->resolve()->asArray() : 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline const CollectionData *variantAsObject(const VariantData *var) {
|
|
||||||
return var != 0 ? var->resolve()->asObject() : 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline CollectionData *variantAsObject(VariantData *var) {
|
|
||||||
return var != 0 ? var->asObject() : 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline bool variantCopyFrom(VariantData *dst, const VariantData *src,
|
inline bool variantCopyFrom(VariantData *dst, const VariantData *src,
|
||||||
MemoryPool *pool) {
|
MemoryPool *pool) {
|
||||||
if (!dst)
|
if (!dst)
|
||||||
|
Reference in New Issue
Block a user