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

Added detection of Atmel AVR8/GNU C Compiler (fixes #1112)

Browse Source
This commit is contained in:
Benoit Blanchon
2019-10-18 22:10:35 +02:00
parent 16fe3c0acc
commit d4f819f1f0
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -8,6 +8,7 @@ HEAD
* Added conversion from `JsonArray` and `JsonObject` to `bool`, to be consistent with `JsonVariant` * Added conversion from `JsonArray` and `JsonObject` to `bool`, to be consistent with `JsonVariant`
* Fixed `deserializeJson()` when input contains duplicate keys (issue #1095) * Fixed `deserializeJson()` when input contains duplicate keys (issue #1095)
* Improved `deserializeMsgPack()` speed by reading several bytes at once * Improved `deserializeMsgPack()` speed by reading several bytes at once
* Added detection of Atmel AVR8/GNU C Compiler (issue #1112)
v6.12.0 (2019-09-05) v6.12.0 (2019-09-05)
------- -------

7
src/ArduinoJson/Configuration.hpp
View File

@ -20,8 +20,11 @@
// Small or big machine? // Small or big machine?
#ifndef ARDUINOJSON_EMBEDDED_MODE #ifndef ARDUINOJSON_EMBEDDED_MODE
#if defined(ARDUINO) || defined(__IAR_SYSTEMS_ICC__) || defined(__XC) || \ #if defined(ARDUINO) /* Arduino*/ \
defined(__ARMCC_VERSION) || defined(__IAR_SYSTEMS_ICC__) /* IAR Embedded Workbench */ \
|| defined(__XC) /* MPLAB XC compiler */ \
|| defined(__ARMCC_VERSION) /* Keil ARM Compiler */ \
|| defined(__AVR) /* Atmel AVR8/GNU C Compiler */
#define ARDUINOJSON_EMBEDDED_MODE 1 #define ARDUINOJSON_EMBEDDED_MODE 1
#else #else
#define ARDUINOJSON_EMBEDDED_MODE 0 #define ARDUINOJSON_EMBEDDED_MODE 0