feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Suppress IAR compiler warning.

Browse Source
This commit is contained in:
Mikolaj Stawiski
2020-07-28 17:07:22 +10:00
committed by Benoit Blanchon
parent 144ff3b06e
commit 0c0bf80074
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -9,6 +9,7 @@ HEAD
* Fixed `copyArray()` not working with `String`, `ElementProxy`, and `MemberProxy` * Fixed `copyArray()` not working with `String`, `ElementProxy`, and `MemberProxy`
* Fixed error `getOrAddElement is not a member of ElementProxy` (issue #1311) * Fixed error `getOrAddElement is not a member of ElementProxy` (issue #1311)
* Fixed excessive stack usage when compiled with `-Og` (issues #1210 and #1314) * Fixed excessive stack usage when compiled with `-Og` (issues #1210 and #1314)
* Fixed `Warning[Pa093]: implicit conversion from floating point to integer` on IAR compiler (PR #1328 by @stawiski)
v6.15.2 (2020-05-15) v6.15.2 (2020-05-15)
------- -------

9
src/ArduinoJson/Polyfills/type_traits/is_convertible.hpp
View File

@ -12,6 +12,11 @@
#pragma warning(disable : 4244) #pragma warning(disable : 4244)
#endif #endif
#ifdef __ICCARM__
// Suppress IAR Compiler Warning[Pa093]: implicit conversion from floating point to integer
#pragma diag_suppress=Pa093
#endif
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {
template <typename From, typename To> template <typename From, typename To>
@ -32,3 +37,7 @@ struct is_convertible {
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#endif #endif
#ifdef __ICCARM__
#pragma diag_default=Pa093
#endif