github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-11-01 08:48:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed shadowing warning (issue #36)

Browse Source
This commit is contained in:
Benoit Blanchon
2014-12-09 20:23:49 +01:00
parent 9ca32e664e
commit 85ebc8a1ec
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/ArduinoJson/StaticJsonBuffer.hpp
View File

@@ -22,10 +22,10 @@ class StaticJsonBuffer : public JsonBuffer {
size_t size() const { return _size; } size_t size() const { return _size; }
protected: protected:
virtual void* alloc(size_t size) { virtual void* alloc(size_t bytes) {
if (_size + size > CAPACITY) return NULL; if (_size + bytes > CAPACITY) return NULL;
void* p = &_buffer[_size]; void* p = &_buffer[_size];
_size += size; _size += bytes;
return p; return p;
} }