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
JsonParser/JsonToken.cpp
View File

@ -9,8 +9,8 @@ using namespace ArduinoJson::Parser;
char* JsonToken::getText()
{
char* s = json + token->start;
json[token->end] = 0;
char* s = _json + _token->start;
_json[_token->end] = 0;
unescapeString(s);
@ -54,7 +54,7 @@ inline char JsonToken::unescapeChar(char c)
JsonToken JsonToken::nextSibling() const
{
// start with current token
jsmntok_t* t = token;
jsmntok_t* t = _token;
// count the number of token to skip
int yetToVisit = 1;
@ -67,5 +67,5 @@ JsonToken JsonToken::nextSibling() const
}
// build a JsonToken at the new location
return JsonToken(json, t);
return JsonToken(_json, t);
}