Fixed compilation errors in algorithm.h in C++03 and compiler warning… (#1080)

XiaoP76 · MarshMilo100 · Zach Van Camp · web-flow · commit ce9b774760bf · 2025-05-13T21:17:41.000+01:00
* Add Zephyr build system module.yml (#1074) The Zephyr build system requires that modules have a `module.yml` file to specify where the module cmake and kconfig files are located. These can also be explicitly set as "external" meaning that they do not exist within the module tree, itself. These build file can still be specified elsewhere via cmake variables, explained more in-depth here: https://docs.zephyrproject.org/latest/develop/modules.html#modules-module-ext-root This change makes it such that ETL can be included more easily in zephyr projects running on embedded systems. A similar change can be observed in the public nanopb repository, where the repo only requires its own `zephyr/module.yml` file to be found by the zephyr build system, but the kconfig and cmake additions can exist outside of the library repository. * Add full West support for ETL (#1075) This will allow ETL to be included via west in a zephyr build without any additional wrappers or external kconfigs. Signed-off-by: Zach Van Camp <zach.vancamp@etcconnect.com> Co-authored-by: Zach Van Camp <zach.vancamp@etcconnect.com> * Fixed compilation errors in algorithm.h in C++03 and compiler warnings in gcc older than 4.6 --------- Signed-off-by: Zach Van Camp <zach.vancamp@etcconnect.com> Co-authored-by: Zach Van Camp <marshmilo100@gmail.com> Co-authored-by: Zach Van Camp <zach.vancamp@etcconnect.com> Co-authored-by: John Wellbelove <jwellbelove@users.noreply.github.com>
diff --git a/include/etl/algorithm.h b/include/etl/algorithm.h
@@ -953,12 +953,12 @@ namespace etl
 
       while ((value_index > top_index) && compare(first[parent], value))
       {
-        first[value_index] = etl::move(first[parent]);
+        first[value_index] = ETL_MOVE(first[parent]);
         value_index = parent;
         parent = (value_index - 1) / 2;
       }
 
-      first[value_index] = etl::move(value);
+      first[value_index] = ETL_MOVE(value);
     }
 
     // Adjust Heap Helper
@@ -975,18 +975,18 @@ namespace etl
           --child2nd;
         }
 
-        first[value_index] = etl::move(first[child2nd]);
+        first[value_index] = ETL_MOVE(first[child2nd]);
         value_index = child2nd;
         child2nd = 2 * (child2nd + 1);
       }
 
       if (child2nd == length)
       {
-        first[value_index] = etl::move(first[child2nd - 1]);
+        first[value_index] = ETL_MOVE(first[child2nd - 1]);
         value_index = child2nd - 1;
       }
 
-      push_heap(first, value_index, top_index, etl::move(value), compare);
+      push_heap(first, value_index, top_index, ETL_MOVE(value), compare);
     }
 
     // Is Heap Helper
@@ -1019,10 +1019,10 @@ namespace etl
     typedef typename etl::iterator_traits<TIterator>::value_type value_t;
     typedef typename etl::iterator_traits<TIterator>::difference_type distance_t;
 
-    value_t value = etl::move(last[-1]);
-    last[-1] = etl::move(first[0]);
+    value_t value = ETL_MOVE(last[-1]);
+    last[-1] = ETL_MOVE(first[0]);
 
-    private_heap::adjust_heap(first, distance_t(0), distance_t(last - first - 1), etl::move(value), compare);
+    private_heap::adjust_heap(first, distance_t(0), distance_t(last - first - 1), ETL_MOVE(value), compare);
   }
 
   // Pop Heap
@@ -1041,7 +1041,7 @@ namespace etl
     typedef typename etl::iterator_traits<TIterator>::difference_type difference_t;
     typedef typename etl::iterator_traits<TIterator>::value_type      value_t;
 
-    private_heap::push_heap(first, difference_t(last - first - 1), difference_t(0), value_t(etl::move(*(last - 1))), compare);
+    private_heap::push_heap(first, difference_t(last - first - 1), difference_t(0), value_t(ETL_MOVE(*(last - 1))), compare);
   }
 
   // Push Heap
