File tree 7 files changed +21
-5
lines changed
7 files changed +21
-5
lines changed Original file line number Diff line number Diff line change 1
1
{
2
2
"name" : " Embedded Template Library - Arduino" ,
3
- "version" : " 20.35.5 " ,
3
+ "version" : " 20.35.6 " ,
4
4
"authors" : {
5
5
"name" : " John Wellbelove" ,
6
6
"email" : " john.wellbelove@etlcpp.com"
Original file line number Diff line number Diff line change 1
1
name =Embedded Template Library - Arduino
2
- version =20.35.5
2
+ version =20.35.6
3
3
author = John Wellbelove <john.wellbelove@etlcpp.com>
4
4
maintainer =John Wellbelove <john.wellbelove@etlcpp.com>
5
5
license =MIT
Original file line number Diff line number Diff line change @@ -32,7 +32,7 @@ SOFTWARE.
32
32
* The header include guard has been intentionally omitted.
33
33
* This file is intended to evaluated multiple times by design.
34
34
*/
35
- #if !defined(ETL_COMPILER_GREEN_HILLS ) && !defined(ETL_COMPILER_IAR )
35
+ #if !defined(ETL_COMPILER_GREEN_HILLS ) && !defined(ETL_COMPILER_IAR ) && !defined( ETL_COMPILER_TASKING )
36
36
#if !defined(ETL_COMPILER_ARM5 )
37
37
#pragma pop_macro("min")
38
38
#pragma pop_macro("max")
Original file line number Diff line number Diff line change @@ -33,7 +33,7 @@ SOFTWARE.
33
33
* This file is intended to evaluated multiple times by design.
34
34
*/
35
35
36
- #if !defined(ETL_COMPILER_GREEN_HILLS ) && !defined(ETL_COMPILER_IAR )
36
+ #if !defined(ETL_COMPILER_GREEN_HILLS ) && !defined(ETL_COMPILER_IAR ) && !defined( ETL_COMPILER_TASKING )
37
37
#if !defined(ETL_COMPILER_ARM5 )
38
38
#pragma push_macro("min")
39
39
#pragma push_macro("max")
Original file line number Diff line number Diff line change @@ -119,6 +119,13 @@ SOFTWARE.
119
119
#endif
120
120
#endif
121
121
122
+ #if !defined(ETL_COMPILER_TYPE_DETECTED ) && !defined(ETL_COMPILER_TASKING )
123
+ #if defined(__TASKING__ )
124
+ #define ETL_COMPILER_TASKING
125
+ #define ETL_COMPILER_TYPE_DETECTED
126
+ #endif
127
+ #endif
128
+
122
129
#if !defined(ETL_COMPILER_TYPE_DETECTED )
123
130
#define ETL_COMPILER_GENERIC
124
131
#endif
@@ -187,6 +194,12 @@ SOFTWARE.
187
194
#define ETL_USING_TEXAS_INSTRUMENTS_COMPILER 0
188
195
#endif
189
196
197
+ #if defined(ETL_COMPILER_TASKING )
198
+ #define ETL_USING_TASKING_COMPILER 1
199
+ #else
200
+ #define ETL_USING_TASKING_COMPILER 0
201
+ #endif
202
+
190
203
#if defined(ETL_COMPILER_GENERIC )
191
204
#define ETL_USING_GENERIC_COMPILER 1
192
205
#else
Original file line number Diff line number Diff line change @@ -64,6 +64,9 @@ SOFTWARE.
64
64
#elif defined(ETL_COMPILER_TEXAS_INSTRUMENTS )
65
65
#define ETL_COMPILER_VERSION __TI_COMPILER_VERSION__
66
66
#define ETL_COMPILER_FULL_VERSION __TI_COMPILER_VERSION__
67
+ #elif defined(ETL_COMPILER_TASKING )
68
+ #define ETL_COMPILER_VERSION __REVISION__
69
+ #define ETL_COMPILER_FULL_VERSION __VERSION__
67
70
#else
68
71
#define ETL_COMPILER_VERSION 0
69
72
#define ETL_COMPILER_FULL_VERSION 0
Original file line number Diff line number Diff line change @@ -40,7 +40,7 @@ SOFTWARE.
40
40
41
41
#define ETL_VERSION_MAJOR 20
42
42
#define ETL_VERSION_MINOR 35
43
- #define ETL_VERSION_PATCH 5
43
+ #define ETL_VERSION_PATCH 6
44
44
45
45
#define ETL_VERSION ETL_STRING (ETL_VERSION_MAJOR) "." ETL_STRING(ETL_VERSION_MINOR) "." ETL_STRING(ETL_VERSION_PATCH)
46
46
#define ETL_VERSION_W ETL_WIDE_STRING (ETL_VERSION_MAJOR) L"." ETL_WIDE_STRING(ETL_VERSION_MINOR) L"." ETL_WIDE_STRING(ETL_VERSION_PATCH)
You can’t perform that action at this time.
0 commit comments