mirror of
https://github.com/bblanchon/ArduinoJson.git
synced 2025-07-29 18:27:37 +02:00
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 5ed9daae91
.
This commit is contained in:
@ -5,7 +5,6 @@ HEAD
|
||||
----
|
||||
|
||||
* Improve error messages when using `char` or `char*` (issue #2043)
|
||||
* Mark `JsonArray`, `JsonObject`, and `JsonVariant` as `final` (issue #2056)
|
||||
|
||||
v6.21.5 (2024-01-10)
|
||||
-------
|
||||
|
@ -13,7 +13,7 @@ class JsonObject;
|
||||
|
||||
// A reference to an array in a JsonDocument
|
||||
// https://arduinojson.org/v6/api/jsonarray/
|
||||
class JsonArray final : public detail::VariantOperators<JsonArray> {
|
||||
class JsonArray : public detail::VariantOperators<JsonArray> {
|
||||
friend class detail::VariantAttorney;
|
||||
|
||||
public:
|
||||
|
@ -14,7 +14,7 @@ class JsonObject;
|
||||
|
||||
// A read-only reference to an array in a JsonDocument
|
||||
// https://arduinojson.org/v6/api/jsonarrayconst/
|
||||
class JsonArrayConst final : public detail::VariantOperators<JsonArrayConst> {
|
||||
class JsonArrayConst : public detail::VariantOperators<JsonArrayConst> {
|
||||
friend class JsonArray;
|
||||
friend class detail::VariantAttorney;
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
|
||||
|
||||
class VariantPtr final {
|
||||
class VariantPtr {
|
||||
public:
|
||||
VariantPtr(detail::MemoryPool* pool, detail::VariantData* data)
|
||||
: variant_(pool, data) {}
|
||||
@ -26,7 +26,7 @@ class VariantPtr final {
|
||||
JsonVariant variant_;
|
||||
};
|
||||
|
||||
class JsonArrayIterator final {
|
||||
class JsonArrayIterator {
|
||||
friend class JsonArray;
|
||||
|
||||
public:
|
||||
@ -65,7 +65,7 @@ class JsonArrayIterator final {
|
||||
detail::VariantSlot* slot_;
|
||||
};
|
||||
|
||||
class VariantConstPtr final {
|
||||
class VariantConstPtr {
|
||||
public:
|
||||
VariantConstPtr(const detail::VariantData* data) : variant_(data) {}
|
||||
|
||||
@ -81,7 +81,7 @@ class VariantConstPtr final {
|
||||
JsonVariantConst variant_;
|
||||
};
|
||||
|
||||
class JsonArrayConstIterator final {
|
||||
class JsonArrayConstIterator {
|
||||
friend class JsonArray;
|
||||
|
||||
public:
|
||||
|
@ -13,7 +13,7 @@ class JsonArray;
|
||||
|
||||
// A reference to an object in a JsonDocument.
|
||||
// https://arduinojson.org/v6/api/jsonobject/
|
||||
class JsonObject final : public detail::VariantOperators<JsonObject> {
|
||||
class JsonObject : public detail::VariantOperators<JsonObject> {
|
||||
friend class detail::VariantAttorney;
|
||||
|
||||
public:
|
||||
|
@ -11,7 +11,7 @@ ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
|
||||
|
||||
// A read-only reference to an object in a JsonDocument.
|
||||
// https://arduinojson.org/v6/api/jsonobjectconst/
|
||||
class JsonObjectConst final : public detail::VariantOperators<JsonObjectConst> {
|
||||
class JsonObjectConst : public detail::VariantOperators<JsonObjectConst> {
|
||||
friend class JsonObject;
|
||||
friend class detail::VariantAttorney;
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
|
||||
|
||||
class JsonPairPtr final {
|
||||
class JsonPairPtr {
|
||||
public:
|
||||
JsonPairPtr(detail::MemoryPool* pool, detail::VariantSlot* slot)
|
||||
: pair_(pool, slot) {}
|
||||
@ -26,7 +26,7 @@ class JsonPairPtr final {
|
||||
JsonPair pair_;
|
||||
};
|
||||
|
||||
class JsonObjectIterator final {
|
||||
class JsonObjectIterator {
|
||||
friend class JsonObject;
|
||||
|
||||
public:
|
||||
@ -66,7 +66,7 @@ class JsonObjectIterator final {
|
||||
detail::VariantSlot* slot_;
|
||||
};
|
||||
|
||||
class JsonPairConstPtr final {
|
||||
class JsonPairConstPtr {
|
||||
public:
|
||||
JsonPairConstPtr(const detail::VariantSlot* slot) : pair_(slot) {}
|
||||
|
||||
@ -82,7 +82,7 @@ class JsonPairConstPtr final {
|
||||
JsonPairConst pair_;
|
||||
};
|
||||
|
||||
class JsonObjectConstIterator final {
|
||||
class JsonObjectConstIterator {
|
||||
friend class JsonObject;
|
||||
|
||||
public:
|
||||
|
@ -12,7 +12,7 @@ ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
|
||||
|
||||
// A key-value pair.
|
||||
// https://arduinojson.org/v6/api/jsonobject/begin_end/
|
||||
class JsonPair final {
|
||||
class JsonPair {
|
||||
public:
|
||||
// INTERNAL USE ONLY
|
||||
JsonPair(detail::MemoryPool* pool, detail::VariantSlot* slot) {
|
||||
@ -40,7 +40,7 @@ class JsonPair final {
|
||||
|
||||
// A read-only key-value pair.
|
||||
// https://arduinojson.org/v6/api/jsonobjectconst/begin_end/
|
||||
class JsonPairConst final {
|
||||
class JsonPairConst {
|
||||
public:
|
||||
JsonPairConst(const detail::VariantSlot* slot) {
|
||||
if (slot) {
|
||||
|
@ -10,8 +10,8 @@ ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
|
||||
|
||||
// A reference to a value in a JsonDocument.
|
||||
// https://arduinojson.org/v6/api/jsonvariant/
|
||||
class JsonVariant final : public detail::VariantRefBase<JsonVariant>,
|
||||
public detail::VariantOperators<JsonVariant> {
|
||||
class JsonVariant : public detail::VariantRefBase<JsonVariant>,
|
||||
public detail::VariantOperators<JsonVariant> {
|
||||
friend class detail::VariantAttorney;
|
||||
|
||||
public:
|
||||
|
@ -24,9 +24,8 @@ class JsonObject;
|
||||
|
||||
// A read-only reference to a value in a JsonDocument
|
||||
// https://arduinojson.org/v6/api/jsonarrayconst/
|
||||
class JsonVariantConst final
|
||||
: public detail::VariantTag,
|
||||
public detail::VariantOperators<JsonVariantConst> {
|
||||
class JsonVariantConst : public detail::VariantTag,
|
||||
public detail::VariantOperators<JsonVariantConst> {
|
||||
friend class detail::VariantAttorney;
|
||||
|
||||
public:
|
||||
|
Reference in New Issue
Block a user