From 9af57d47bf0e6771cd991f5b1d5c97fe9783e161 Mon Sep 17 00:00:00 2001 From: Alexander Entinger Date: Mon, 18 Oct 2021 09:16:32 +0200 Subject: [PATCH 1/3] Remove superfluous macro 'INCF' --- src/Arduino_Threads.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/Arduino_Threads.h b/src/Arduino_Threads.h index fe05cb5..1aef446 100644 --- a/src/Arduino_Threads.h +++ b/src/Arduino_Threads.h @@ -86,9 +86,6 @@ public: \ #define CONCAT2(x,y) x##y #define CONCAT(x,y) CONCAT2(x,y) -#define INCF(F) INCF_(F) -#define INCF_(F) #F - #define _macroToString(sequence) #sequence class Arduino_Threads From e96894cfe795974f48d4342a571de8bd015e16dc Mon Sep 17 00:00:00 2001 From: Alexander Entinger Date: Mon, 18 Oct 2021 09:18:45 +0200 Subject: [PATCH 2/3] Rename CONCAT/CONCAT2 to ARDUINO_THREADS_CONCAT/_ in order to prevent name-clashes with similar named macros. --- src/Arduino_Threads.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Arduino_Threads.h b/src/Arduino_Threads.h index 1aef446..83d7f71 100644 --- a/src/Arduino_Threads.h +++ b/src/Arduino_Threads.h @@ -79,13 +79,13 @@ public: \ #define SHARED(name, type) \ Shared name; +#define ARDUINO_THREADS_CONCAT_(x,y) x##y +#define ARDUINO_THREADS_CONCAT(x,y) ARDUINO_THREADS_CONCAT_(x,y) + /************************************************************************************** * CLASS DECLARATION **************************************************************************************/ -#define CONCAT2(x,y) x##y -#define CONCAT(x,y) CONCAT2(x,y) - #define _macroToString(sequence) #sequence class Arduino_Threads @@ -121,13 +121,13 @@ class Arduino_Threads void threadFunc(); }; -#define THD_ENTER(tabname) class CONCAT(tabname, Class) : public Arduino_Threads { \ +#define THD_ENTER(tabname) class ARDUINO_THREADS_CONCAT(tabname, Class) : public Arduino_Threads { \ public: \ - CONCAT(tabname, Class)() { _tabname = _macroToString(tabname); } \ + ARDUINO_THREADS_CONCAT(tabname, Class)() { _tabname = _macroToString(tabname); } \ private: \ #define THD_DONE(tabname) \ }; \ -CONCAT(tabname,Class) tabname; +ARDUINO_THREADS_CONCAT(tabname,Class) tabname; #endif /* ARDUINO_THREADS_H_ */ From b233ee4f7214e4629b2bf38fb1b5a5b812ae2f15 Mon Sep 17 00:00:00 2001 From: Alexander Entinger Date: Mon, 18 Oct 2021 09:38:50 +0200 Subject: [PATCH 3/3] Rename _macroToString to ARDUINO_THREADS_TO_STRING in order to avoid name collissions with different libraries. --- src/Arduino_Threads.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Arduino_Threads.h b/src/Arduino_Threads.h index 83d7f71..c2c2fca 100644 --- a/src/Arduino_Threads.h +++ b/src/Arduino_Threads.h @@ -82,12 +82,12 @@ public: \ #define ARDUINO_THREADS_CONCAT_(x,y) x##y #define ARDUINO_THREADS_CONCAT(x,y) ARDUINO_THREADS_CONCAT_(x,y) +#define ARDUINO_THREADS_TO_STRING(sequence) #sequence + /************************************************************************************** * CLASS DECLARATION **************************************************************************************/ -#define _macroToString(sequence) #sequence - class Arduino_Threads { public: @@ -123,7 +123,7 @@ class Arduino_Threads #define THD_ENTER(tabname) class ARDUINO_THREADS_CONCAT(tabname, Class) : public Arduino_Threads { \ public: \ - ARDUINO_THREADS_CONCAT(tabname, Class)() { _tabname = _macroToString(tabname); } \ + ARDUINO_THREADS_CONCAT(tabname, Class)() { _tabname = ARDUINO_THREADS_TO_STRING(tabname); } \ private: \ #define THD_DONE(tabname) \