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

Fix return type of StaticJsonDocument::operator=

Browse Source
This commit is contained in:
Benoit Blanchon
2021-12-14 10:41:25 +01:00
parent f39d8f548f
commit 3bf47761c8
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -15,6 +15,7 @@ HEAD
* Fix `call of overloaded 'swap(BasicJsonDocument&, BasicJsonDocument&)' is ambiguous` (issue #1678) * Fix `call of overloaded 'swap(BasicJsonDocument&, BasicJsonDocument&)' is ambiguous` (issue #1678)
* Fix inconsistent pool size in `BasicJsonDocument`'s copy constructor * Fix inconsistent pool size in `BasicJsonDocument`'s copy constructor
* Support NUL in string values (issue #1646) * Support NUL in string values (issue #1646)
* Fix return type of `StaticJsonDocument::operator=`
v6.18.5 (2021-09-28) v6.18.5 (2021-09-28)
------- -------

4
src/ArduinoJson/Document/StaticJsonDocument.hpp
View File

@@ -33,13 +33,13 @@ class StaticJsonDocument : public JsonDocument {
set(src); set(src);
} }
StaticJsonDocument operator=(const StaticJsonDocument& src) { StaticJsonDocument& operator=(const StaticJsonDocument& src) {
set(src); set(src);
return *this; return *this;
} }
template <typename T> template <typename T>
StaticJsonDocument operator=(const T& src) { StaticJsonDocument& operator=(const T& src) {
set(src); set(src);
return *this; return *this;
} }