@@ -79,18 +79,15 @@ public: \
79
79
#define SHARED(name, type) \
80
80
Shared<type> name;
81
81
82
+ #define ARDUINO_THREADS_CONCAT_(x,y) x##y
83
+ #define ARDUINO_THREADS_CONCAT(x,y) ARDUINO_THREADS_CONCAT_(x,y)
84
+
85
+ #define ARDUINO_THREADS_TO_STRING(sequence) #sequence
86
+
82
87
/**************************************************************************************
83
88
* CLASS DECLARATION
84
89
**************************************************************************************/
85
90
86
- #define CONCAT2(x,y) x##y
87
- #define CONCAT(x,y) CONCAT2(x,y)
88
-
89
- #define INCF(F) INCF_(F)
90
- #define INCF_(F) #F
91
-
92
- #define _macroToString(sequence) #sequence
93
-
94
91
class Arduino_Threads
95
92
{
96
93
public:
@@ -124,13 +121,13 @@ class Arduino_Threads
124
121
void threadFunc();
125
122
};
126
123
127
- #define THD_ENTER(tabname) class CONCAT (tabname, Class) : public Arduino_Threads { \
124
+ #define THD_ENTER(tabname) class ARDUINO_THREADS_CONCAT (tabname, Class) : public Arduino_Threads { \
128
125
public: \
129
- CONCAT (tabname, Class)() { _tabname = _macroToString (tabname); } \
126
+ ARDUINO_THREADS_CONCAT (tabname, Class)() { _tabname = ARDUINO_THREADS_TO_STRING (tabname); } \
130
127
private: \
131
128
132
129
#define THD_DONE(tabname) \
133
130
}; \
134
- CONCAT (tabname,Class) tabname;
131
+ ARDUINO_THREADS_CONCAT (tabname,Class) tabname;
135
132
136
133
#endif /* ARDUINO_THREADS_H_ */
0 commit comments