bblanchon/ArduinoJson
1
0
Fork 1
mirror of https://github.com/bblanchon/ArduinoJson.git synced 2025-08-01 19:54:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Convert "collection function" to static member functions

Browse Source
This commit is contained in:
Benoit Blanchon
2023-06-26 11:58:28 +02:00
parent 68b1602c35
commit af8bdfbc8f
5 changed files with 17 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ArduinoJson/Array/JsonArray.hpp
View File

@@ -6,7 +6,6 @@
#include <ArduinoJson/Array/ElementProxy.hpp> #include <ArduinoJson/Array/ElementProxy.hpp>
#include <ArduinoJson/Array/JsonArrayConst.hpp> #include <ArduinoJson/Array/JsonArrayConst.hpp>
#include <ArduinoJson/Collection/CollectionFunctions.hpp>
ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
@@ -93,7 +92,7 @@ class JsonArray : public detail::VariantOperators<JsonArray> {
// ⚠️ Doesn't release the memory associated with the removed element. // ⚠️ Doesn't release the memory associated with the removed element.
// https://arduinojson.org/v6/api/jsonarray/remove/ // https://arduinojson.org/v6/api/jsonarray/remove/
FORCE_INLINE void remove(iterator it) const { FORCE_INLINE void remove(iterator it) const {
collectionRemove(data_, it.slot_, resources_); detail::ArrayData::removeSlot(data_, it.slot_, resources_);
} }
// Removes the element at the specified index. // Removes the element at the specified index.
@@ -107,7 +106,7 @@ class JsonArray : public detail::VariantOperators<JsonArray> {
// ⚠️ Doesn't release the memory associated with the removed elements. // ⚠️ Doesn't release the memory associated with the removed elements.
// https://arduinojson.org/v6/api/jsonarray/clear/ // https://arduinojson.org/v6/api/jsonarray/clear/
void clear() const { void clear() const {
collectionClear(data_, resources_); detail::ArrayData::clear(data_, resources_);
} }
// Gets or sets the element at the specified index. // Gets or sets the element at the specified index.

1
src/ArduinoJson/Array/JsonArrayConst.hpp
View File

@@ -5,7 +5,6 @@
#pragma once #pragma once
#include <ArduinoJson/Array/JsonArrayIterator.hpp> #include <ArduinoJson/Array/JsonArrayIterator.hpp>
#include <ArduinoJson/Collection/CollectionFunctions.hpp>
#include <ArduinoJson/Variant/VariantAttorney.hpp> #include <ArduinoJson/Variant/VariantAttorney.hpp>
#include <ArduinoJson/Variant/VariantData.hpp> #include <ArduinoJson/Variant/VariantData.hpp>

13
src/ArduinoJson/Collection/CollectionData.hpp
View File

@@ -31,8 +31,21 @@ class CollectionData {
void clear(ResourceManager* resources); void clear(ResourceManager* resources);
static void clear(CollectionData* collection, ResourceManager* resources) {
if (!collection)
return;
collection->clear(resources);
}
void removeSlot(VariantSlot* slot, ResourceManager* resources); void removeSlot(VariantSlot* slot, ResourceManager* resources);
static void removeSlot(CollectionData* collection, VariantSlot* slot,
ResourceManager* resources) {
if (!collection)
return;
collection->removeSlot(slot, resources);
}
VariantSlot* head() const { VariantSlot* head() const {
return head_; return head_;
} }

24
src/ArduinoJson/Collection/CollectionFunctions.hpp
View File

@@ -1,24 +0,0 @@
// ArduinoJson - https://arduinojson.org
// Copyright © 2014-2023, Benoit BLANCHON
// MIT License
#pragma once
#include <ArduinoJson/Collection/CollectionData.hpp>
ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
inline void collectionClear(CollectionData* c, ResourceManager* resources) {
if (!c)
return;
c->clear(resources);
}
inline void collectionRemove(CollectionData* data, VariantSlot* slot,
ResourceManager* resources) {
if (!data)
return;
data->removeSlot(slot, resources);
}
ARDUINOJSON_END_PRIVATE_NAMESPACE

4
src/ArduinoJson/Object/JsonObject.hpp
View File

@@ -89,7 +89,7 @@ class JsonObject : public detail::VariantOperators<JsonObject> {
// ⚠️ Doesn't release the memory associated with the removed members. // ⚠️ Doesn't release the memory associated with the removed members.
// https://arduinojson.org/v6/api/jsonobject/clear/ // https://arduinojson.org/v6/api/jsonobject/clear/
void clear() const { void clear() const {
collectionClear(data_, resources_); detail::ObjectData::clear(data_, resources_);
} }
// Copies an object. // Copies an object.
@@ -127,7 +127,7 @@ class JsonObject : public detail::VariantOperators<JsonObject> {
// ⚠️ Doesn't release the memory associated with the removed member. // ⚠️ Doesn't release the memory associated with the removed member.
// https://arduinojson.org/v6/api/jsonobject/remove/ // https://arduinojson.org/v6/api/jsonobject/remove/
FORCE_INLINE void remove(iterator it) const { FORCE_INLINE void remove(iterator it) const {
collectionRemove(data_, it.slot_, resources_); detail::ObjectData::removeSlot(data_, it.slot_, resources_);
} }
// Removes the member with the specified key. // Removes the member with the specified key.