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

8
JsonGenerator/JsonObjectBase.h
View File

@ -47,14 +47,14 @@ namespace ArduinoJson
};
JsonObjectBase(KeyValuePair* items, int capacity)
: items(items), capacity(capacity), count(0)
: _items(items), _capacity(capacity), _count(0)
{
}
private:
KeyValuePair* items;
int capacity, count;
static JsonValue nullValue;
KeyValuePair* _items;
int _capacity, _count;
static JsonValue _nullValue;
KeyValuePair* getMatchingPair(JsonKey key) const;
};