@@ -1069,7 +1069,7 @@ namespace etl
 
     while (true)
     {
-      private_heap::adjust_heap(first, parent, length, etl::move(*(first + parent)), compare);
+      private_heap::adjust_heap(first, parent, length, ETL_MOVE(*(first + parent)), compare);
 
       if (parent == 0)
       {
@@ -1206,7 +1206,7 @@ namespace etl
 
       for (int i = 0; i < gcd_nm; i++) 
       {
-        value_type temp = etl::move(*(first + i));
+        value_type temp = ETL_MOVE(*(first + i));
         int j = i;
         
         while (true) 
@@ -1223,11 +1223,11 @@ namespace etl
             break;
           }
 
-          *(first + j) = etl::move(*(first + k));
+          *(first + j) = ETL_MOVE(*(first + k));
           j = k;
         }
 
-        *(first + j) = etl::move(temp);
+        *(first + j) = ETL_MOVE(temp);
       }
 
       return result;
@@ -1348,13 +1348,13 @@ namespace etl
       typedef typename etl::iterator_traits<TIterator>::value_type value_type;
 
       // Save the first item.
-      value_type temp(etl::move(*first));
+      value_type temp(ETL_MOVE(*first));
 
       // Move the rest.
       TIterator result = etl::move(etl::next(first), last, first);
 
       // Restore the first item in its rotated position.
-      *result = etl::move(temp);
+      *result = ETL_MOVE(temp);
 
       // The new position of the first item.
       return result;
@@ -1370,13 +1370,13 @@ namespace etl
 
       // Save the last item.
       TIterator previous = etl::prev(last);
-      value_type temp(etl::move(*previous));
+      value_type temp(ETL_MOVE(*previous));
 
       // Move the rest.
       TIterator result = etl::move_backward(first, previous, last);
 
       // Restore the last item in its rotated position.
-      *first = etl::move(temp);
+      *first = ETL_MOVE(temp);
 
       // The new position of the first item.
       return result;
@@ -2151,7 +2151,7 @@ namespace etl
   {
     while (first != last)
     {
-      sum = etl::move(sum) + *first;
+      sum = ETL_MOVE(sum) + *first;
       ++first;
     }
       
@@ -2168,7 +2168,7 @@ namespace etl
   {
     while (first != last)
     {
-      sum = operation(etl::move(sum), *first);
+      sum = operation(ETL_MOVE(sum), *first);
       ++first;
     }
 
@@ -2225,7 +2225,7 @@ namespace etl
       {
         if (!(*itr == value))
         {
-          *first++ = etl::move(*itr);
+          *first++ = ETL_MOVE(*itr);
         }
       }
     }
@@ -2251,7 +2251,7 @@ namespace etl
       {
         if (!predicate(*itr))
         {
-          *first++ = etl::move(*itr);
+          *first++ = ETL_MOVE(*itr);
         }
       }
     }
diff --git a/include/etl/private/diagnostic_array_bounds_push.h b/include/etl/private/diagnostic_array_bounds_push.h
@@ -33,7 +33,8 @@ SOFTWARE.
  * This file is intended to evaluated multiple times by design.
  */
 
