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

Simplified JsonVariant::as<T>() to always return T

Browse Source
This commit is contained in:
Benoit Blanchon
2021-03-08 09:58:09 +01:00
parent 9094179856
commit e4ce75e20c
16 changed files with 78 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ArduinoJson/Variant/VariantRef.hpp
View File

@@ -176,7 +176,7 @@ class VariantRef : public VariantRefBase<VariantData>,
#endif
template <typename T>
FORCE_INLINE typename VariantAs<T>::type as() const {
FORCE_INLINE T as() const {
/********************************************************************
** THIS IS NOT A BUG IN THE LIBRARY **
** -------------------------------- **
@@ -187,11 +187,13 @@ class VariantRef : public VariantRefBase<VariantData>,
** For example: **
** char* name = doc["name"]; **
** char age = doc["age"]; **
** auto city = doc["city"].as<char*>() **
** Instead, use: **
** const char* name = doc["name"]; **
** int8_t age = doc["age"]; **
** auto city = doc["city"].as<const char*>() **
********************************************************************/
return variantAs<typename VariantAs<T>::type>(_data, _pool);
return variantAs<T>(_data, _pool);
}
template <typename T>
@@ -291,8 +293,8 @@ class VariantConstRef : public VariantRefBase<const VariantData>,
}
template <typename T>
FORCE_INLINE typename VariantConstAs<T>::type as() const {
return variantAs<typename VariantConstAs<T>::type>(_data);
FORCE_INLINE T as() const {
return variantAs<T>(_data);
}
template <typename T>