mirror of
				https://github.com/eledio-devices/thirdparty-ArduinoJson.git
				synced 2025-10-31 16:14:11 +01:00 
			
		
		
		
	Rename ArrayIterator to JsonArrayIterator
				
					
				
			This commit is contained in:
		| @@ -15,7 +15,7 @@ class JsonArray : public VariantOperators<JsonArray> { | ||||
|   friend class VariantAttorney; | ||||
|  | ||||
|  public: | ||||
|   typedef ArrayIterator iterator; | ||||
|   typedef JsonArrayIterator iterator; | ||||
|  | ||||
|   FORCE_INLINE JsonArray() : _data(0), _pool(0) {} | ||||
|   FORCE_INLINE JsonArray(MemoryPool* pool, CollectionData* data) | ||||
|   | ||||
| @@ -4,7 +4,7 @@ | ||||
|  | ||||
| #pragma once | ||||
|  | ||||
| #include <ArduinoJson/Array/ArrayIterator.hpp> | ||||
| #include <ArduinoJson/Array/JsonArrayIterator.hpp> | ||||
| #include <ArduinoJson/Variant/VariantAttorney.hpp> | ||||
| #include <ArduinoJson/Variant/VariantData.hpp> | ||||
|  | ||||
|   | ||||
| @@ -25,12 +25,12 @@ class VariantPtr { | ||||
|   VariantRef _variant; | ||||
| }; | ||||
| 
 | ||||
| class ArrayIterator { | ||||
| class JsonArrayIterator { | ||||
|   friend class JsonArray; | ||||
| 
 | ||||
|  public: | ||||
|   ArrayIterator() : _slot(0) {} | ||||
|   explicit ArrayIterator(MemoryPool* pool, VariantSlot* slot) | ||||
|   JsonArrayIterator() : _slot(0) {} | ||||
|   explicit JsonArrayIterator(MemoryPool* pool, VariantSlot* slot) | ||||
|       : _pool(pool), _slot(slot) {} | ||||
| 
 | ||||
|   VariantRef operator*() const { | ||||
| @@ -40,20 +40,20 @@ class ArrayIterator { | ||||
|     return VariantPtr(_pool, _slot->data()); | ||||
|   } | ||||
| 
 | ||||
|   bool operator==(const ArrayIterator& other) const { | ||||
|   bool operator==(const JsonArrayIterator& other) const { | ||||
|     return _slot == other._slot; | ||||
|   } | ||||
| 
 | ||||
|   bool operator!=(const ArrayIterator& other) const { | ||||
|   bool operator!=(const JsonArrayIterator& other) const { | ||||
|     return _slot != other._slot; | ||||
|   } | ||||
| 
 | ||||
|   ArrayIterator& operator++() { | ||||
|   JsonArrayIterator& operator++() { | ||||
|     _slot = _slot->next(); | ||||
|     return *this; | ||||
|   } | ||||
| 
 | ||||
|   ArrayIterator& operator+=(size_t distance) { | ||||
|   JsonArrayIterator& operator+=(size_t distance) { | ||||
|     _slot = _slot->next(distance); | ||||
|     return *this; | ||||
|   } | ||||
		Reference in New Issue
	
	Block a user