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

Fixed error Pe070 "incomplete type is not allowed" on IAR (fixes #1560)

Browse Source
This commit is contained in:
Benoit Blanchon
2021-05-19 15:07:59 +02:00
parent 622e7dd287
commit af3bb131c8
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -5,6 +5,7 @@ HEAD
---- ----
* Fixed support for `volatile float` and `volatile double` (issue #1557) * Fixed support for `volatile float` and `volatile double` (issue #1557)
* Fixed error `[Pe070]: incomplete type is not allowed` on IAR (issue #1560)
v6.18.0 (2021-05-05) v6.18.0 (2021-05-05)
------- -------

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

@@ -140,4 +140,9 @@ inline VariantConstRef operator|(VariantConstRef preferedValue,
VariantConstRef defaultValue) { VariantConstRef defaultValue) {
return preferedValue ? preferedValue : defaultValue; return preferedValue ? preferedValue : defaultValue;
} }
// Out of class definition to avoid #1560
inline bool VariantRef::set(char value) const {
return set<signed char>(value);
}
} // namespace ARDUINOJSON_NAMESPACE } // namespace ARDUINOJSON_NAMESPACE

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

@@ -88,11 +88,9 @@ class VariantRef : public VariantRefBase<VariantData>,
return Converter<T>::toJson(value, *this); return Converter<T>::toJson(value, *this);
} }
FORCE_INLINE bool ARDUINOJSON_DEPRECATED( bool ARDUINOJSON_DEPRECATED(
"Support for char is deprecated, use int8_t or uint8_t instead") "Support for char is deprecated, use int8_t or uint8_t instead")
set(char value) const { set(char value) const;
return set<signed char>(value);
}
template <typename T> template <typename T>
FORCE_INLINE bool set(T *value) const { FORCE_INLINE bool set(T *value) const {