From 80823d3574e85f0a7ec3a87c0f491261fae31b58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Dominguez?= <52816569+SebDominguez@users.noreply.github.com> Date: Fri, 21 Jan 2022 16:07:23 +0100 Subject: [PATCH 1/2] Update Arduino.h removed `#define nullptr NULL` This issue is discussed here : https://github.com/ElectronicCats/CayenneLPP/issues/27 also : https://github.com/bblanchon/ArduinoJson/pull/1421 and : https://github.com/bblanchon/ArduinoJson/issues/1355 --- cores/asr650x/Arduino.h | 1 - 1 file changed, 1 deletion(-) diff --git a/cores/asr650x/Arduino.h b/cores/asr650x/Arduino.h index d665ebfd..c84f3135 100644 --- a/cores/asr650x/Arduino.h +++ b/cores/asr650x/Arduino.h @@ -55,7 +55,6 @@ #define bitClear(value, bit) ((value) &= ~(1UL << (bit))) #define bit(b) (1 << (b)) #define _BV(b) (1UL << (b)) -#define nullptr NULL #define yield() //#ifdef __cplusplus From ff0964dda2e08e97977059041fed88f6db8a9452 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Dominguez?= Date: Wed, 26 Jan 2022 09:35:57 +0100 Subject: [PATCH 2/2] fixed nullptr redefinition --- cores/asr6601/base/Arduino.h | 1 - 1 file changed, 1 deletion(-) diff --git a/cores/asr6601/base/Arduino.h b/cores/asr6601/base/Arduino.h index 4ea06cde..b6f0e142 100644 --- a/cores/asr6601/base/Arduino.h +++ b/cores/asr6601/base/Arduino.h @@ -58,7 +58,6 @@ #define bitClear(value, bit) ((value) &= ~(1UL << (bit))) #define bit(b) (1 << (b)) #define _BV(b) (1UL << (b)) -#define nullptr NULL #define min(a, b) ((a)<(b)?(a):(b)) #define max(a, b) ((a)>(b)?(a):(b))