Sync to 20.35.6

ETLCPP · Dec 15, 2022 · 96588da · 96588da
1 parent 88d0881
commit 96588da
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 5 deletions.
diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "Embedded Template Library - Arduino",
-  "version": "20.35.5",
+  "version": "20.35.6",
   "authors": {
     "name": "John Wellbelove",
     "email": "[email protected]"

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=Embedded Template Library - Arduino
-version=20.35.5
+version=20.35.6
 author= John Wellbelove <[email protected]>
 maintainer=John Wellbelove <[email protected]>
 license=MIT

diff --git a/src/etl/private/minmax_pop.h b/src/etl/private/minmax_pop.h
@@ -32,7 +32,7 @@ SOFTWARE.
  * The header include guard has been intentionally omitted.
  * This file is intended to evaluated multiple times by design.
  */
-#if !defined(ETL_COMPILER_GREEN_HILLS) && !defined(ETL_COMPILER_IAR)
+#if !defined(ETL_COMPILER_GREEN_HILLS) && !defined(ETL_COMPILER_IAR) && !defined(ETL_COMPILER_TASKING)
   #if !defined(ETL_COMPILER_ARM5)
     #pragma pop_macro("min")
     #pragma pop_macro("max")

diff --git a/src/etl/private/minmax_push.h b/src/etl/private/minmax_push.h
@@ -33,7 +33,7 @@ SOFTWARE.
  * This file is intended to evaluated multiple times by design.
  */
 
-#if !defined(ETL_COMPILER_GREEN_HILLS) && !defined(ETL_COMPILER_IAR)
+#if !defined(ETL_COMPILER_GREEN_HILLS) && !defined(ETL_COMPILER_IAR) && !defined(ETL_COMPILER_TASKING)
   #if !defined(ETL_COMPILER_ARM5)
     #pragma push_macro("min")
     #pragma push_macro("max")

diff --git a/src/etl/profiles/determine_compiler.h b/src/etl/profiles/determine_compiler.h
@@ -119,6 +119,13 @@ SOFTWARE.
     #endif
   #endif
 
+  #if !defined(ETL_COMPILER_TYPE_DETECTED) && !defined(ETL_COMPILER_TASKING)
+    #if defined(__TASKING__)
+      #define ETL_COMPILER_TASKING
+      #define ETL_COMPILER_TYPE_DETECTED
+    #endif
+  #endif
+
   #if !defined(ETL_COMPILER_TYPE_DETECTED)
     #define ETL_COMPILER_GENERIC
   #endif
@@ -187,6 +194,12 @@ SOFTWARE.
   #define ETL_USING_TEXAS_INSTRUMENTS_COMPILER 0
 #endif
 
+#if defined(ETL_COMPILER_TASKING)
+  #define ETL_USING_TASKING_COMPILER 1
+#else
+  #define ETL_USING_TASKING_COMPILER 0
+#endif
+
 #if defined(ETL_COMPILER_GENERIC)
   #define ETL_USING_GENERIC_COMPILER 1
 #else

diff --git a/src/etl/profiles/determine_compiler_version.h b/src/etl/profiles/determine_compiler_version.h
@@ -64,6 +64,9 @@ SOFTWARE.
   #elif defined(ETL_COMPILER_TEXAS_INSTRUMENTS)
     #define ETL_COMPILER_VERSION      __TI_COMPILER_VERSION__
     #define ETL_COMPILER_FULL_VERSION __TI_COMPILER_VERSION__
+  #elif defined(ETL_COMPILER_TASKING)
+    #define ETL_COMPILER_VERSION      __REVISION__
+    #define ETL_COMPILER_FULL_VERSION __VERSION__
   #else
     #define ETL_COMPILER_VERSION      0
     #define ETL_COMPILER_FULL_VERSION 0

diff --git a/src/etl/version.h b/src/etl/version.h
@@ -40,7 +40,7 @@ SOFTWARE.
 
 #define ETL_VERSION_MAJOR 20
 #define ETL_VERSION_MINOR 35
-#define ETL_VERSION_PATCH 5
+#define ETL_VERSION_PATCH 6
 
 #define ETL_VERSION       ETL_STRING(ETL_VERSION_MAJOR) "." ETL_STRING(ETL_VERSION_MINOR) "." ETL_STRING(ETL_VERSION_PATCH)
 #define ETL_VERSION_W     ETL_WIDE_STRING(ETL_VERSION_MAJOR) L"." ETL_WIDE_STRING(ETL_VERSION_MINOR) L"." ETL_WIDE_STRING(ETL_VERSION_PATCH)