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

Changed naming convention to avoid shadowing (issue #25)

Browse Source
This commit is contained in:
Benoit Blanchon
2014-09-28 13:36:41 +02:00
parent cc19266470
commit ce788d96c4
19 changed files with 147 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
JsonGenerator/JsonArrayBase.h
View File

@ -16,7 +16,7 @@ namespace ArduinoJson
{
public:
JsonArrayBase(JsonValue* items, int capacity)
: items(items), capacity(capacity), count(0)
: _items(items), _capacity(capacity), _count(0)
{
}
@ -54,9 +54,9 @@ namespace ArduinoJson
template<int DIGITS>
void add(double value)
{
if (count >= capacity) return;
if (_count >= _capacity) return;
JsonValue& v = items[count++];
JsonValue& v = _items[_count++];
v.set<DIGITS>(value);
}
@ -65,14 +65,14 @@ namespace ArduinoJson
using JsonPrintable::printTo;
private:
JsonValue* items;
int capacity, count;
JsonValue* _items;
int _capacity, _count;
template<typename T>
void addIfPossible(T value)
{
if (count < capacity)
items[count++] = value;
if (_count < _capacity)
_items[_count++] = value;
}
};
}