From 7a587ac2e250d4dd03b476b7cd5860d69cd0ab4e Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Wed, 9 Aug 2023 10:08:40 +0200 Subject: [PATCH] Fix some `getVariant()` that were accidentally renamed to `getSlot()` --- src/ArduinoJson/Document/JsonDocument.hpp | 20 ++++++++++---------- src/ArduinoJson/Variant/JsonVariant.hpp | 2 +- src/ArduinoJson/Variant/VariantRefBase.hpp | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/ArduinoJson/Document/JsonDocument.hpp b/src/ArduinoJson/Document/JsonDocument.hpp index 8c6048b8..26aa089e 100644 --- a/src/ArduinoJson/Document/JsonDocument.hpp +++ b/src/ArduinoJson/Document/JsonDocument.hpp @@ -80,14 +80,14 @@ class JsonDocument : public detail::VariantOperators { // https://arduinojson.org/v6/api/jsondocument/as/ template T as() { - return getSlot().template as(); + return getVariant().template as(); } // Casts the root to the specified type. // https://arduinojson.org/v6/api/jsondocument/as/ template T as() const { - return getSlot().template as(); + return getVariant().template as(); } // Empties the document and resets the memory pool @@ -101,20 +101,20 @@ class JsonDocument : public detail::VariantOperators { // https://arduinojson.org/v6/api/jsondocument/is/ template bool is() { - return getSlot().template is(); + return getVariant().template is(); } // Returns true if the root is of the specified type. // https://arduinojson.org/v6/api/jsondocument/is/ template bool is() const { - return getSlot().template is(); + return getVariant().template is(); } // Returns true if the root is null. // https://arduinojson.org/v6/api/jsondocument/isnull/ bool isNull() const { - return getSlot().isNull(); + return getVariant().isNull(); } // Returns trues if the memory pool was too small. @@ -155,7 +155,7 @@ class JsonDocument : public detail::VariantOperators { template typename detail::VariantTo::type to() { clear(); - return getSlot().template to(); + return getVariant().template to(); } // Creates an array and appends it to the root array. @@ -314,11 +314,11 @@ class JsonDocument : public detail::VariantOperators { } FORCE_INLINE operator JsonVariant() { - return getSlot(); + return getVariant(); } FORCE_INLINE operator JsonVariantConst() const { - return getSlot(); + return getVariant(); } friend void swap(JsonDocument& a, JsonDocument& b) { @@ -327,11 +327,11 @@ class JsonDocument : public detail::VariantOperators { } private: - JsonVariant getSlot() { + JsonVariant getVariant() { return JsonVariant(&data_, &resources_); } - JsonVariantConst getSlot() const { + JsonVariantConst getVariant() const { return JsonVariantConst(&data_, &resources_); } diff --git a/src/ArduinoJson/Variant/JsonVariant.hpp b/src/ArduinoJson/Variant/JsonVariant.hpp index fe2b765e..637148ec 100644 --- a/src/ArduinoJson/Variant/JsonVariant.hpp +++ b/src/ArduinoJson/Variant/JsonVariant.hpp @@ -94,7 +94,7 @@ inline JsonVariant VariantRefBase::add() const { } template -inline JsonVariant VariantRefBase::getSlot() const { +inline JsonVariant VariantRefBase::getVariant() const { return JsonVariant(getData(), getResourceManager()); } diff --git a/src/ArduinoJson/Variant/VariantRefBase.hpp b/src/ArduinoJson/Variant/VariantRefBase.hpp index 31224e25..09cb5da8 100644 --- a/src/ArduinoJson/Variant/VariantRefBase.hpp +++ b/src/ArduinoJson/Variant/VariantRefBase.hpp @@ -58,7 +58,7 @@ class VariantRefBase : public VariantTag { template FORCE_INLINE typename enable_if::value, T>::type as() const { - return Converter::fromJson(getSlot()); + return Converter::fromJson(getVariant()); } template @@ -92,7 +92,7 @@ class VariantRefBase : public VariantTag { FORCE_INLINE typename enable_if::value, bool>::type is() const { - return Converter::checkJson(getSlot()); + return Converter::checkJson(getVariant()); } // Returns true if the value is of the specified type. @@ -262,7 +262,7 @@ class VariantRefBase : public VariantTag { } private: - FORCE_INLINE ArduinoJson::JsonVariant getSlot() const; + FORCE_INLINE ArduinoJson::JsonVariant getVariant() const; FORCE_INLINE ArduinoJson::JsonVariantConst getVariantConst() const { return ArduinoJson::JsonVariantConst(getData(), getResourceManager());