feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Rename ArrayIterator to JsonArrayIterator

Browse Source
This commit is contained in:
Benoit Blanchon
2022-12-19 11:26:24 +01:00
parent 83e5d9d150
commit 4c456a95a3
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,7 @@ class JsonArray : public VariantOperators<JsonArray> {
friend class VariantAttorney; friend class VariantAttorney;
public: public:
typedef ArrayIterator iterator; typedef JsonArrayIterator iterator;
FORCE_INLINE JsonArray() : _data(0), _pool(0) {} FORCE_INLINE JsonArray() : _data(0), _pool(0) {}
FORCE_INLINE JsonArray(MemoryPool* pool, CollectionData* data) FORCE_INLINE JsonArray(MemoryPool* pool, CollectionData* data)

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

@ -4,7 +4,7 @@
#pragma once #pragma once
#include <ArduinoJson/Array/ArrayIterator.hpp> #include <ArduinoJson/Array/JsonArrayIterator.hpp>
#include <ArduinoJson/Variant/VariantAttorney.hpp> #include <ArduinoJson/Variant/VariantAttorney.hpp>
#include <ArduinoJson/Variant/VariantData.hpp> #include <ArduinoJson/Variant/VariantData.hpp>

14
src/ArduinoJson/Array/ArrayIterator.hpp → src/ArduinoJson/Array/JsonArrayIterator.hpp
View File

@ -25,12 +25,12 @@ class VariantPtr {
VariantRef _variant; VariantRef _variant;
}; };
class ArrayIterator { class JsonArrayIterator {
friend class JsonArray; friend class JsonArray;
public: public:
ArrayIterator() : _slot(0) {} JsonArrayIterator() : _slot(0) {}
explicit ArrayIterator(MemoryPool* pool, VariantSlot* slot) explicit JsonArrayIterator(MemoryPool* pool, VariantSlot* slot)
: _pool(pool), _slot(slot) {} : _pool(pool), _slot(slot) {}
VariantRef operator*() const { VariantRef operator*() const {
@ -40,20 +40,20 @@ class ArrayIterator {
return VariantPtr(_pool, _slot->data()); return VariantPtr(_pool, _slot->data());
} }
bool operator==(const ArrayIterator& other) const { bool operator==(const JsonArrayIterator& other) const {
return _slot == other._slot; return _slot == other._slot;
} }
bool operator!=(const ArrayIterator& other) const { bool operator!=(const JsonArrayIterator& other) const {
return _slot != other._slot; return _slot != other._slot;
} }
ArrayIterator& operator++() { JsonArrayIterator& operator++() {
_slot = _slot->next(); _slot = _slot->next();
return *this; return *this;
} }
ArrayIterator& operator+=(size_t distance) { JsonArrayIterator& operator+=(size_t distance) {
_slot = _slot->next(distance); _slot = _slot->next(distance);
return *this; return *this;
} }