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

Added a build failure when nullptr is defined as a macro (closes #1355)

Browse Source
This commit is contained in:
Benoit Blanchon
2020-08-23 09:29:40 +02:00
parent 61a5273aea
commit 67aa8efd5a
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@@ -1,6 +1,11 @@
ArduinoJson: change log ArduinoJson: change log
======================= =======================
HEAD
----
* Added a build failure when nullptr is defined as a macro (issue #1355)
v6.16.1 (2020-08-04) v6.16.1 (2020-08-04)
------- -------

5
src/ArduinoJson/Configuration.hpp
View File

@@ -230,3 +230,8 @@
#define ARDUINOJSON_DEBUG 0 #define ARDUINOJSON_DEBUG 0
#endif #endif
#endif #endif
#if ARDUINOJSON_HAS_NULLPTR && defined(nullptr)
#error nullptr is defined as a macro. Remove the faulty #define or #undef nullptr
// See https://github.com/bblanchon/ArduinoJson/issues/1355
#endif