feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Inline variantAccept()

Browse Source
This commit is contained in:
Benoit Blanchon
2022-05-22 17:07:16 +02:00
parent 37faa7ce13
commit ee74c3bb1c
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,15 +11,6 @@
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {
template <typename TVisitor>
inline typename TVisitor::result_type variantAccept(const VariantData *var,
TVisitor &visitor) {
if (var != 0)
return var->resolve()->accept(visitor);
else
return visitor.visitNull();
}
inline const CollectionData *variantAsArray(const VariantData *var) { inline const CollectionData *variantAsArray(const VariantData *var) {
return var != 0 ? var->resolve()->asArray() : 0; return var != 0 ? var->resolve()->asArray() : 0;
} }

4
src/ArduinoJson/Variant/VariantRef.hpp
View File

@ -30,7 +30,9 @@ class VariantRefBase : public VariantTag {
public: public:
template <typename TVisitor> template <typename TVisitor>
typename TVisitor::result_type accept(TVisitor &visitor) const { typename TVisitor::result_type accept(TVisitor &visitor) const {
return variantAccept(_data, visitor); if (!_data)
return visitor.visitNull();
return _data->resolve()->accept(visitor);
} }
FORCE_INLINE bool isNull() const { FORCE_INLINE bool isNull() const {