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

Merge branch 'master' into 6.x

Browse Source 
# Conflicts:
#	CHANGELOG.md
#	src/ArduinoJson/Deserialization/JsonParser.hpp
#	src/ArduinoJson/Deserialization/JsonParserImpl.hpp
#	test/JsonBuffer/nestingLimit.cpp
This commit is contained in:
Benoit Blanchon
2018-03-14 14:46:53 +01:00
parent b2a8085651 3523296e3d
commit e3e4aa89ad
5 changed files with 113 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -4,6 +4,8 @@ ArduinoJson: change log
HEAD
----
* Fixed `JsonBuffer::parse()` not respecting nesting limit correctly (issue #693)
* Fixed inconsistencies in nesting level counting (PR #695 from Zhenyu Wu)
* Added `DynamicJsonArray` and `StaticJsonArray`
* Added `DynamicJsonObject` and `StaticJsonObject`
* Added `DynamicJsonVariant` and `StaticJsonVariant`