From be1e33f5ff028d1050c644262f7d845431e884e9 Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Thu, 26 Jun 2025 15:00:21 +0200 Subject: [PATCH] JsonVariantTests pass --- src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp | 4 ++-- src/ArduinoJson/Variant/JsonVariantConst.hpp | 2 +- src/ArduinoJson/Variant/VariantRefBase.hpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp b/src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp index 0a79461e..cb81e5c5 100644 --- a/src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp +++ b/src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp @@ -24,10 +24,10 @@ class MsgPackDeserializer { foundSomething_(false) {} template - DeserializationError parse(VariantData& variant, TFilter filter, + DeserializationError parse(VariantData* variant, TFilter filter, DeserializationOption::NestingLimit nestingLimit) { DeserializationError::Code err; - err = parseVariant(&variant, filter, nestingLimit); + err = parseVariant(variant, filter, nestingLimit); return foundSomething_ ? err : DeserializationError::EmptyInput; } diff --git a/src/ArduinoJson/Variant/JsonVariantConst.hpp b/src/ArduinoJson/Variant/JsonVariantConst.hpp index 6d6d4910..46683926 100644 --- a/src/ArduinoJson/Variant/JsonVariantConst.hpp +++ b/src/ArduinoJson/Variant/JsonVariantConst.hpp @@ -157,7 +157,7 @@ class JsonVariantConst : public detail::VariantTag, int> = 0> ARDUINOJSON_DEPRECATED("use obj[\"key\"].is() instead") bool containsKey(TChar* key) const { - return impl_getMember(detail::adaptString(key)) != 0; + return impl_.getMember(detail::adaptString(key)) != 0; } // DEPRECATED: use obj[key].is() instead diff --git a/src/ArduinoJson/Variant/VariantRefBase.hpp b/src/ArduinoJson/Variant/VariantRefBase.hpp index eb44c1f5..3ad24fb8 100644 --- a/src/ArduinoJson/Variant/VariantRefBase.hpp +++ b/src/ArduinoJson/Variant/VariantRefBase.hpp @@ -29,7 +29,7 @@ class VariantRefBase : public VariantTag { // Sets the value to null. // https://arduinojson.org/v7/api/jsonvariant/clear/ void clear() const { - getOrCreateVariantImpl().clear(getResourceManager()); + getOrCreateVariantImpl().clear(); } // Returns true if the value is null or the reference is unbound.