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 double lookup in to<JsonVariant>()

Browse Source 
Ported from 23b01a89b1e1faf2fdee4b7287e769676b21852b
This commit is contained in:
Benoit Blanchon
2023-07-05 21:10:47 +02:00
parent ecbc8e85d4
commit 7b1c012f80
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -5,6 +5,7 @@ HEAD
---- ----
* Fix compatibility with the Blynk libary (issue #1914) * Fix compatibility with the Blynk libary (issue #1914)
* Fix double lookup in `to<JsonVariant>()`
v6.21.2 (2023-04-12) v6.21.2 (2023-04-12)
------- -------

5
src/ArduinoJson/Variant/VariantImpl.hpp
View File

@@ -138,8 +138,9 @@ template <typename TDerived>
template <typename T> template <typename T>
typename enable_if<is_same<T, JsonVariant>::value, JsonVariant>::type typename enable_if<is_same<T, JsonVariant>::value, JsonVariant>::type
VariantRefBase<TDerived>::to() const { VariantRefBase<TDerived>::to() const {
variantSetNull(getOrCreateData()); auto data = getOrCreateData();
return *this; variantSetNull(data);
return JsonVariant(getPool(), data);
} }
template <typename TDerived> template <typename TDerived>