bblanchon/ArduinoJson
1
0
Fork 1
mirror of https://github.com/bblanchon/ArduinoJson.git synced 2025-07-29 18:27:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged JsonArrayNode and JsonObjectNode into a single template

Browse Source
This commit is contained in:
Benoit Blanchon
2014-11-05 11:09:48 +01:00
parent 5d0e326bfd
commit 768312e870
6 changed files with 52 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/ArduinoJson/JsonArray.hpp
View File

@ -6,13 +6,14 @@
#pragma once
#include "Internals/JsonArrayNode.hpp"
#include "Internals/JsonIterator.hpp"
#include "Internals/JsonPrintable.hpp"
#include "Internals/Node.hpp"
#include "Internals/ReferenceType.hpp"
#include "JsonVariant.hpp"
#define JSON_ARRAY_SIZE(NUMBER_OF_ELEMENTS) \
(sizeof(JsonArray) + (NUMBER_OF_ELEMENTS) * sizeof(Internals::JsonArrayNode))
(sizeof(JsonArray) + (NUMBER_OF_ELEMENTS) * sizeof(JsonArray::node_type))
namespace ArduinoJson {
@ -25,10 +26,9 @@ class JsonArray : public Internals::JsonPrintable<JsonArray>,
public:
typedef JsonVariant value_type;
typedef Internals::JsonIterator<Internals::JsonArrayNode, JsonVariant>
iterator;
typedef Internals::JsonIterator<Internals::JsonArrayNode, const JsonVariant>
const_iterator;
typedef Internals::Node<JsonVariant> node_type;
typedef Internals::JsonIterator<node_type, JsonVariant> iterator;
typedef Internals::JsonIterator<node_type, const JsonVariant> const_iterator;
int size() const;
@ -65,11 +65,11 @@ class JsonArray : public Internals::JsonPrintable<JsonArray>,
// constructor is private: instance must be created via a JsonBuffer
JsonArray(JsonBuffer *buffer) : _buffer(buffer), _firstNode(NULL) {}
Internals::JsonArrayNode *createNode();
inline void addNode(Internals::JsonArrayNode *node);
node_type *createNode();
inline void addNode(node_type *node);
JsonBuffer *_buffer;
Internals::JsonArrayNode *_firstNode;
node_type *_firstNode;
static JsonArray _invalid;
};
}