From 99a646e854b83fc2d6ed03aaa61a01ad52c2ff9a Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Wed, 30 Mar 2022 21:35:36 +0200 Subject: [PATCH] getElement() (6790,5602) --- src/ArduinoJson/Variant/VariantData.hpp | 4 ++-- src/ArduinoJson/Variant/VariantImpl.hpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/ArduinoJson/Variant/VariantData.hpp b/src/ArduinoJson/Variant/VariantData.hpp index 2d424db6..767e1a49 100644 --- a/src/ArduinoJson/Variant/VariantData.hpp +++ b/src/ArduinoJson/Variant/VariantData.hpp @@ -277,8 +277,8 @@ class VariantData { return _content.asCollection.addElement(pool); } - VariantData *getElement(size_t index) const { // P+4 G+0 - const CollectionData *col = resolve()->asArray(); + VariantData *getElement(size_t index) const { + const CollectionData *col = asArray(); return col ? col->getElement(index) : 0; } diff --git a/src/ArduinoJson/Variant/VariantImpl.hpp b/src/ArduinoJson/Variant/VariantImpl.hpp index c673ef7b..13a02f67 100644 --- a/src/ArduinoJson/Variant/VariantImpl.hpp +++ b/src/ArduinoJson/Variant/VariantImpl.hpp @@ -133,7 +133,8 @@ inline VariantRef VariantRef::addElement() const { } inline VariantRef VariantRef::getElement(size_t index) const { - return VariantRef(_pool, _data != 0 ? _data->getElement(index) : 0); + return VariantRef(_pool, + _data != 0 ? _data->resolve()->getElement(index) : 0); } inline VariantRef VariantRef::getOrAddElement(size_t index) const {