Skip to content

Commit 96588da

Browse files
committedDec 15, 2022
Sync to 20.35.6
1 parent 88d0881 commit 96588da

7 files changed

+21
-5
lines changed
 

‎library.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Embedded Template Library - Arduino",
3-
"version": "20.35.5",
3+
"version": "20.35.6",
44
"authors": {
55
"name": "John Wellbelove",
66
"email": "john.wellbelove@etlcpp.com"

‎library.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=Embedded Template Library - Arduino
2-
version=20.35.5
2+
version=20.35.6
33
author= John Wellbelove <john.wellbelove@etlcpp.com>
44
maintainer=John Wellbelove <john.wellbelove@etlcpp.com>
55
license=MIT

‎src/etl/private/minmax_pop.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ SOFTWARE.
3232
* The header include guard has been intentionally omitted.
3333
* This file is intended to evaluated multiple times by design.
3434
*/
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)
3636
#if !defined(ETL_COMPILER_ARM5)
3737
#pragma pop_macro("min")
3838
#pragma pop_macro("max")

‎src/etl/private/minmax_push.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ SOFTWARE.
3333
* This file is intended to evaluated multiple times by design.
3434
*/
3535

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)
3737
#if !defined(ETL_COMPILER_ARM5)
3838
#pragma push_macro("min")
3939
#pragma push_macro("max")

‎src/etl/profiles/determine_compiler.h

+13
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,13 @@ SOFTWARE.
119119
#endif
120120
#endif
121121

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+
122129
#if !defined(ETL_COMPILER_TYPE_DETECTED)
123130
#define ETL_COMPILER_GENERIC
124131
#endif
@@ -187,6 +194,12 @@ SOFTWARE.
187194
#define ETL_USING_TEXAS_INSTRUMENTS_COMPILER 0
188195
#endif
189196

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+
190203
#if defined(ETL_COMPILER_GENERIC)
191204
#define ETL_USING_GENERIC_COMPILER 1
192205
#else

‎src/etl/profiles/determine_compiler_version.h

+3
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ SOFTWARE.
6464
#elif defined(ETL_COMPILER_TEXAS_INSTRUMENTS)
6565
#define ETL_COMPILER_VERSION __TI_COMPILER_VERSION__
6666
#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__
6770
#else
6871
#define ETL_COMPILER_VERSION 0
6972
#define ETL_COMPILER_FULL_VERSION 0

‎src/etl/version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ SOFTWARE.
4040

4141
#define ETL_VERSION_MAJOR 20
4242
#define ETL_VERSION_MINOR 35
43-
#define ETL_VERSION_PATCH 5
43+
#define ETL_VERSION_PATCH 6
4444

4545
#define ETL_VERSION ETL_STRING(ETL_VERSION_MAJOR) "." ETL_STRING(ETL_VERSION_MINOR) "." ETL_STRING(ETL_VERSION_PATCH)
4646
#define ETL_VERSION_W ETL_WIDE_STRING(ETL_VERSION_MAJOR) L"." ETL_WIDE_STRING(ETL_VERSION_MINOR) L"." ETL_WIDE_STRING(ETL_VERSION_PATCH)

0 commit comments

Comments
 (0)
Please sign in to comment.