Improved JsonObjectIterator

This commit is contained in:
Benoit Blanchon
2014-10-23 18:56:04 +02:00
parent d83f1a6319
commit 888fdc1d54
2 changed files with 62 additions and 61 deletions

View File

@ -16,9 +16,10 @@ namespace ArduinoJson
{ {
} }
void operator++() JsonObjectIterator& operator++()
{ {
++_objectKeyValue; _objectKeyValue = JsonObjectKeyValue(_objectKeyValue.next());
return *this;
} }
JsonObjectKeyValue operator*() const JsonObjectKeyValue operator*() const

View File

@ -22,11 +22,6 @@ namespace ArduinoJson
return JsonValue(_node->getAsObjectValue()); return JsonValue(_node->getAsObjectValue());
} }
void operator++()
{
_node = _node->next;
}
bool operator==(const JsonObjectKeyValue& other) const bool operator==(const JsonObjectKeyValue& other) const
{ {
return _node == other._node; return _node == other._node;
@ -37,6 +32,11 @@ namespace ArduinoJson
return _node != other._node; return _node != other._node;
} }
Internals::JsonNode* next()
{
return _node->next;
}
private: private:
Internals::JsonNode* _node; Internals::JsonNode* _node;
}; };