-#if defined(__GNUC__) && !defined(__clang__) && !defined(__llvm__)
+#if defined(__GNUC__) && !defined(__clang__) && !defined(__llvm__) && \
+    (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
   #pragma GCC diagnostic push 
   #pragma GCC diagnostic ignored "-Warray-bounds"
 #endif
diff --git a/include/etl/private/diagnostic_deprecated_push.h b/include/etl/private/diagnostic_deprecated_push.h
@@ -33,7 +33,8 @@ SOFTWARE.
  * This file is intended to evaluated multiple times by design.
  */
 
-#if defined(__GNUC__) && !defined(__clang__) && !defined(__llvm__)
+#if defined(__GNUC__) && !defined(__clang__) && !defined(__llvm__) && \
+      (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
   #pragma GCC diagnostic push 
   #pragma GCC diagnostic ignored "-Wdeprecated"
 #endif
diff --git a/include/etl/private/diagnostic_float_equal_push.h b/include/etl/private/diagnostic_float_equal_push.h
@@ -33,7 +33,8 @@ SOFTWARE.
  * This file is intended to evaluated multiple times by design.
  */
 
-#if defined(__GNUC__) && !defined(__clang__) && !defined(__llvm__)
+#if defined(__GNUC__) && !defined(__clang__) && !defined(__llvm__) && \
+      (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
   #pragma GCC diagnostic push
   #pragma GCC diagnostic ignored "-Wfloat-equal"
 #endif
diff --git a/include/etl/private/diagnostic_null_dereference_push.h b/include/etl/private/diagnostic_null_dereference_push.h
@@ -33,7 +33,8 @@ SOFTWARE.
  * This file is intended to evaluated multiple times by design.
  */
 
-#if defined(__GNUC__) && !defined(__clang__) && !defined(__llvm__)
+#if defined(__GNUC__) && !defined(__clang__) && !defined(__llvm__) && \
+      (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
   #pragma GCC diagnostic push 
   #pragma GCC diagnostic ignored "-Wnull-dereference"
 #endif
diff --git a/include/etl/private/diagnostic_pessimizing_move_push.h b/include/etl/private/diagnostic_pessimizing_move_push.h
@@ -33,7 +33,8 @@ SOFTWARE.
  * This file is intended to evaluated multiple times by design.
  */
 
-#if defined(__GNUC__) && !defined(__clang__) && !defined(__llvm__)
+#if defined(__GNUC__) && !defined(__clang__) && !defined(__llvm__) && \
+      (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
   #pragma GCC diagnostic push 
   #pragma GCC diagnostic ignored "-Wpessimizing-move"
 #endif
diff --git a/include/etl/private/diagnostic_pop.h b/include/etl/private/diagnostic_pop.h
@@ -33,7 +33,8 @@ SOFTWARE.
  * This file is intended to evaluated multiple times by design.
  */
 
-#if defined(__GNUC__) && !defined(__clang__) && !defined(__llvm__)
+#if defined(__GNUC__) && !defined(__clang__) && !defined(__llvm__) && \
+      (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
 #pragma GCC diagnostic pop 
 #endif
 
diff --git a/include/etl/private/diagnostic_self_assign_overloaded_push.h b/include/etl/private/diagnostic_self_assign_overloaded_push.h
@@ -33,7 +33,8 @@ SOFTWARE.
  * This file is intended to evaluated multiple times by design.
  */
 
-#if defined(__GNUC__) && !defined(__clang__) && !defined(__llvm__)
+#if defined(__GNUC__) && !defined(__clang__) && !defined(__llvm__) && \
+      (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
   #pragma GCC diagnostic push
 #endif
 
diff --git a/include/etl/private/diagnostic_uninitialized_push.h b/include/etl/private/diagnostic_uninitialized_push.h
@@ -33,7 +33,8 @@ SOFTWARE.
  * This file is intended to evaluated multiple times by design.
  */
 
-#if defined(__GNUC__) && !defined(__clang__) && !defined(__llvm__)
+#if defined(__GNUC__) && !defined(__clang__) && !defined(__llvm__) && \
+      (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
   #pragma GCC diagnostic push 
   #pragma GCC diagnostic ignored "-Wuninitialized"
   #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
diff --git a/include/etl/private/diagnostic_unused_function_push.h b/include/etl/private/diagnostic_unused_function_push.h
@@ -33,7 +33,8 @@ SOFTWARE.
  * This file is intended to evaluated multiple times by design.
  */
 
-#if defined(__GNUC__) && !defined(__clang__) && !defined(__llvm__)
+#if defined(__GNUC__) && !defined(__clang__) && !defined(__llvm__) && \
+      (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
   #pragma GCC diagnostic push 
   #pragma GCC diagnostic ignored "-Wunused-function"
 #endif
diff --git a/include/etl/private/diagnostic_useless_cast_push.h b/include/etl/private/diagnostic_useless_cast_push.h
@@ -33,7 +33,8 @@ SOFTWARE.
  * This file is intended to evaluated multiple times by design.
  */
 
-#if defined(__GNUC__) && !defined(__clang__) && !defined(__llvm__)
+#if defined(__GNUC__) && !defined(__clang__) && !defined(__llvm__) && \
+      (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
   #pragma GCC diagnostic push 
   #pragma GCC diagnostic ignored "-Wuseless-cast"
 #endif
diff --git a/include/etl/private/minmax_pop.h b/include/etl/private/minmax_pop.h
@@ -31,7 +31,8 @@ SOFTWARE.
 // The header include guard has been intentionally omitted.
 // This file is intended to evaluated multiple times by design.
 #ifdef ETL_PUSHED_MIN_MAX
-  #if !defined(ETL_COMPILER_GREEN_HILLS) && !defined(ETL_COMPILER_IAR) && !defined(ETL_COMPILER_TASKING)
+  #if !defined(ETL_COMPILER_GREEN_HILLS) && !defined(ETL_COMPILER_IAR) && !defined(ETL_COMPILER_TASKING) && \
+      (!defined(__GNUC__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))))
     #if !defined(ETL_COMPILER_ARM5)
       #pragma pop_macro("min")
       #pragma pop_macro("max")
diff --git a/include/etl/private/minmax_push.h b/include/etl/private/minmax_push.h
@@ -31,7 +31,8 @@ SOFTWARE.
 // The header include guard has been intentionally omitted.
 // This file is intended to evaluated multiple times by design.
 #ifndef ETL_PUSHED_MIN_MAX
-  #if !defined(ETL_COMPILER_GREEN_HILLS) && !defined(ETL_COMPILER_IAR) && !defined(ETL_COMPILER_TASKING)
+  #if !defined(ETL_COMPILER_GREEN_HILLS) && !defined(ETL_COMPILER_IAR) && !defined(ETL_COMPILER_TASKING) && \
+      (!defined(__GNUC__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))))
     #if !defined(ETL_COMPILER_ARM5)
       #pragma push_macro("min")
       #pragma push_macro("max")

Original file line number	Diff line number	Diff line change
`@@ -953,12 +953,12 @@ namespace etl`
`953`	`953`
`954`	`954`	`while ((value_index > top_index) && compare(first[parent], value))`
`955`	`955`	`{`
`956`		`- first[value_index] = etl::move(first[parent]);`
	`956`	`+ first[value_index] = ETL_MOVE(first[parent]);`
`957`	`957`	`value_index = parent;`
`958`	`958`	`parent = (value_index - 1) / 2;`
`959`	`959`	`}`
`960`	`960`
`961`		`- first[value_index] = etl::move(value);`
	`961`	`+ first[value_index] = ETL_MOVE(value);`
`962`	`962`	`}`
`963`	`963`
`964`	`964`	`// Adjust Heap Helper`
`@@ -975,18 +975,18 @@ namespace etl`
`975`	`975`	`--child2nd;`
`976`	`976`	`}`
`977`	`977`
`978`		`- first[value_index] = etl::move(first[child2nd]);`
	`978`	`+ first[value_index] = ETL_MOVE(first[child2nd]);`
`979`	`979`	`value_index = child2nd;`
`980`	`980`	`child2nd = 2 * (child2nd + 1);`
`981`	`981`	`}`
`982`	`982`
`983`	`983`	`if (child2nd == length)`
`984`	`984`	`{`
`985`		`- first[value_index] = etl::move(first[child2nd - 1]);`
	`985`	`+ first[value_index] = ETL_MOVE(first[child2nd - 1]);`
`986`	`986`	`value_index = child2nd - 1;`
`987`	`987`	`}`
`988`	`988`
`989`		`- push_heap(first, value_index, top_index, etl::move(value), compare);`
	`989`	`+ push_heap(first, value_index, top_index, ETL_MOVE(value), compare);`
`990`	`990`	`}`
`991`	`991`
`992`	`992`	`// Is Heap Helper`
`@@ -1019,10 +1019,10 @@ namespace etl`
`1019`	`1019`	`typedef typename etl::iterator_traits<TIterator>::value_type value_t;`
`1020`	`1020`	`typedef typename etl::iterator_traits<TIterator>::difference_type distance_t;`
`1021`	`1021`
`1022`		`- value_t value = etl::move(last[-1]);`
`1023`		`- last[-1] = etl::move(first[0]);`
	`1022`	`+ value_t value = ETL_MOVE(last[-1]);`
	`1023`	`+ last[-1] = ETL_MOVE(first[0]);`
`1024`	`1024`
`1025`		`- private_heap::adjust_heap(first, distance_t(0), distance_t(last - first - 1), etl::move(value), compare);`
	`1025`	`+ private_heap::adjust_heap(first, distance_t(0), distance_t(last - first - 1), ETL_MOVE(value), compare);`
`1026`	`1026`	`}`
`1027`	`1027`
`1028`	`1028`	`// Pop Heap`
`@@ -1041,7 +1041,7 @@ namespace etl`
`1041`	`1041`	`typedef typename etl::iterator_traits<TIterator>::difference_type difference_t;`
`1042`	`1042`	`typedef typename etl::iterator_traits<TIterator>::value_type value_t;`
`1043`	`1043`
`1044`		`- private_heap::push_heap(first, difference_t(last - first - 1), difference_t(0), value_t(etl::move(*(last - 1))), compare);`
	`1044`	`+ private_heap::push_heap(first, difference_t(last - first - 1), difference_t(0), value_t(ETL_MOVE(*(last - 1))), compare);`
`1045`	`1045`	`}`
`1046`	`1046`
`1047`	`1047`	`// Push Heap`
`@@ -1069,7 +1069,7 @@ namespace etl`
`1069`	`1069`
`1070`	`1070`	`while (true)`
`1071`	`1071`	`{`
`1072`		`- private_heap::adjust_heap(first, parent, length, etl::move(*(first + parent)), compare);`
	`1072`	`+ private_heap::adjust_heap(first, parent, length, ETL_MOVE(*(first + parent)), compare);`
`1073`	`1073`
`1074`	`1074`	`if (parent == 0)`
`1075`	`1075`	`{`
`@@ -1206,7 +1206,7 @@ namespace etl`
`1206`	`1206`
`1207`	`1207`	`for (int i = 0; i < gcd_nm; i++)`
`1208`	`1208`	`{`
`1209`		`- value_type temp = etl::move(*(first + i));`
	`1209`	`+ value_type temp = ETL_MOVE(*(first + i));`
`1210`	`1210`	`int j = i;`
`1211`	`1211`
`1212`	`1212`	`while (true)`
`@@ -1223,11 +1223,11 @@ namespace etl`
`1223`	`1223`	`break;`
`1224`	`1224`	`}`
`1225`	`1225`
`1226`		`- (first + j) = etl::move((first + k));`
	`1226`	`+ (first + j) = ETL_MOVE((first + k));`
`1227`	`1227`	`j = k;`
`1228`	`1228`	`}`
`1229`	`1229`
`1230`		`- *(first + j) = etl::move(temp);`
	`1230`	`+ *(first + j) = ETL_MOVE(temp);`
`1231`	`1231`	`}`
`1232`	`1232`
`1233`	`1233`	`return result;`
`@@ -1348,13 +1348,13 @@ namespace etl`
`1348`	`1348`	`typedef typename etl::iterator_traits<TIterator>::value_type value_type;`
`1349`	`1349`
`1350`	`1350`	`// Save the first item.`
`1351`		`- value_type temp(etl::move(*first));`
	`1351`	`+ value_type temp(ETL_MOVE(*first));`
`1352`	`1352`
`1353`	`1353`	`// Move the rest.`
`1354`	`1354`	`TIterator result = etl::move(etl::next(first), last, first);`
`1355`	`1355`
`1356`	`1356`	`// Restore the first item in its rotated position.`
`1357`		`- *result = etl::move(temp);`
	`1357`	`+ *result = ETL_MOVE(temp);`
`1358`	`1358`
`1359`	`1359`	`// The new position of the first item.`
`1360`	`1360`	`return result;`
`@@ -1370,13 +1370,13 @@ namespace etl`
`1370`	`1370`
`1371`	`1371`	`// Save the last item.`
`1372`	`1372`	`TIterator previous = etl::prev(last);`
`1373`		`- value_type temp(etl::move(*previous));`
	`1373`	`+ value_type temp(ETL_MOVE(*previous));`
`1374`	`1374`
`1375`	`1375`	`// Move the rest.`
`1376`	`1376`	`TIterator result = etl::move_backward(first, previous, last);`
`1377`	`1377`
`1378`	`1378`	`// Restore the last item in its rotated position.`
`1379`		`- *first = etl::move(temp);`
	`1379`	`+ *first = ETL_MOVE(temp);`
`1380`	`1380`
`1381`	`1381`	`// The new position of the first item.`
`1382`	`1382`	`return result;`
`@@ -2151,7 +2151,7 @@ namespace etl`
`2151`	`2151`	`{`
`2152`	`2152`	`while (first != last)`
`2153`	`2153`	`{`
`2154`		`- sum = etl::move(sum) + *first;`
	`2154`	`+ sum = ETL_MOVE(sum) + *first;`
`2155`	`2155`	`++first;`
`2156`	`2156`	`}`
`2157`	`2157`
`@@ -2168,7 +2168,7 @@ namespace etl`
`2168`	`2168`	`{`
`2169`	`2169`	`while (first != last)`
`2170`	`2170`	`{`
`2171`		`- sum = operation(etl::move(sum), *first);`
	`2171`	`+ sum = operation(ETL_MOVE(sum), *first);`
`2172`	`2172`	`++first;`
`2173`	`2173`	`}`
`2174`	`2174`
`@@ -2225,7 +2225,7 @@ namespace etl`
`2225`	`2225`	`{`
`2226`	`2226`	`if (!(*itr == value))`
`2227`	`2227`	`{`
`2228`		`- first++ = etl::move(itr);`
	`2228`	`+ first++ = ETL_MOVE(itr);`
`2229`	`2229`	`}`
`2230`	`2230`	`}`
`2231`	`2231`	`}`
`@@ -2251,7 +2251,7 @@ namespace etl`
`2251`	`2251`	`{`
`2252`	`2252`	`if (!predicate(*itr))`
`2253`	`2253`	`{`
`2254`		`- first++ = etl::move(itr);`
	`2254`	`+ first++ = ETL_MOVE(itr);`
`2255`	`2255`	`}`
`2256`	`2256`	`}`
`2257`	`2257`	`}`