Remove final from JsonArray, JsonObject, and JsonVariant

`final` breaks ThingsBoard ಠ_ಠ
https://github.com/thingsboard/thingsboard-client-sdk/blob/v0.12.2/src/RPC_Response.h#L10

See #2056.
This reverts commit 483a2c9101.
This commit is contained in:
Benoit Blanchon
2024-02-18 19:48:20 +01:00
parent 483a2c9101
commit 04ac53d114
10 changed files with 14 additions and 20 deletions

View File

@ -1,11 +1,6 @@
ArduinoJson: change log ArduinoJson: change log
======================= =======================
HEAD
----
* Mark `JsonArray`, `JsonObject`, and `JsonVariant` as `final` (issue #2056)
v7.0.3 (2024-02-05) v7.0.3 (2024-02-05)
------ ------

View File

@ -13,7 +13,7 @@ class JsonObject;
// A reference to an array in a JsonDocument // A reference to an array in a JsonDocument
// https://arduinojson.org/v7/api/jsonarray/ // https://arduinojson.org/v7/api/jsonarray/
class JsonArray final : public detail::VariantOperators<JsonArray> { class JsonArray : public detail::VariantOperators<JsonArray> {
friend class detail::VariantAttorney; friend class detail::VariantAttorney;
public: public:

View File

@ -14,7 +14,7 @@ class JsonObject;
// A read-only reference to an array in a JsonDocument // A read-only reference to an array in a JsonDocument
// https://arduinojson.org/v7/api/jsonarrayconst/ // https://arduinojson.org/v7/api/jsonarrayconst/
class JsonArrayConst final : public detail::VariantOperators<JsonArrayConst> { class JsonArrayConst : public detail::VariantOperators<JsonArrayConst> {
friend class JsonArray; friend class JsonArray;
friend class detail::VariantAttorney; friend class detail::VariantAttorney;

View File

@ -25,7 +25,7 @@ class Ptr {
T value_; T value_;
}; };
class JsonArrayIterator final { class JsonArrayIterator {
friend class JsonArray; friend class JsonArray;
public: public:
@ -59,7 +59,7 @@ class JsonArrayIterator final {
detail::ResourceManager* resources_; detail::ResourceManager* resources_;
}; };
class JsonArrayConstIterator final { class JsonArrayConstIterator {
friend class JsonArray; friend class JsonArray;
public: public:

View File

@ -13,7 +13,7 @@ class JsonArray;
// A reference to an object in a JsonDocument. // A reference to an object in a JsonDocument.
// https://arduinojson.org/v7/api/jsonobject/ // https://arduinojson.org/v7/api/jsonobject/
class JsonObject final : public detail::VariantOperators<JsonObject> { class JsonObject : public detail::VariantOperators<JsonObject> {
friend class detail::VariantAttorney; friend class detail::VariantAttorney;
public: public:

View File

@ -11,7 +11,7 @@ ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
// A read-only reference to an object in a JsonDocument. // A read-only reference to an object in a JsonDocument.
// https://arduinojson.org/v7/api/jsonobjectconst/ // https://arduinojson.org/v7/api/jsonobjectconst/
class JsonObjectConst final : public detail::VariantOperators<JsonObjectConst> { class JsonObjectConst : public detail::VariantOperators<JsonObjectConst> {
friend class JsonObject; friend class JsonObject;
friend class detail::VariantAttorney; friend class detail::VariantAttorney;

View File

@ -8,7 +8,7 @@
ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
class JsonObjectIterator final { class JsonObjectIterator {
friend class JsonObject; friend class JsonObject;
public: public:
@ -43,7 +43,7 @@ class JsonObjectIterator final {
detail::ResourceManager* resources_; detail::ResourceManager* resources_;
}; };
class JsonObjectConstIterator final { class JsonObjectConstIterator {
friend class JsonObject; friend class JsonObject;
public: public:

View File

@ -12,7 +12,7 @@ ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
// A key-value pair. // A key-value pair.
// https://arduinojson.org/v7/api/jsonobject/begin_end/ // https://arduinojson.org/v7/api/jsonobject/begin_end/
class JsonPair final { class JsonPair {
public: public:
// INTERNAL USE ONLY // INTERNAL USE ONLY
JsonPair(detail::ObjectData::iterator iterator, JsonPair(detail::ObjectData::iterator iterator,
@ -41,7 +41,7 @@ class JsonPair final {
// A read-only key-value pair. // A read-only key-value pair.
// https://arduinojson.org/v7/api/jsonobjectconst/begin_end/ // https://arduinojson.org/v7/api/jsonobjectconst/begin_end/
class JsonPairConst final { class JsonPairConst {
public: public:
JsonPairConst(detail::ObjectData::iterator iterator, JsonPairConst(detail::ObjectData::iterator iterator,
const detail::ResourceManager* resources) const detail::ResourceManager* resources)

View File

@ -10,8 +10,8 @@ ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
// A reference to a value in a JsonDocument. // A reference to a value in a JsonDocument.
// https://arduinojson.org/v7/api/jsonvariant/ // https://arduinojson.org/v7/api/jsonvariant/
class JsonVariant final : public detail::VariantRefBase<JsonVariant>, class JsonVariant : public detail::VariantRefBase<JsonVariant>,
public detail::VariantOperators<JsonVariant> { public detail::VariantOperators<JsonVariant> {
friend class detail::VariantAttorney; friend class detail::VariantAttorney;
public: public:

View File

@ -23,9 +23,8 @@ class JsonObject;
// A read-only reference to a value in a JsonDocument // A read-only reference to a value in a JsonDocument
// https://arduinojson.org/v7/api/jsonarrayconst/ // https://arduinojson.org/v7/api/jsonarrayconst/
class JsonVariantConst final class JsonVariantConst : public detail::VariantTag,
: public detail::VariantTag, public detail::VariantOperators<JsonVariantConst> {
public detail::VariantOperators<JsonVariantConst> {
friend class detail::VariantAttorney; friend class detail::VariantAttorney;
public: public: